diff options
Diffstat (limited to 'cc')
-rw-r--r-- | cc/androidmk.go | 6 | ||||
-rw-r--r-- | cc/config/vndk.go | 2 | ||||
-rw-r--r-- | cc/pgo.go | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go index 988ebd4e3..ff88091d5 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -284,6 +284,9 @@ func (benchmark *benchmarkDecorator) AndroidMk(ctx AndroidMkContext, ret *androi fmt.Fprintln(w, "LOCAL_FULL_TEST_CONFIG :=", benchmark.testConfig.String()) } fmt.Fprintln(w, "LOCAL_NATIVE_BENCHMARK := true") + if !BoolDefault(benchmark.Properties.Auto_gen_config, true) { + fmt.Fprintln(w, "LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG := true") + } }) androidMkWriteTestData(benchmark.data, ctx, ret) @@ -304,6 +307,9 @@ func (test *testBinary) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkDa if test.testConfig != nil { fmt.Fprintln(w, "LOCAL_FULL_TEST_CONFIG :=", test.testConfig.String()) } + if !BoolDefault(test.Properties.Auto_gen_config, true) { + fmt.Fprintln(w, "LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG := true") + } }) androidMkWriteTestData(test.data, ctx, ret) diff --git a/cc/config/vndk.go b/cc/config/vndk.go index c3cda4976..9feb5a3c5 100644 --- a/cc/config/vndk.go +++ b/cc/config/vndk.go @@ -84,6 +84,7 @@ var VndkMustUseVendorVariantList = []string{ "android.hardware.thermal@1.0", "android.hardware.tv.cec@1.0", "android.hardware.tv.input@1.0", + "android.hardware.vibrator-ndk_platform", "android.hardware.vibrator@1.0", "android.hardware.vibrator@1.1", "android.hardware.vibrator@1.2", @@ -165,5 +166,4 @@ var VndkMustUseVendorVariantList = []string{ "libxml2", "libyuv", "libziparchive", - "vintf-vibrator-ndk_platform", } @@ -210,11 +210,6 @@ func (props *PgoProperties) isPGO(ctx BaseModuleContext) bool { ctx.ModuleErrorf("PGO specification is missing properties: " + missingProps) } - // Sampling not supported yet - if isSampling { - ctx.PropertyErrorf("pgo.sampling", "\"sampling\" is not supported yet)") - } - if isSampling && isInstrumentation { ctx.PropertyErrorf("pgo", "Exactly one of \"instrumentation\" and \"sampling\" properties must be set") } |