Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4332cd1c authored by Zi Wang's avatar Zi Wang Committed by Android Build Cherrypicker Worker
Browse files

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
Ignore-AOSP-First: Will cp to aosp
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9bdd4228cb959d46a60610f3b0eb9b52b95a73ad)
Merged-In: I9384c9c25ce581ac00d309a188cf7533eb2e44a6
Change-Id: I9384c9c25ce581ac00d309a188cf7533eb2e44a6
parent eefca737

java/base.go

+10 −5
Original line number Diff line number Diff line
@@ -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,6 +1104,7 @@ 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")
@@ -1108,6 +1112,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath 
				j.repackageJarjarRules = ruleTextFile

			}

		}

	}



	j.exportAidlIncludeDirs = android.PathsForModuleSrc(ctx, j.deviceProperties.Aidl.Export_include_dirs)