diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/builder.go | 4 | ||||
| -rw-r--r-- | java/java.go | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/java/builder.go b/java/builder.go index f0cfeaea..4eb03c25 100644 --- a/java/builder.go +++ b/java/builder.go @@ -85,10 +85,10 @@ func init() { pctx.StaticVariable("javacCmd", "javac -J-Xmx1024M $commonJdkFlags") pctx.StaticVariable("jarCmd", filepath.Join(bootstrap.BinDir, "soong_jar")) pctx.VariableFunc("dxCmd", func(c interface{}) (string, error) { - return c.(Config).HostBinTool("dx") + return c.(common.Config).HostBinTool("dx") }) pctx.VariableFunc("jarjarCmd", func(c interface{}) (string, error) { - return c.(Config).HostJavaTool("jarjar.jar") + return c.(common.Config).HostJavaTool("jarjar.jar") }) } diff --git a/java/java.go b/java/java.go index f9347218..8750dbf8 100644 --- a/java/java.go +++ b/java/java.go @@ -29,14 +29,6 @@ import ( "android/soong/common" ) -type Config interface { - SrcDir() string - PrebuiltOS() string - HostBinTool(string) (string, error) - HostJavaTool(string) (string, error) - Getenv(string) string -} - // TODO: // Autogenerated files: // AIDL @@ -266,11 +258,11 @@ func (j *javaBase) GenerateJavaBuildActions(ctx common.AndroidModuleContext) { dxFlags = append(dxFlags, "--no-locals") } - if ctx.Config().(Config).Getenv("NO_OPTIMIZE_DX") != "" { + if ctx.AConfig().Getenv("NO_OPTIMIZE_DX") != "" { dxFlags = append(dxFlags, "--no-optimize") } - if ctx.Config().(Config).Getenv("GENERATE_DEX_DEBUG") != "" { + if ctx.AConfig().Getenv("GENERATE_DEX_DEBUG") != "" { dxFlags = append(dxFlags, "--debug", "--verbose", |