Support aapt2 resources flagging
This change modifies the aconfig and aapt2 build rules to support
resources flagging in aapt2.
Implementation details:
- Modify the aconfig text rule to include flag permission in the output
text file
- Pass the `--flags-packages` argument to `aapt2 compile` command,
similar to what is currently being done in the `aapt2 link` command
Bug: 344979955
Test: m nothing --no-skip-soong-tests
Change-Id: I3b0b1fd6dcd691b7cc50ba3d081ecafd82c2c904
diff --git a/java/app_test.go b/java/app_test.go
index e878ccf..6b7d522 100644
--- a/java/app_test.go
+++ b/java/app_test.go
@@ -4364,7 +4364,16 @@
}
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 @@
// 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 @@
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) {