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

Commit 6ba6e16f authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Add libraryDependencyTag to track dependencies on static and shared... 

Merge "Add libraryDependencyTag to track dependencies on static and shared libraries" am: 2eddd068 am: f6c453a3 am: 7f034dab

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1378332

Change-Id: I584f82a5b522d3efa0e2ee04aad995f8d0da66d3
parents 46bf6ace 7f034dab

android/module.go

+2 −2
Original line number Diff line number Diff line
@@ -1840,7 +1840,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.
@@ -1851,7 +1851,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
@@ -4450,11 +4450,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
@@ -105,12 +105,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) {