diff options
| author | 2023-12-08 11:31:22 +0000 | |
|---|---|---|
| committer | 2023-12-08 11:31:22 +0000 | |
| commit | 59bb904d6c7b38417059df1345da467a07f5e148 (patch) | |
| tree | 6c6996e051688caacdd9c2bd9f9309f57d2261fd /java/aapt2.go | |
| parent | 8172cfb509c9c71046e66e9ee7bce51f3c67d2ed (diff) | |
| parent | 1befeeb5e8684ad5aa6efc7273edaab2a89d2055 (diff) | |
Merge changes from topic "aconfig_dump_map" into main am: 25c187cc7d am: 1ed5d5ca20 am: 1befeeb5e8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854663
Change-Id: I18069b9fa74f1c72527bff397c61bc5510e7a684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/aapt2.go')
| -rw-r--r-- | java/aapt2.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/java/aapt2.go b/java/aapt2.go index 89f1f70c0..f704fc6fc 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 |