StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add property Skip_jarjar_repackage

Browse Source 
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
This commit is contained in:
Zi Wang
2024-02-26 18:21:01 -08:00
parent 552016475b
commit 9bdd4228cb
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/base.go
View File

@@ -95,6 +95,9 @@ type CommonProperties struct {
// if not blank, used as prefix to generate repackage rule // if not blank, used as prefix to generate repackage rule
Jarjar_prefix *string 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 // If not blank, set the java version passed to javac as -source and -target
Java_version *string Java_version *string
@@ -1101,6 +1104,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath
jarjarProviderData := j.collectJarJarRules(ctx) jarjarProviderData := j.collectJarJarRules(ctx)
if jarjarProviderData != nil { if jarjarProviderData != nil {
android.SetProvider(ctx, JarJarProvider, *jarjarProviderData) android.SetProvider(ctx, JarJarProvider, *jarjarProviderData)
if !proptools.Bool(j.properties.Skip_jarjar_repackage) {
text := getJarJarRuleText(jarjarProviderData) text := getJarJarRuleText(jarjarProviderData)
if text != "" { if text != "" {
ruleTextFile := android.PathForModuleOut(ctx, "repackaged-jarjar", "repackaging.txt") ruleTextFile := android.PathForModuleOut(ctx, "repackaged-jarjar", "repackaging.txt")
@@ -1108,6 +1112,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath
j.repackageJarjarRules = ruleTextFile j.repackageJarjarRules = ruleTextFile
} }
} }
}
j.exportAidlIncludeDirs = android.PathsForModuleSrc(ctx, j.deviceProperties.Aidl.Export_include_dirs) j.exportAidlIncludeDirs = android.PathsForModuleSrc(ctx, j.deviceProperties.Aidl.Export_include_dirs)