summaryrefslogtreecommitdiff
path: root/android/defs.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2021-11-12 17:41:02 -0800
committer Colin Cross <ccross@android.com> 2021-11-17 19:55:33 -0800
commit50ed1f9ccb42ce2faaf652fe1819dbd57f35b44d (patch)
treedb3bafe39d558460e412bcd0b1d87038f604f3f0 /android/defs.go
parentffbcd1d8a086c581a14a42e54fa0019c637f56e6 (diff)
Install android_app_set modules in Soong
Add support for installing extra files from a zip file when installing a primary file, and use it to support installing android_app_set modules, which install a primary APK and then an unknown set of additional splits APKs. Test: app_set_test.go Test: install test android_app_set Bug: 204136549 Change-Id: Ia92f7e5c427adcef3bcf59c82a2f83450905c01d
Diffstat (limited to 'android/defs.go')
-rw-r--r--android/defs.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/android/defs.go b/android/defs.go
index c8e2e9b3c..362b382b3 100644
--- a/android/defs.go
+++ b/android/defs.go
@@ -52,10 +52,10 @@ var (
// A copy rule.
Cp = pctx.AndroidStaticRule("Cp",
blueprint.RuleParams{
- Command: "rm -f $out && cp $cpPreserveSymlinks $cpFlags $in $out",
+ Command: "rm -f $out && cp $cpPreserveSymlinks $cpFlags $in $out$extraCmds",
Description: "cp $out",
},
- "cpFlags")
+ "cpFlags", "extraCmds")
// A copy rule that only updates the output if it changed.
CpIfChanged = pctx.AndroidStaticRule("CpIfChanged",
@@ -68,10 +68,10 @@ var (
CpExecutable = pctx.AndroidStaticRule("CpExecutable",
blueprint.RuleParams{
- Command: "rm -f $out && cp $cpPreserveSymlinks $cpFlags $in $out && chmod +x $out",
+ Command: "rm -f $out && cp $cpPreserveSymlinks $cpFlags $in $out && chmod +x $out$extraCmds",
Description: "cp $out",
},
- "cpFlags")
+ "cpFlags", "extraCmds")
// A timestamp touch rule.
Touch = pctx.AndroidStaticRule("Touch",