Extract common behavior between Module and Import am: 0d3c2e136b (8bf22015) · Commits · e / os / android_build_soong

java/java.go

+24 −10

Original line number	Diff line number	Diff line
		@@ -350,6 +350,22 @@ func (me *CompilerDeviceProperties) EffectiveOptimizeEnabled() bool {
		return BoolDefault(me.Optimize.Enabled, me.Optimize.EnabledByDefault)
		}

		// Functionality common to Module and Import
		type embeddableInModuleAndImport struct {
		}

		// Module/Import's DepIsInSameApex(...) delegates to this method.
		//
		// This cannot implement DepIsInSameApex(...) directly as that leads to ambiguity with
		// the one provided by ApexModuleBase.
		func (e *embeddableInModuleAndImport) depIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool {
		// dependencies other than the static linkage are all considered crossing APEX boundary
		if staticLibTag == ctx.OtherModuleDependencyTag(dep) {
		return true
		}
		return false
		}

		// Module contains the properties and members used by all java module types
		type Module struct {
		android.ModuleBase
		@@ -357,6 +373,9 @@ type Module struct {
		android.ApexModuleBase
		android.SdkBase

		// Functionality common to Module and Import.
		embeddableInModuleAndImport

		properties CompilerProperties
		protoProperties android.ProtoProperties
		deviceProperties CompilerDeviceProperties
		@@ -1768,11 +1787,7 @@ func (j *Module) hasCode(ctx android.ModuleContext) bool {
		}

		func (j *Module) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool {
		// Dependencies other than the static linkage are all considered crossing APEX boundary
		if staticLibTag == ctx.OtherModuleDependencyTag(dep) {
		return true
		}
		return false
		return j.depIsInSameApex(ctx, dep)
		}

		func (j *Module) Stem() string {
		@@ -2386,6 +2401,9 @@ type Import struct {
		prebuilt android.Prebuilt
		android.SdkBase

		// Functionality common to Module and Import.
		embeddableInModuleAndImport

		properties ImportProperties

		combinedClasspathFile android.Path
		@@ -2520,11 +2538,7 @@ func (j *Import) SrcJarArgs() ([]string, android.Paths) {
		}

		func (j *Import) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool {
		// dependencies other than the static linkage are all considered crossing APEX boundary
		if staticLibTag == ctx.OtherModuleDependencyTag(dep) {
		return true
		}
		return false
		return j.depIsInSameApex(ctx, dep)
		}

		// Add compile time check for interface implementation