StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix DONT_UNCOMPRESS_PRIV_APPS_DEXS for android_app_import.

Browse Source 
Don't uncompress priv-app dex for `android_app_import` if
DONT_UNCOMPRESS_PRIV_APPS_DEXS is true. Update expected test results.

Bug: 194504107
Test: m nothing
Change-Id: I4e7aa1a3deea856f388ae5ecd9292301f8a09a2f
This commit is contained in:
Ulya Trafimovich
2021-09-01 15:40:38 +01:00
parent 55f72d706d
commit 0061c0d1da
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/app_import.go
View File

@@ -204,9 +204,9 @@ func (a *AndroidAppImport) shouldUncompressDex(ctx android.ModuleContext) bool {
return false return false
} }
// Uncompress dex in APKs of privileged apps // Uncompress dex in APKs of priv-apps if and only if DONT_UNCOMPRESS_PRIV_APPS_DEXS is false.
if ctx.Config().UncompressPrivAppDex() && a.Privileged() { if a.Privileged() {
return true return ctx.Config().UncompressPrivAppDex()
} }
return shouldUncompressDex(ctx, &a.dexpreopter) return shouldUncompressDex(ctx, &a.dexpreopter)

6
java/app_import_test.go
View File

@@ -705,10 +705,10 @@ func TestAndroidTestImport_UncompressDex(t *testing.T) {
expect := !unbundled expect := !unbundled
if strings.Contains(bp, "privileged: true") { if strings.Contains(bp, "privileged: true") {
if dontUncompressPrivAppDexs { if dontUncompressPrivAppDexs {
// TODO(b/194504107): DONT_UNCOMPRESS_PRIV_APPS_DEXS should disable uncompression of priv-apps no matter what. expect = false
// expect = false
} else { } else {
// TODO(b/194504107): shouldn't priv-apps be always uncompressed unless DONT_UNCOMPRESS_PRIV_APPS_DEXS is true? // TODO(b/194504107): shouldn't priv-apps be always uncompressed unless
// DONT_UNCOMPRESS_PRIV_APPS_DEXS is true (regardless of unbundling)?
// expect = true // expect = true
} }
} }