diff options
| author | Colin Cross <ccross@android.com> | 2019-04-03 14:04:07 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-03 14:04:07 -0700 |
| commit | 49c87dfae95b0315cc5c7ca2d4491f90b02bcb4b (patch) | |
| tree | 450b997b8e161fd0983ec43d0c8b2af13734b5a2 /android | |
| parent | 673f43b05f24a3658a82043ce5dc4753834fe262 (diff) | |
| parent | 209edee4251d6dbb58571f96773a0d9787d33365 (diff) | |
| download | build_soong-49c87dfae95b0315cc5c7ca2d4491f90b02bcb4b.tar.gz build_soong-49c87dfae95b0315cc5c7ca2d4491f90b02bcb4b.tar.bz2 build_soong-49c87dfae95b0315cc5c7ca2d4491f90b02bcb4b.zip | |
Merge "Fix sdk_version: "system_current" when Platform_sdk_final=true" am: b007b2bde5 am: 8c3f398c6c
am: 209edee425
Change-Id: I54ea846c9ac2b29354109755225db71dcdaa1527
Diffstat (limited to 'android')
| -rw-r--r-- | android/config.go | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/android/config.go b/android/config.go index fff77ca8..2e0750b7 100644 --- a/android/config.go +++ b/android/config.go @@ -200,12 +200,14 @@ func saveToConfigFile(config jsonConfigurable, filename string) error { func TestConfig(buildDir string, env map[string]string) Config { config := &config{ productVariables: productVariables{ - DeviceName: stringPtr("test_device"), - Platform_sdk_version: intPtr(26), - AAPTConfig: []string{"normal", "large", "xlarge", "hdpi", "xhdpi", "xxhdpi"}, - AAPTPreferredConfig: stringPtr("xhdpi"), - AAPTCharacteristics: stringPtr("nosdcard"), - AAPTPrebuiltDPI: []string{"xhdpi", "xxhdpi"}, + DeviceName: stringPtr("test_device"), + Platform_sdk_version: intPtr(26), + DeviceSystemSdkVersions: []string{"14", "15"}, + Platform_systemsdk_versions: []string{"25", "26"}, + AAPTConfig: []string{"normal", "large", "xlarge", "hdpi", "xhdpi", "xxhdpi"}, + AAPTPreferredConfig: stringPtr("xhdpi"), + AAPTCharacteristics: stringPtr("nosdcard"), + AAPTPrebuiltDPI: []string{"xhdpi", "xxhdpi"}, }, buildDir: buildDir, |