Merge "Update default configuration"

This commit is contained in:
Treehugger Robot
2017-11-14 22:27:48 +00:00
committed by Gerrit Code Review

View File

@@ -205,26 +205,29 @@ func stringPtr(v string) *string {
func (v *productVariables) SetDefaultConfig() { func (v *productVariables) SetDefaultConfig() {
*v = productVariables{ *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"), HostArch: stringPtr("x86_64"),
HostSecondaryArch: stringPtr("x86"), HostSecondaryArch: stringPtr("x86"),
DeviceName: stringPtr("flounder"), DeviceName: stringPtr("generic_arm64"),
DeviceArch: stringPtr("arm64"), DeviceArch: stringPtr("arm64"),
DeviceArchVariant: stringPtr("armv8-a"), DeviceArchVariant: stringPtr("armv8-a"),
DeviceCpuVariant: stringPtr("denver64"), DeviceCpuVariant: stringPtr("generic"),
DeviceAbi: &[]string{"arm64-v8a"}, DeviceAbi: &[]string{"arm64-v8a"},
DeviceUsesClang: boolPtr(true), DeviceUsesClang: boolPtr(true),
DeviceSecondaryArch: stringPtr("arm"), DeviceSecondaryArch: stringPtr("arm"),
DeviceSecondaryArchVariant: stringPtr("armv7-a-neon"), DeviceSecondaryArchVariant: stringPtr("armv8-a"),
DeviceSecondaryCpuVariant: stringPtr("denver"), DeviceSecondaryCpuVariant: stringPtr("generic"),
DeviceSecondaryAbi: &[]string{"armeabi-v7a"}, DeviceSecondaryAbi: &[]string{"armeabi-v7a", "armeabi"},
AAPTConfig: &[]string{"normal", "large", "xlarge", "hdpi", "xhdpi", "xxhdpi"}, AAPTConfig: &[]string{"normal", "large", "xlarge", "hdpi", "xhdpi", "xxhdpi"},
AAPTPreferredConfig: stringPtr("xhdpi"), AAPTPreferredConfig: stringPtr("xhdpi"),
AAPTCharacteristics: stringPtr("nosdcard"), AAPTCharacteristics: stringPtr("nosdcard"),
AAPTPrebuiltDPI: &[]string{"xhdpi", "xxhdpi"}, AAPTPrebuiltDPI: &[]string{"xhdpi", "xxhdpi"},
Malloc_not_svelte: boolPtr(false), Malloc_not_svelte: boolPtr(true),
Safestack: boolPtr(false), Safestack: boolPtr(false),
} }