Merge "Regenerate R.java files from LOCAL_STATIC_ANDROID_LIBRARIES" am: 93b4818201
am: c368d6196c
Change-Id: Iea1fb5b38ec54ed28b6f8b3c31aba3b43ec05b98
This commit is contained in:
@@ -87,6 +87,7 @@ func init() {
|
||||
pctx.SourcePathVariable("GenKotlinBuildFileCmd", "build/soong/scripts/gen-kotlin-build-file.sh")
|
||||
|
||||
pctx.SourcePathVariable("JarArgsCmd", "build/soong/scripts/jar-args.sh")
|
||||
pctx.HostBinToolVariable("ExtractJarPackagesCmd", "extract_jar_packages")
|
||||
pctx.HostBinToolVariable("SoongZipCmd", "soong_zip")
|
||||
pctx.HostBinToolVariable("MergeZipsCmd", "merge_zips")
|
||||
pctx.HostBinToolVariable("Zip2ZipCmd", "zip2zip")
|
||||
|
@@ -77,4 +77,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
|
||||
|
||||
ctx.Strict("JACOCO_CLI_JAR", "${JacocoCLIJar}")
|
||||
ctx.Strict("DEFAULT_JACOCO_EXCLUDE_FILTER", strings.Join(DefaultJacocoExcludeFilter, ","))
|
||||
|
||||
ctx.Strict("EXTRACT_JAR_PACKAGES", "${ExtractJarPackagesCmd}")
|
||||
}
|
||||
|
Reference in New Issue
Block a user