Merge "Add property Skip_jarjar_repackage" into main (5ae58dca) · Commits · e / os / android_build_soong

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)