diff options
| author | 2024-04-29 22:03:21 +0000 | |
|---|---|---|
| committer | 2024-04-29 22:03:21 +0000 | |
| commit | 205f08b7adda2d2a29cf468c153dd74384d24915 (patch) | |
| tree | 48f07031c2a36bb50ccc89f0edd8275f92bc2d95 | |
| parent | 40ebc99e015960cfd75e1a76309fe5f5624014ef (diff) | |
| parent | c19dfaf9d6ecc8d1b705e68f956dc39ba53f7d8b (diff) | |
Drive instrumentation with build flag for C/C++ am: 10fff94e2e am: c19dfaf9d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3065602
Change-Id: I04dc519f2bb9a3304071ac5430ead38405a2326d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | aconfig/codegen/cc_aconfig_library.go | 2 | ||||
| -rw-r--r-- | aconfig/codegen/init.go | 5 | ||||
| -rw-r--r-- | android/config.go | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/aconfig/codegen/cc_aconfig_library.go b/aconfig/codegen/cc_aconfig_library.go index 8e516b432..f3e9599bc 100644 --- a/aconfig/codegen/cc_aconfig_library.go +++ b/aconfig/codegen/cc_aconfig_library.go @@ -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()), }, }) diff --git a/aconfig/codegen/init.go b/aconfig/codegen/init.go index 6784797eb..98d288f0a 100644 --- a/aconfig/codegen/init.go +++ b/aconfig/codegen/init.go @@ -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", diff --git a/android/config.go b/android/config.go index 40321a18b..872ff9dd4 100644 --- a/android/config.go +++ b/android/config.go @@ -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) |