diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-14 22:27:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-14 22:27:48 +0000 |
| commit | 90377447c89cd7d0c470e04c4d5e0500377ff035 (patch) | |
| tree | 613ba7e37091342bb78c042f5210194a701ca75a | |
| parent | c7d1254119c2811b8618e56714736901a4c3aea3 (diff) | |
| parent | cbf9e827a7882d09e47a7bdc47dcc577b79f2b22 (diff) | |
| download | build_soong-90377447c89cd7d0c470e04c4d5e0500377ff035.tar.gz build_soong-90377447c89cd7d0c470e04c4d5e0500377ff035.tar.bz2 build_soong-90377447c89cd7d0c470e04c4d5e0500377ff035.zip | |
Merge "Update default configuration"
| -rw-r--r-- | android/variable.go | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/android/variable.go b/android/variable.go index d89c1468..42728175 100644 --- a/android/variable.go +++ b/android/variable.go @@ -205,26 +205,29 @@ func stringPtr(v string) *string { func (v *productVariables) SetDefaultConfig() { *v = productVariables{ - Platform_sdk_version: intPtr(24), + Platform_sdk_version: intPtr(26), + Platform_version_active_codenames: []string{"P"}, + Platform_version_future_codenames: []string{"P"}, + HostArch: stringPtr("x86_64"), HostSecondaryArch: stringPtr("x86"), - DeviceName: stringPtr("flounder"), + DeviceName: stringPtr("generic_arm64"), DeviceArch: stringPtr("arm64"), DeviceArchVariant: stringPtr("armv8-a"), - DeviceCpuVariant: stringPtr("denver64"), + DeviceCpuVariant: stringPtr("generic"), DeviceAbi: &[]string{"arm64-v8a"}, DeviceUsesClang: boolPtr(true), DeviceSecondaryArch: stringPtr("arm"), - DeviceSecondaryArchVariant: stringPtr("armv7-a-neon"), - DeviceSecondaryCpuVariant: stringPtr("denver"), - DeviceSecondaryAbi: &[]string{"armeabi-v7a"}, + DeviceSecondaryArchVariant: stringPtr("armv8-a"), + DeviceSecondaryCpuVariant: stringPtr("generic"), + DeviceSecondaryAbi: &[]string{"armeabi-v7a", "armeabi"}, AAPTConfig: &[]string{"normal", "large", "xlarge", "hdpi", "xhdpi", "xxhdpi"}, AAPTPreferredConfig: stringPtr("xhdpi"), AAPTCharacteristics: stringPtr("nosdcard"), AAPTPrebuiltDPI: &[]string{"xhdpi", "xxhdpi"}, - Malloc_not_svelte: boolPtr(false), + Malloc_not_svelte: boolPtr(true), Safestack: boolPtr(false), } |