Merge changes from topic "prebuilt_apk_set" am: a3e8885658 am: c067b0280c

Change-Id: Id7848044c6a0bbf18c005fc04e037b8ae4345903
This commit is contained in:
Jaewoong Jung
2020-05-15 12:54:15 +00:00
committed by Automerger Merge Worker
16 changed files with 5298 additions and 1 deletions

View File

@@ -124,7 +124,7 @@ func init() {
pctx.HostBinToolVariable("D8Cmd", "d8")
pctx.HostBinToolVariable("R8Cmd", "r8-compat-proguard")
pctx.HostBinToolVariable("HiddenAPICmd", "hiddenapi")
pctx.HostBinToolVariable("ExtractApksCmd", "extract_apks")
pctx.VariableFunc("TurbineJar", func(ctx android.PackageVarContext) string {
turbine := "turbine.jar"
if ctx.Config().UnbundledBuild() {