summaryrefslogtreecommitdiff
path: root/java/builder.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2018-10-02 22:03:40 -0700
committer Colin Cross <ccross@android.com> 2018-10-08 15:20:56 -0700
commita4f08813a34418a07aa0ebd8b3e704f3a82081ef (patch)
treef1956fe9c05bf91f87f8efd3aafe8daff09e1c67 /java/builder.go
parentb1a5e9cadfdd0765f763883fd7410add24486ef6 (diff)
Add support for JNI libraries to android_app modules
Make android_app modules a MultiTargets module, which means the common variant will have a list of Targets that it needs to handle. Collect JNI libraries for each Target, and package them into or alongside the APK. Bug: 80095087 Test: app_test.go Change-Id: Iabd3921e1d4c4b4cfcc7e131a0b0d9ab83b0ebbb
Diffstat (limited to 'java/builder.go')
-rw-r--r--java/builder.go9
1 files changed, 9 insertions, 0 deletions
diff --git a/java/builder.go b/java/builder.go
index 07af8ebda..f55a7c796 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -109,6 +109,15 @@ var (
},
"jarArgs")
+ zip = pctx.AndroidStaticRule("zip",
+ blueprint.RuleParams{
+ Command: `${config.SoongZipCmd} -o $out @$out.rsp`,
+ CommandDeps: []string{"${config.SoongZipCmd}"},
+ Rspfile: "$out.rsp",
+ RspfileContent: "$jarArgs",
+ },
+ "jarArgs")
+
combineJar = pctx.AndroidStaticRule("combineJar",
blueprint.RuleParams{
Command: `${config.MergeZipsCmd} --ignore-duplicates -j $jarArgs $out $in`,