1d98ee23a3
-f and -D arguments can now take globs in the Soong format.
Also update the use of soong_zip that jars resources to escape the
globs in the arguments, and then shell-escape them when writing to
the rsp file so the glob escape are not intepreted by ReadRespFile.
Also remove an unused argument to the buildAAR rule that could
have contained values that needed escaping.
Relands I7f20bb169dc01f952d2a7681ec6ee9c05737ed37 with a fix for
trailing "\n" in list files, which causes a call to pathtools.Glob("")
that returns "./", which could then get incorrectly translated to
"../../../" in the zip file. Also adds tests.
Test: m checkbuild
Test: zip_test.go
Change-Id: I54b8eef9231875e6042a32c9f8bcc5c2f779922a
134 lines
4.1 KiB
Go
134 lines
4.1 KiB
Go
// Copyright 2015 Google Inc. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package java
|
|
|
|
// This file generates the final rules for compiling all Java. All properties related to
|
|
// compiling should have been translated into javaBuilderFlags or another argument to the Transform*
|
|
// functions.
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/google/blueprint"
|
|
|
|
"android/soong/android"
|
|
)
|
|
|
|
var (
|
|
signapk = pctx.AndroidStaticRule("signapk",
|
|
blueprint.RuleParams{
|
|
Command: `${config.JavaCmd} -Djava.library.path=$$(dirname $signapkJniLibrary) ` +
|
|
`-jar $signapkCmd $certificates $in $out`,
|
|
CommandDeps: []string{"$signapkCmd", "$signapkJniLibrary"},
|
|
},
|
|
"certificates")
|
|
|
|
androidManifestMerger = pctx.AndroidStaticRule("androidManifestMerger",
|
|
blueprint.RuleParams{
|
|
Command: "java -classpath $androidManifestMergerCmd com.android.manifmerger.Main merge " +
|
|
"--main $in --libs $libsManifests --out $out",
|
|
CommandDeps: []string{"$androidManifestMergerCmd"},
|
|
Description: "merge manifest files",
|
|
},
|
|
"libsManifests")
|
|
)
|
|
|
|
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",
|
|
blueprint.RuleParams{
|
|
Command: `${config.MergeZipsCmd} $out $in`,
|
|
CommandDeps: []string{"${config.MergeZipsCmd}"},
|
|
})
|
|
|
|
func CreateAppPackage(ctx android.ModuleContext, outputFile android.WritablePath,
|
|
resJarFile, dexJarFile android.Path, certificates []certificate) {
|
|
|
|
// TODO(ccross): JNI libs
|
|
|
|
unsignedApk := android.PathForModuleOut(ctx, "unsigned.apk")
|
|
|
|
inputs := android.Paths{resJarFile}
|
|
if dexJarFile != nil {
|
|
inputs = append(inputs, dexJarFile)
|
|
}
|
|
|
|
ctx.Build(pctx, android.BuildParams{
|
|
Rule: combineApk,
|
|
Inputs: inputs,
|
|
Output: unsignedApk,
|
|
})
|
|
|
|
var certificateArgs []string
|
|
for _, c := range certificates {
|
|
certificateArgs = append(certificateArgs, c.pem.String(), c.key.String())
|
|
}
|
|
|
|
// TODO(ccross): sometimes uncompress dex
|
|
// TODO(ccross): sometimes strip dex
|
|
|
|
ctx.Build(pctx, android.BuildParams{
|
|
Rule: signapk,
|
|
Description: "signapk",
|
|
Output: outputFile,
|
|
Input: unsignedApk,
|
|
Args: map[string]string{
|
|
"certificates": strings.Join(certificateArgs, " "),
|
|
},
|
|
})
|
|
}
|
|
|
|
var buildAAR = pctx.AndroidStaticRule("buildAAR",
|
|
blueprint.RuleParams{
|
|
Command: `rm -rf ${outDir} && mkdir -p ${outDir} && ` +
|
|
`cp ${manifest} ${outDir}/AndroidManifest.xml && ` +
|
|
`cp ${classesJar} ${outDir}/classes.jar && ` +
|
|
`cp ${rTxt} ${outDir}/R.txt && ` +
|
|
`${config.SoongZipCmd} -jar -o $out -C ${outDir} -D ${outDir}`,
|
|
CommandDeps: []string{"${config.SoongZipCmd}"},
|
|
},
|
|
"manifest", "classesJar", "rTxt", "outDir")
|
|
|
|
func BuildAAR(ctx android.ModuleContext, outputFile android.WritablePath,
|
|
classesJar, manifest, rTxt android.Path, res android.Paths) {
|
|
|
|
// TODO(ccross): uniquify and copy resources with dependencies
|
|
|
|
deps := android.Paths{manifest, rTxt}
|
|
classesJarPath := ""
|
|
if classesJar != nil {
|
|
deps = append(deps, classesJar)
|
|
classesJarPath = classesJar.String()
|
|
}
|
|
|
|
ctx.Build(pctx, android.BuildParams{
|
|
Rule: buildAAR,
|
|
Implicits: deps,
|
|
Output: outputFile,
|
|
Args: map[string]string{
|
|
"manifest": manifest.String(),
|
|
"classesJar": classesJarPath,
|
|
"rTxt": rTxt.String(),
|
|
"outDir": android.PathForModuleOut(ctx, "aar").String(),
|
|
},
|
|
})
|
|
}
|