diff options
Diffstat (limited to 'apex/systemserver_classpath_fragment_test.go')
| -rw-r--r-- | apex/systemserver_classpath_fragment_test.go | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/apex/systemserver_classpath_fragment_test.go b/apex/systemserver_classpath_fragment_test.go index 40d05814e..f6c53b270 100644 --- a/apex/systemserver_classpath_fragment_test.go +++ b/apex/systemserver_classpath_fragment_test.go @@ -106,6 +106,7 @@ func TestSystemserverclasspathFragmentContents(t *testing.T) { }) java.CheckModuleDependencies(t, ctx, "myapex", "android_common_myapex", []string{ + `dex2oatd`, `myapex.key`, `mysystemserverclasspathfragment`, }) @@ -162,6 +163,7 @@ func TestSystemserverclasspathFragmentNoGeneratedProto(t *testing.T) { }) java.CheckModuleDependencies(t, result.TestContext, "myapex", "android_common_myapex", []string{ + `dex2oatd`, `myapex.key`, `mysystemserverclasspathfragment`, }) @@ -272,24 +274,26 @@ func TestPrebuiltSystemserverclasspathFragmentContents(t *testing.T) { ctx := result.TestContext java.CheckModuleDependencies(t, ctx, "myapex", "android_common_myapex", []string{ - `myapex.apex.selector`, + `dex2oatd`, + `prebuilt_myapex.apex.selector`, + `prebuilt_myapex.deapexer`, `prebuilt_mysystemserverclasspathfragment`, }) java.CheckModuleDependencies(t, ctx, "mysystemserverclasspathfragment", "android_common_myapex", []string{ - `myapex.deapexer`, `prebuilt_bar`, `prebuilt_foo`, + `prebuilt_myapex.deapexer`, }) - ensureExactDeapexedContents(t, ctx, "myapex", "android_common", []string{ + ensureExactDeapexedContents(t, ctx, "prebuilt_myapex", "android_common", []string{ "javalib/foo.jar", "javalib/bar.jar", "javalib/bar.jar.prof", }) - assertProfileGuided(t, ctx, "foo", "android_common_myapex", false) - assertProfileGuided(t, ctx, "bar", "android_common_myapex", true) + assertProfileGuidedPrebuilt(t, ctx, "myapex", "foo", false) + assertProfileGuidedPrebuilt(t, ctx, "myapex", "bar", true) } func TestSystemserverclasspathFragmentStandaloneContents(t *testing.T) { @@ -428,19 +432,19 @@ func TestPrebuiltStandaloneSystemserverclasspathFragmentContents(t *testing.T) { ctx := result.TestContext java.CheckModuleDependencies(t, ctx, "mysystemserverclasspathfragment", "android_common_myapex", []string{ - `myapex.deapexer`, `prebuilt_bar`, `prebuilt_foo`, + `prebuilt_myapex.deapexer`, }) - ensureExactDeapexedContents(t, ctx, "myapex", "android_common", []string{ + ensureExactDeapexedContents(t, ctx, "prebuilt_myapex", "android_common", []string{ "javalib/foo.jar", "javalib/bar.jar", "javalib/bar.jar.prof", }) - assertProfileGuided(t, ctx, "foo", "android_common_myapex", false) - assertProfileGuided(t, ctx, "bar", "android_common_myapex", true) + assertProfileGuidedPrebuilt(t, ctx, "myapex", "foo", false) + assertProfileGuidedPrebuilt(t, ctx, "myapex", "bar", true) } func assertProfileGuided(t *testing.T, ctx *android.TestContext, moduleName string, variant string, expected bool) { @@ -450,3 +454,11 @@ func assertProfileGuided(t *testing.T, ctx *android.TestContext, moduleName stri t.Fatalf("Expected profile-guided to be %v, got %v", expected, actual) } } + +func assertProfileGuidedPrebuilt(t *testing.T, ctx *android.TestContext, apexName string, moduleName string, expected bool) { + dexpreopt := ctx.ModuleForTests(apexName, "android_common_"+apexName).Rule("dexpreopt." + moduleName) + actual := strings.Contains(dexpreopt.RuleParams.Command, "--profile-file=") + if expected != actual { + t.Fatalf("Expected profile-guided to be %v, got %v", expected, actual) + } +} |