Add tests for uncompressed dex for android_app_import.

Some of the test cases for privileged apps currently produce incorrect
results (e.g. with DONT_UNCOMPRESS_PRIV_APPS_DEXS := true); they are
marked with TODO and will be fixed in a follow-up CL.

Bug: 194504107
Test: m nothing
Change-Id: Ic0cd24113a27850a967afa0b3deb4a6324f95347
This commit is contained in:
Ulya Trafimovich
2021-09-01 14:13:57 +01:00
parent b37a92ccc8
commit 55f72d706d

View File

@@ -15,6 +15,7 @@
package java
import (
"fmt"
"reflect"
"regexp"
"strings"
@@ -656,3 +657,74 @@ func TestAndroidTestImport_Preprocessed(t *testing.T) {
}
}
}
func TestAndroidTestImport_UncompressDex(t *testing.T) {
testCases := []struct {
name string
bp string
}{
{
name: "normal",
bp: `
android_app_import {
name: "foo",
presigned: true,
apk: "prebuilts/apk/app.apk",
}
`,
},
{
name: "privileged",
bp: `
android_app_import {
name: "foo",
presigned: true,
privileged: true,
apk: "prebuilts/apk/app.apk",
}
`,
},
}
test := func(t *testing.T, bp string, unbundled bool, dontUncompressPrivAppDexs bool) {
t.Helper()
result := android.GroupFixturePreparers(
prepareForJavaTest,
android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
if unbundled {
variables.Unbundled_build = proptools.BoolPtr(true)
}
variables.UncompressPrivAppDex = proptools.BoolPtr(!dontUncompressPrivAppDexs)
}),
).RunTestWithBp(t, bp)
foo := result.ModuleForTests("foo", "android_common")
actual := foo.MaybeRule("uncompress-dex").Rule != nil
expect := !unbundled
if strings.Contains(bp, "privileged: true") {
if dontUncompressPrivAppDexs {
// TODO(b/194504107): DONT_UNCOMPRESS_PRIV_APPS_DEXS should disable uncompression of priv-apps no matter what.
// expect = false
} else {
// TODO(b/194504107): shouldn't priv-apps be always uncompressed unless DONT_UNCOMPRESS_PRIV_APPS_DEXS is true?
// expect = true
}
}
android.AssertBoolEquals(t, "uncompress dex", expect, actual)
}
for _, unbundled := range []bool{false, true} {
for _, dontUncompressPrivAppDexs := range []bool{false, true} {
for _, tt := range testCases {
name := fmt.Sprintf("%s,unbundled:%t,dontUncompressPrivAppDexs:%t",
tt.name, unbundled, dontUncompressPrivAppDexs)
t.Run(name, func(t *testing.T) {
test(t, tt.bp, unbundled, dontUncompressPrivAppDexs)
})
}
}
}
}