diff options
| author | Zi Wang <mrziwang@google.com> | 2024-02-26 18:21:01 -0800 |
|---|---|---|
| committer | Zi Wang <mrziwang@google.com> | 2024-02-27 02:26:25 +0000 |
| commit | 9bdd4228cb959d46a60610f3b0eb9b52b95a73ad (patch) | |
| tree | de11c8c9bbaf1e1f8bb0bc05bdc8d027a7727b40 /java | |
| parent | 552016475b26039750030d002e35bd4f77e577c4 (diff) | |
Add property Skip_jarjar_repackage
If this property is set to true on a module, this module will
not have jarjar repackaging.
Test: CI
Bug: 327009143
Change-Id: I9384c9c25ce581ac00d309a188cf7533eb2e44a6
Ignore-AOSP-First: Will cp to aosp
Diffstat (limited to 'java')
| -rw-r--r-- | java/base.go | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/java/base.go b/java/base.go index 7f4ea08c7..371d8f9a1 100644 --- a/java/base.go +++ b/java/base.go @@ -95,6 +95,9 @@ 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 @@ -1101,11 +1104,13 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath jarjarProviderData := j.collectJarJarRules(ctx) if jarjarProviderData != nil { android.SetProvider(ctx, JarJarProvider, *jarjarProviderData) - text := getJarJarRuleText(jarjarProviderData) - if text != "" { - ruleTextFile := android.PathForModuleOut(ctx, "repackaged-jarjar", "repackaging.txt") - android.WriteFileRule(ctx, ruleTextFile, text) - j.repackageJarjarRules = ruleTextFile + 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 + } } } |