Revert "Dexpreopt soong modules inside soong"
This reverts commit 29ff88741e
.
Test: none
Bug: 119412419
This commit is contained in:
@@ -126,7 +126,6 @@ func init() {
|
||||
pctx.HostJavaToolVariable("JetifierJar", "jetifier.jar")
|
||||
|
||||
pctx.HostBinToolVariable("SoongJavacWrapper", "soong_javac_wrapper")
|
||||
pctx.HostBinToolVariable("DexpreoptGen", "dexpreopt_gen")
|
||||
|
||||
pctx.VariableFunc("JavacWrapper", func(ctx android.PackageVarContext) string {
|
||||
if override := ctx.Config().Getenv("JAVAC_WRAPPER"); override != "" {
|
||||
@@ -153,6 +152,4 @@ func init() {
|
||||
|
||||
pctx.SourcePathsVariable("ManifestMergerJars", " ", ManifestMergerClasspath...)
|
||||
pctx.SourcePathsVariable("ManifestMergerClasspath", ":", ManifestMergerClasspath...)
|
||||
|
||||
pctx.HostBinToolVariable("ZipAlign", "zipalign")
|
||||
}
|
||||
|
@@ -65,7 +65,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
|
||||
ctx.Strict("JMOD", "${JmodCmd}")
|
||||
|
||||
ctx.Strict("SOONG_JAVAC_WRAPPER", "${SoongJavacWrapper}")
|
||||
ctx.Strict("DEXPREOPT_GEN", "${DexpreoptGen}")
|
||||
ctx.Strict("ZIPSYNC", "${ZipSyncCmd}")
|
||||
|
||||
ctx.Strict("JACOCO_CLI_JAR", "${JacocoCLIJar}")
|
||||
|
Reference in New Issue
Block a user