diff options
| author | Colin Cross <ccross@android.com> | 2017-11-22 16:20:45 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-11-29 20:47:42 -0800 |
| commit | 5ab4e6d817cc1eec81e7fa3ae9d547a0ba94919c (patch) | |
| tree | c9b6be84034d1b74a7d42683b520fef38b3145b9 /java/app_builder.go | |
| parent | 46029a4131ae035d85c5e60871b5156bfc36e784 (diff) | |
| download | build_soong-5ab4e6d817cc1eec81e7fa3ae9d547a0ba94919c.tar.gz build_soong-5ab4e6d817cc1eec81e7fa3ae9d547a0ba94919c.tar.bz2 build_soong-5ab4e6d817cc1eec81e7fa3ae9d547a0ba94919c.zip | |
Allow building framework.jar and framework-res.apk
Update app support enough to build framework-res.apk, link
framework.jar against its generated files, and export it to
make.
Bug: 69917341
Test: m checkbuild tests docs
Change-Id: I7db29cd1f5fabb22e844483ecc7c38abfedbbe0a
Diffstat (limited to 'java/app_builder.go')
| -rw-r--r-- | java/app_builder.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/java/app_builder.go b/java/app_builder.go index 82574aef..676ed585 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -29,8 +29,9 @@ import ( var ( signapk = pctx.AndroidStaticRule("signapk", blueprint.RuleParams{ - Command: `java -jar $signapkCmd $certificates $in $out`, - CommandDeps: []string{"$signapkCmd"}, + Command: `${config.JavaCmd} -Djava.library.path=$$(dirname $signapkJniLibrary) ` + + `-jar $signapkCmd $certificates $in $out`, + CommandDeps: []string{"$signapkCmd", "$signapkJniLibrary"}, }, "certificates") @@ -48,6 +49,9 @@ func init() { pctx.SourcePathVariable("androidManifestMergerCmd", "prebuilts/devtools/tools/lib/manifest-merger.jar") pctx.HostBinToolVariable("aaptCmd", "aapt") pctx.HostJavaToolVariable("signapkCmd", "signapk.jar") + // TODO(ccross): this should come from the signapk dependencies, but we don't have any way + // to express host JNI dependencies yet. + pctx.HostJNIToolVariable("signapkJniLibrary", "libconscrypt_openjdk_jni") } var combineApk = pctx.AndroidStaticRule("combineApk", @@ -79,6 +83,9 @@ func CreateAppPackage(ctx android.ModuleContext, outputFile android.WritablePath certificateArgs = append(certificateArgs, c+".x509.pem", c+".pk8") } + // TODO(ccross): sometimes uncompress dex + // TODO(ccross): sometimes strip dex + ctx.Build(pctx, android.BuildParams{ Rule: signapk, Description: "signapk", |