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

Commit 6e511a9a authored by Colin Cross's avatar Colin Cross
Browse files

Add libraryDependencyTag to track dependencies on static and shared libraries 

dependencyTag uses a set of predefined tags to identify different types
of dependencies.  There are already multiple bits of metadata stored
in the dependency tag (Library, Shared, ReexportFlags), and supporting
them all requires a combinatorial explosion of predefined tags and
causes issues when using equality comparisons if a new bit of metadata
is added.

Add a new libraryDependencyTag type that will contain the metadata
bits, and replace the quality comparisons with checks on the metadata
bits.

There are 5 TODOs where modifying the checks identified problems with
the existing checks.  These were left in place to produce identical
build output and will be fixed separately.

Bug: 162437057
Test: no change to build.ninja or {Android,make_vars,late}-${TARGET_PRODUCT}.mk
Change-Id: I72d4207dcf381c07c92e00e5a03968ebb5ed8d30
parent afb7c1b7

android/module.go

+2 −2
Original line number Diff line number Diff line
@@ -1833,7 +1833,7 @@ func (b *baseModuleContext) GetTagPath() []blueprint.DependencyTag { 


// A regexp for removing boilerplate from BaseDependencyTag from the string representation of

// a dependency tag.

var tagCleaner = regexp.MustCompile(`\QBaseDependencyTag:blueprint.BaseDependencyTag{}\E(, )?`)

var tagCleaner = regexp.MustCompile(`\QBaseDependencyTag:{}\E(, )?`)



// PrettyPrintTag returns string representation of the tag, but prefers

// custom String() method if available.
@@ -1844,7 +1844,7 @@ func PrettyPrintTag(tag blueprint.DependencyTag) string { 
	}



	// Otherwise, get a default string representation of the tag's struct.

	tagString := fmt.Sprintf("%#v", tag)

	tagString := fmt.Sprintf("%T: %+v", tag, tag)



	// Remove the boilerplate from BaseDependencyTag as it adds no value.

	tagString = tagCleaner.ReplaceAllString(tagString, "")

apex/apex_test.go

+3 −3
Original line number Diff line number Diff line
@@ -4433,11 +4433,11 @@ func TestApexAvailable_DirectDep(t *testing.T) { 
func TestApexAvailable_IndirectDep(t *testing.T) {

	// libbbaz is an indirect dep

	testApexError(t, `requires "libbaz" that is not available for the APEX. Dependency path:

.*via tag apex\.dependencyTag.*"sharedLib".*

.*via tag apex\.dependencyTag.*name:sharedLib.*

.*-> libfoo.*link:shared.*

.*via tag cc\.DependencyTag.*"shared".*

.*via tag cc\.libraryDependencyTag.*Kind:sharedLibraryDependency.*

.*-> libbar.*link:shared.*

.*via tag cc\.DependencyTag.*"shared".*

.*via tag cc\.libraryDependencyTag.*Kind:sharedLibraryDependency.*

.*-> libbaz.*link:shared.*`, `

	apex {

		name: "myapex",

cc/cc.go

+382 −270

File changed.

Preview size limit exceeded, changes collapsed.

cc/coverage.go

+8 −4
Original line number Diff line number Diff line
@@ -103,12 +103,16 @@ func (cov *coverage) flags(ctx ModuleContext, flags Flags, deps PathDeps) (Flags 
			// For static libraries, the only thing that changes our object files

			// are included whole static libraries, so check to see if any of

			// those have coverage enabled.

			ctx.VisitDirectDepsWithTag(wholeStaticDepTag, func(m android.Module) {

			ctx.VisitDirectDeps(func(m android.Module) {

				if depTag, ok := ctx.OtherModuleDependencyTag(m).(libraryDependencyTag); ok {

					if depTag.static() && depTag.wholeStatic {

						if cc, ok := m.(*Module); ok && cc.coverage != nil {

							if cc.coverage.linkCoverage {

								cov.linkCoverage = true

							}

						}

					}

				}

			})

		} else {

			// For executables and shared libraries, we need to check all of

cc/library.go

+1 −2
Original line number Diff line number Diff line
@@ -1633,8 +1633,7 @@ func maybeInjectBoringSSLHash(ctx android.ModuleContext, outputFile android.Modu 
	// TODO(b/137267623): Remove this in favor of a cc_genrule when they support operating on shared libraries.

	injectBoringSSLHash := Bool(inject)

	ctx.VisitDirectDeps(func(dep android.Module) {

		tag := ctx.OtherModuleDependencyTag(dep)

		if tag == StaticDepTag || tag == staticExportDepTag || tag == wholeStaticDepTag || tag == lateStaticDepTag {

		if tag, ok := ctx.OtherModuleDependencyTag(dep).(libraryDependencyTag); ok && tag.static() {

			if cc, ok := dep.(*Module); ok {

				if library, ok := cc.linker.(*libraryDecorator); ok {

					if Bool(library.Properties.Inject_bssl_hash) {