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

Commit 45bf82e9 authored by Jiyong Park's avatar Jiyong Park
Browse files

Assert android.ApexModule interface for types having ApexModuleBase 

Bug: 173472337
Test: m nothing
Change-Id: Idf1c6cb9fff6c18e34c4636e38a662ba4ff7d538
parent e8e86068

cc/cc.go

+4 −0
Original line number Diff line number Diff line
@@ -2992,6 +2992,9 @@ func (c *Module) AndroidMkWriteAdditionalDependenciesForSourceAbiDiff(w io.Write 
	}

}



var _ android.ApexModule = (*Module)(nil)



// Implements android.ApexModule

func (c *Module) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool {

	depTag := ctx.OtherModuleDependencyTag(dep)

	libDepTag, isLibDepTag := depTag.(libraryDependencyTag)
@@ -3025,6 +3028,7 @@ func (c *Module) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Modu 
	return true

}



// Implements android.ApexModule

func (c *Module) ShouldSupportSdkVersion(ctx android.BaseModuleContext,

	sdkVersion android.ApiLevel) error {

	// We ignore libclang_rt.* prebuilt libs since they declare sdk_version: 14(b/121358700)

genrule/genrule.go

+3 −0
Original line number Diff line number Diff line
@@ -547,6 +547,9 @@ func (g *Module) AndroidMk() android.AndroidMkData { 
	}

}



var _ android.ApexModule = (*Module)(nil)



// Implements android.ApexModule

func (g *Module) ShouldSupportSdkVersion(ctx android.BaseModuleContext,

	sdkVersion android.ApiLevel) error {

	// Because generated outputs are checked by client modules(e.g. cc_library, ...)

java/aar.go

+4 −0
Original line number Diff line number Diff line
@@ -851,10 +851,14 @@ func (a *AARImport) SrcJarArgs() ([]string, android.Paths) { 
	return nil, nil

}



var _ android.ApexModule = (*AARImport)(nil)



// Implements android.ApexModule

func (a *AARImport) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool {

	return a.depIsInSameApex(ctx, dep)

}



// Implements android.ApexModule

func (g *AARImport) ShouldSupportSdkVersion(ctx android.BaseModuleContext,

	sdkVersion android.ApiLevel) error {

	return nil

java/app.go

+3 −0
Original line number Diff line number Diff line
@@ -1653,6 +1653,9 @@ func (a *AndroidAppImport) minSdkVersion() sdkSpec { 
	return sdkSpecFrom("")

}



var _ android.ApexModule = (*AndroidAppImport)(nil)



// Implements android.ApexModule

func (j *AndroidAppImport) ShouldSupportSdkVersion(ctx android.BaseModuleContext,

	sdkVersion android.ApiLevel) error {

	// Do not check for prebuilts against the min_sdk_version of enclosing APEX

java/java.go

+11 −0
Original line number Diff line number Diff line
@@ -2021,10 +2021,12 @@ func (j *Module) hasCode(ctx android.ModuleContext) bool { 
	return len(srcFiles) > 0 || len(ctx.GetDirectDepsWithTag(staticLibTag)) > 0

}



// Implements android.ApexModule

func (j *Module) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool {

	return j.depIsInSameApex(ctx, dep)

}



// Implements android.ApexModule

func (j *Module) ShouldSupportSdkVersion(ctx android.BaseModuleContext,

	sdkVersion android.ApiLevel) error {

	sdkSpec := j.minSdkVersion()
@@ -2070,6 +2072,8 @@ type Library struct { 
	InstallMixin func(ctx android.ModuleContext, installPath android.Path) (extraInstallDeps android.Paths)

}



var _ android.ApexModule = (*Library)(nil)



// Provides access to the list of permitted packages from updatable boot jars.

type PermittedPackagesForUpdatableBootJars interface {

	PermittedPackagesForUpdatableBootJars() []string
@@ -2934,10 +2938,14 @@ func (j *Import) SrcJarArgs() ([]string, android.Paths) { 
	return nil, nil

}



var _ android.ApexModule = (*Import)(nil)



// Implements android.ApexModule

func (j *Import) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool {

	return j.depIsInSameApex(ctx, dep)

}



// Implements android.ApexModule

func (j *Import) ShouldSupportSdkVersion(ctx android.BaseModuleContext,

	sdkVersion android.ApiLevel) error {

	// Do not check for prebuilts against the min_sdk_version of enclosing APEX
@@ -3129,6 +3137,9 @@ func (j *DexImport) DexJarBuildPath() android.Path { 
	return j.dexJarFile

}



var _ android.ApexModule = (*DexImport)(nil)



// Implements android.ApexModule

func (j *DexImport) ShouldSupportSdkVersion(ctx android.BaseModuleContext,

	sdkVersion android.ApiLevel) error {

	// we don't check prebuilt modules for sdk_version