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

Commit 803e161a authored by Pete Bentley's avatar Pete Bentley Committed by Colin Cross
Browse files

Introduce inject_bssl_hash library property. 

external/boringssl needs to run a tool on a shared library, but
cc_genrules currently don't support shared libraries as inputs
or outputs.  Use a property to trigger the desired behavior for
now.

Bug: 137267623
Test: m libcrypto
Change-Id: I75b4a761f8a4f2c65a99453d2781d6d0f93106ef
parent 99f2fc27

cc/library.go

+16 −1
Original line number Diff line number Diff line
@@ -113,6 +113,9 @@ type LibraryProperties struct { 


	// Order symbols in .bss section by their sizes.  Only useful for shared libraries.

	Sort_bss_symbols_by_size *bool



	// Inject boringssl hash into the shared library.  This is only intended for use by external/boringssl.

	Inject_bssl_hash *bool `android:"arch_variant"`

}



type LibraryMutatedProperties struct {
@@ -745,9 +748,21 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext, 
		outputFile = android.PathForModuleOut(ctx, "unstripped", fileName)

		library.stripper.stripExecutableOrSharedLib(ctx, outputFile, strippedOutputFile, builderFlags)

	}



	library.unstrippedOutputFile = outputFile



	// TODO(b/137267623): Remove this in favor of a cc_genrule when they support operating on shared libraries.

	if Bool(library.Properties.Inject_bssl_hash) {

		hashedOutputfile := outputFile

		outputFile = android.PathForModuleOut(ctx, "unhashed", fileName)



		rule := android.NewRuleBuilder()

		rule.Command().

			BuiltTool(ctx, "bssl_inject_hash").

			FlagWithInput("-in-object ", outputFile).

			FlagWithOutput("-o ", hashedOutputfile)

		rule.Build(pctx, ctx, "injectCryptoHash", "inject crypto hash")

	}



	if Bool(library.baseLinker.Properties.Use_version_lib) {

		if ctx.Host() {

			versionedOutputFile := outputFile