diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-07-07 17:54:01 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2021-07-07 17:54:01 +0000 |
| commit | 99f82c6f4a8511ded6de5e2b5e00565fad7f65de (patch) | |
| tree | a1ecabe68c443bf3d596fe06417e98cc54dc7470 /cc | |
| parent | c57cdd121a8d5a0883a689f6d9fbe6fc440e2202 (diff) | |
| parent | 5abcf9267173b9e80dd14fca037b0f01cc2dbd3b (diff) | |
Merge SP1A.210624.001
Change-Id: I8507f8b65c47a5b425464bbbc8d932a6ca359fd3
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/linker.go | 4 | ||||
| -rw-r--r-- | cc/pgo.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cc/linker.go b/cc/linker.go index 1db943d96..a62e24f74 100644 --- a/cc/linker.go +++ b/cc/linker.go @@ -122,7 +122,7 @@ type BaseLinkerProperties struct { // version script for vendor or product variant Version_script *string `android:"arch_variant"` - } + } `android:"arch_variant"` Recovery struct { // list of shared libs that only should be used to build the recovery // variant of the C/C++ module. @@ -190,7 +190,7 @@ type BaseLinkerProperties struct { // variant of the C/C++ module. Exclude_static_libs []string } - } + } `android:"arch_variant"` // make android::build:GetBuildNumber() available containing the build ID. Use_version_lib *bool `android:"arch_variant"` @@ -56,7 +56,7 @@ func recordMissingProfileFile(ctx BaseModuleContext, missing string) { type PgoProperties struct { Pgo struct { Instrumentation *bool - Sampling *bool + Sampling *bool `android:"arch_variant"` Profile_file *string `android:"arch_variant"` Benchmarks []string Enable_profile_use *bool `android:"arch_variant"` |