diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/base.go | 15 | ||||
| -rw-r--r-- | java/config/config.go | 1 |
2 files changed, 6 insertions, 10 deletions
diff --git a/java/base.go b/java/base.go index c70526bd3..b4f800bbd 100644 --- a/java/base.go +++ b/java/base.go @@ -94,9 +94,6 @@ type CommonProperties struct { // if not blank, used as prefix to generate repackage rule Jarjar_prefix *string - // if set to true, skip the jarjar repackaging - Skip_jarjar_repackage *bool - // If not blank, set the java version passed to javac as -source and -target Java_version *string @@ -1112,13 +1109,11 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath jarjarProviderData := j.collectJarJarRules(ctx) if jarjarProviderData != nil { android.SetProvider(ctx, JarJarProvider, *jarjarProviderData) - if !proptools.Bool(j.properties.Skip_jarjar_repackage) { - text := getJarJarRuleText(jarjarProviderData) - if text != "" { - ruleTextFile := android.PathForModuleOut(ctx, "repackaged-jarjar", "repackaging.txt") - android.WriteFileRule(ctx, ruleTextFile, text) - j.repackageJarjarRules = ruleTextFile - } + text := getJarJarRuleText(jarjarProviderData) + if text != "" { + ruleTextFile := android.PathForModuleOut(ctx, "repackaged-jarjar", "repackaging.txt") + android.WriteFileRule(ctx, ruleTextFile, text) + j.repackageJarjarRules = ruleTextFile } } diff --git a/java/config/config.go b/java/config/config.go index 2bb50f62a..0d30fbdf4 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -51,6 +51,7 @@ var ( "core-icu4j", "core-oj", "core-libart", + "wear-sdk.impl", } ) |