summaryrefslogtreecommitdiff
path: root/java/aapt2.go
diff options
context:
space:
mode:
author Jihoon Kang <jihoonkang@google.com> 2023-12-08 09:48:13 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-12-08 09:48:13 +0000
commit25c187cc7dfb70a88a8b4fade245fa24cc9e1dcf (patch)
tree904227f91afe1d420cc1f8b6af6b052ebc2f9035 /java/aapt2.go
parent25861686fe434c5abae530258bdff4ba2e435ede (diff)
parent84b2589e6dc85d15af273b8a293ed7f064142af7 (diff)
Merge changes from topic "aconfig_dump_map" into main
* changes: Add aconfig flag support for android_app Add aconfig flag value text file in aconfig_declarations provider
Diffstat (limited to 'java/aapt2.go')
-rw-r--r--java/aapt2.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/java/aapt2.go b/java/aapt2.go
index 17ee6ee42..445e91298 100644
--- a/java/aapt2.go
+++ b/java/aapt2.go
@@ -202,7 +202,8 @@ var mergeAssetsRule = pctx.AndroidStaticRule("mergeAssets",
func aapt2Link(ctx android.ModuleContext,
packageRes, genJar, proguardOptions, rTxt android.WritablePath,
flags []string, deps android.Paths,
- compiledRes, compiledOverlay, assetPackages android.Paths, splitPackages android.WritablePaths) {
+ compiledRes, compiledOverlay, assetPackages android.Paths, splitPackages android.WritablePaths,
+ featureFlagsPaths android.Paths) {
var inFlags []string
@@ -255,6 +256,11 @@ func aapt2Link(ctx android.ModuleContext,
})
}
+ for _, featureFlagsPath := range featureFlagsPaths {
+ deps = append(deps, featureFlagsPath)
+ inFlags = append(inFlags, "--feature-flags", "@"+featureFlagsPath.String())
+ }
+
// Note the absence of splitPackages. The caller is supposed to compose and provide --split flag
// values via the flags parameter when it wants to split outputs.
// TODO(b/174509108): Perhaps we can process it in this func while keeping the code reasonably