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

Commit 10fff94e authored by Ted Bauer's avatar Ted Bauer
Browse files

Drive instrumentation with build flag for C/C++ 

Bug: 328444881
Test: m
Change-Id: I20c92c61f855adb772d6aa173e85a6d8092460d7
parent 6f581637

aconfig/codegen/cc_aconfig_library.go

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import ( 
	"github.com/google/blueprint/proptools"



	"fmt"

	"strconv"

	"strings"

)
@@ -152,6 +153,7 @@ func (this *CcAconfigLibraryCallbacks) GeneratorBuildActions(ctx cc.ModuleContex 
		Args: map[string]string{

			"gendir": this.generatedDir.String(),

			"mode":   mode,

			"debug":  strconv.FormatBool(ctx.Config().ReleaseReadFromNewStorageCc()),

		},

	})

aconfig/codegen/init.go

+3 −2
Original line number Diff line number Diff line
@@ -49,11 +49,12 @@ var ( 
				` && ${aconfig} create-cpp-lib` +

				`    --mode ${mode}` +

				`    --cache ${in}` +

				`    --out ${gendir}`,

				`    --out ${gendir}` +

				`    --allow-instrumentation ${debug}`,

			CommandDeps: []string{

				"$aconfig",

			},

		}, "gendir", "mode")

		}, "gendir", "mode", "debug")



	// For rust_aconfig_library: Generate Rust library

	rustRule = pctx.AndroidStaticRule("rust_aconfig_library",

android/config.go

+5 −0
Original line number Diff line number Diff line
@@ -229,6 +229,11 @@ func (c Config) ReleaseNdkAbiMonitored() bool { 
	return c.config.productVariables.GetBuildFlagBool("RELEASE_NDK_ABI_MONITORED")

}



// Enable read flag from new storage, for C/C++

func (c Config) ReleaseReadFromNewStorageCc() bool {

	return c.config.productVariables.GetBuildFlagBool("RELEASE_READ_FROM_NEW_STORAGE_CC")

}



func (c Config) ReleaseHiddenApiExportableStubs() bool {

	return c.config.productVariables.GetBuildFlagBool("RELEASE_HIDDEN_API_EXPORTABLE_STUBS") ||

		Bool(c.config.productVariables.HiddenapiExportableStubs)