commit 988be5d914334668ad25f8f993ec47442b3de33d
author Jeremy Meyer <jakmcbane@google.com> Tue Sep 03 16:31:54 2024 -0700
committer Jeremy Meyer <jakmcbane@google.com> Wed Sep 25 15:07:42 2024 -0700
tree 20e5f269b4f0eabc7938feaccc7a1fe85980ec5b
parent 3d8d4a18c2bd4d697692ea30471852c90e7a3775

Add support for flag in resource directory names

This only applies it to the xml files with the top level element of
resources. Other file support will be in a later CL.

Test: Automated
Bug: 329436914
Flag: EXEMPT Aconfig not supported on host tools
Change-Id: I5e1e341e9de61073d05d9098b1b8b836025910b3

tools/aapt2/integration-tests/FlaggedResourcesTest/Android.bp

diff --git a/tools/aapt2/integration-tests/FlaggedResourcesTest/Android.bp b/tools/aapt2/integration-tests/FlaggedResourcesTest/Android.bp
index c456e5c..432b84e 100644
--- a/tools/aapt2/integration-tests/FlaggedResourcesTest/Android.bp
+++ b/tools/aapt2/integration-tests/FlaggedResourcesTest/Android.bp
@@ -31,9 +31,17 @@
         "res/values/ints.xml",
         "res/values/strings.xml",
         "res/layout/layout1.xml",
+        "res/flag(test.package.falseFlag)/values/bools.xml",
+        "res/values/flag(test.package.trueFlag)/bools.xml",
+        "res/values/flag(!test.package.trueFlag)/bools.xml",
+        "res/values/flag(!test.package.falseFlag)/bools.xml",
     ],
     out: [
         "values_bools.arsc.flat",
+        "values_bools.(test.package.falseFlag).arsc.flat",
+        "values_bools.(test.package.trueFlag).arsc.flat",
+        "values_bools.(!test.package.falseFlag).arsc.flat",
+        "values_bools.(!test.package.trueFlag).arsc.flat",
         "values_bools2.arsc.flat",
         "values_ints.arsc.flat",
         "values_strings.arsc.flat",