diff options
Diffstat (limited to 'java/app_test.go')
| -rw-r--r-- | java/app_test.go | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/java/app_test.go b/java/app_test.go index e878ccf6d..6b7d522f3 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -4364,7 +4364,16 @@ func TestPrivappAllowlistAndroidMk(t *testing.T) { } func TestAppFlagsPackages(t *testing.T) { - ctx := testApp(t, ` + ctx := android.GroupFixturePreparers( + prepareForJavaTest, + android.FixtureMergeMockFs( + map[string][]byte{ + "res/layout/layout.xml": nil, + "res/values/strings.xml": nil, + "res/values-en-rUS/strings.xml": nil, + }, + ), + ).RunTestWithBp(t, ` android_app { name: "foo", srcs: ["a.java"], @@ -4396,10 +4405,10 @@ func TestAppFlagsPackages(t *testing.T) { // android_app module depends on aconfig_declarations listed in flags_packages android.AssertBoolEquals(t, "foo expected to depend on bar", true, - CheckModuleHasDependency(t, ctx, "foo", "android_common", "bar")) + CheckModuleHasDependency(t, ctx.TestContext, "foo", "android_common", "bar")) android.AssertBoolEquals(t, "foo expected to depend on baz", true, - CheckModuleHasDependency(t, ctx, "foo", "android_common", "baz")) + CheckModuleHasDependency(t, ctx.TestContext, "foo", "android_common", "baz")) aapt2LinkRule := foo.Rule("android/soong/java.aapt2Link") linkInFlags := aapt2LinkRule.Args["inFlags"] @@ -4408,6 +4417,14 @@ func TestAppFlagsPackages(t *testing.T) { linkInFlags, "--feature-flags @out/soong/.intermediates/bar/intermediate.txt --feature-flags @out/soong/.intermediates/baz/intermediate.txt", ) + + aapt2CompileRule := foo.Rule("android/soong/java.aapt2Compile") + compileFlags := aapt2CompileRule.Args["cFlags"] + android.AssertStringDoesContain(t, + "aapt2 compile command expected to pass feature flags arguments", + compileFlags, + "--feature-flags @out/soong/.intermediates/bar/intermediate.txt --feature-flags @out/soong/.intermediates/baz/intermediate.txt", + ) } func TestAppFlagsPackagesPropagation(t *testing.T) { |