Removing AAPT1 support removed the distinction between unset LOCAL_USE_AAPT2 and LOCAL_USE_AAPT2 := true, which enabled the LCOAL_SDK_RES_VERSION setting for some modules that had previously bypassed it because of LOCAL_USE_AAPT2 := true. The workaround was too broad, it shouldn't apply if LOCAL_SDK_VERSION is already set to *current. In particular, if it is core_current to disable using framework-res.apk completely, then LOCAL_SDK_RES_VERSION must not be set to current. Fixes: 130782219 Test: atest android.server.wm.PrereleaseSdkTest Change-Id: I250d65b1ef66e591f2c9779580df4cc3f0f2b028gugelfrei-debug
parent
e6210f6eb2
commit
85f2b4a680
Loading…
Reference in new issue