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

Commit 18417cbd authored by Cindy Zhou's avatar Cindy Zhou
Browse files

Skip apex dep check when sanitizer diag is enabled 

To avoid adding ubsan to the apex allowed_dep list, this commit adds a
check on depedency tags to see if apex check should be skipped.
The check is only used on sharedLib dependencies when diag mode are enabled
for sanitizers.

Bug: 158010610

Test: make build for aosp-sargo and aosp_cf_x86_phone-userdebug

Change-Id: I3d7dbb70d8c80ffae1854819cf8cf9e6b0b15c00
parent 8bfb63c5

android/apex.go

+6 −0
Original line number Diff line number Diff line
@@ -253,6 +253,12 @@ type CopyDirectlyInAnyApexTag interface { 
	CopyDirectlyInAnyApex()

}



// Interface that identifies dependencies to skip Apex dependency check

type SkipApexAllowedDependenciesCheck interface {

	// Returns true to skip the Apex dependency check, which limits the allowed dependency in build.

	SkipApexAllowedDependenciesCheck() bool

}



// ApexModuleBase provides the default implementation for the ApexModule interface. APEX-aware

// modules are expected to include this struct and call InitApexModule().

type ApexModuleBase struct {

apex/builder.go

+6 −0
Original line number Diff line number Diff line
@@ -902,6 +902,12 @@ func (a *apexBundle) buildApexDependencyInfo(ctx android.ModuleContext) { 
			return !externalDep

		}



		depTag := ctx.OtherModuleDependencyTag(to)

		if skipDepCheck, ok := depTag.(android.SkipApexAllowedDependenciesCheck); ok && skipDepCheck.SkipApexAllowedDependenciesCheck() {

			// Check to see if dependency been marked to skip the dependency check

			return !externalDep

		}



		if info, exists := depInfos[to.Name()]; exists {

			if !android.InList(from.Name(), info.From) {

				info.From = append(info.From, from.Name())

cc/cc.go

+3 −0
Original line number Diff line number Diff line
@@ -609,6 +609,9 @@ type libraryDependencyTag struct { 


	makeSuffix string



	// Whether or not this dependency should skip the apex dependency check

	skipApexAllowedDependenciesCheck bool



	// Whether or not this dependency has to be followed for the apex variants

	excludeInApex bool

}

cc/sanitize.go

+18 −2
Original line number Diff line number Diff line
@@ -204,6 +204,13 @@ type sanitize struct { 
	Properties SanitizeProperties

}



// Mark this tag with a check to see if apex dependency check should be skipped

func (t libraryDependencyTag) SkipApexAllowedDependenciesCheck() bool {

	return t.skipApexAllowedDependenciesCheck

}



var _ android.SkipApexAllowedDependenciesCheck = (*libraryDependencyTag)(nil)



func init() {

	android.RegisterMakeVarsProvider(pctx, cfiMakeVarsProvider)

	android.RegisterMakeVarsProvider(pctx, hwasanMakeVarsProvider)
@@ -1038,9 +1045,18 @@ func sanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) { 
						runtimeLibrary = lib

					}

				}



				// Skip apex dependency check for sharedLibraryDependency

				// when sanitizer diags are enabled. Skipping the check will allow

				// building with diag libraries without having to list the

				// dependency in Apex's allowed_deps file.

				diagEnabled := len(diagSanitizers) > 0

				// dynamic executable and shared libs get shared runtime libs

				depTag := libraryDependencyTag{Kind: sharedLibraryDependency, Order: earlyLibraryDependency}

				depTag := libraryDependencyTag{

					Kind:  sharedLibraryDependency,

					Order: earlyLibraryDependency,



					skipApexAllowedDependenciesCheck: diagEnabled,

				}

				variations := append(mctx.Target().Variations(),

					blueprint.Variation{Mutator: "link", Variation: "shared"})

				if c.Device() {