Skip to content

Commit

Permalink
Add property Skip_jarjar_repackage
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mrziwang committed Feb 27, 2024
1 parent 5520164 commit 9bdd422
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions java/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
}
}
}

Expand Down

0 comments on commit 9bdd422

Please sign in to comment.