diff options
| -rw-r--r-- | aconfig/Android.bp | 4 | ||||
| -rw-r--r-- | android/api_levels.go | 1 | ||||
| -rw-r--r-- | android/variable.go | 1 | ||||
| -rw-r--r-- | cc/api_level.go | 6 | ||||
| -rw-r--r-- | java/droidstubs.go | 4 | ||||
| -rw-r--r-- | java/testing.go | 1 | ||||
| -rw-r--r-- | scripts/gen_build_prop.py | 3 |
7 files changed, 13 insertions, 7 deletions
diff --git a/aconfig/Android.bp b/aconfig/Android.bp index 6e2964a51..6daa63c55 100644 --- a/aconfig/Android.bp +++ b/aconfig/Android.bp @@ -35,6 +35,10 @@ bootstrap_go_package { all_aconfig_declarations { name: "all_aconfig_declarations", api_signature_files: select(soong_config_variable("android_aconfig", "opt_platform_api_srcs"), { + "wear_sdk_api_srcs": [ + ":wear-sdk-api-current.txt", + ":wear-sdk-api-system-current.txt", + ], default: [ ":frameworks-base-api-current.txt", ":frameworks-base-api-system-current.txt", diff --git a/android/api_levels.go b/android/api_levels.go index 2b1d01d8b..d86fea60c 100644 --- a/android/api_levels.go +++ b/android/api_levels.go @@ -465,6 +465,7 @@ func getApiLevelsMapReleasedVersions() (map[string]int, error) { "Tiramisu": 33, "UpsideDownCake": 34, "VanillaIceCream": 35, + "Baklava": 36, }, nil } diff --git a/android/variable.go b/android/variable.go index 4867067b0..c34c2f104 100644 --- a/android/variable.go +++ b/android/variable.go @@ -216,6 +216,7 @@ type ProductVariables struct { Platform_display_version_name *string `json:",omitempty"` Platform_version_name *string `json:",omitempty"` Platform_sdk_version *int `json:",omitempty"` + Platform_sdk_version_full *string `json:",omitempty"` Platform_sdk_codename *string `json:",omitempty"` Platform_sdk_version_or_codename *string `json:",omitempty"` Platform_sdk_final *bool `json:",omitempty"` diff --git a/cc/api_level.go b/cc/api_level.go index deca72366..fa8dfaf2f 100644 --- a/cc/api_level.go +++ b/cc/api_level.go @@ -31,11 +31,7 @@ func MinApiForArch(ctx android.EarlyModuleContext, case android.Arm64, android.X86_64: return android.FirstLp64Version case android.Riscv64: - apiLevel, err := android.ApiLevelFromUser(ctx, "VanillaIceCream") - if err != nil { - panic(err) - } - return apiLevel + return android.FutureApiLevel default: panic(fmt.Errorf("Unknown arch %q", arch)) } diff --git a/java/droidstubs.go b/java/droidstubs.go index 22f4d981d..0654fd2ee 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -565,7 +565,9 @@ func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *a } if apiVersions != nil { cmd.FlagWithArg("--current-version ", ctx.Config().PlatformSdkVersion().String()) - cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename()) + if ctx.Config().PlatformSdkVersion().String() != "36" || ctx.Config().PlatformSdkCodename() != "Baklava" { + cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename()) + } cmd.FlagWithInput("--apply-api-levels ", apiVersions) } } diff --git a/java/testing.go b/java/testing.go index 0ea4e6408..9d72dbb07 100644 --- a/java/testing.go +++ b/java/testing.go @@ -426,7 +426,6 @@ func gatherRequiredDepsForTest() string { "kotlin-stdlib-jdk8", "kotlin-annotations", "stub-annotations", - "aconfig-annotations-lib", "aconfig_storage_stub", "unsupportedappusage", diff --git a/scripts/gen_build_prop.py b/scripts/gen_build_prop.py index 355f33d6c..52d4fa2c0 100644 --- a/scripts/gen_build_prop.py +++ b/scripts/gen_build_prop.py @@ -113,6 +113,7 @@ def generate_common_build_props(args): print("####################################") config = args.config + build_flags = config["BuildFlags"] partition = args.partition if partition == "system": @@ -164,6 +165,7 @@ def generate_common_build_props(args): print(f"ro.{partition}.build.version.release={config['Platform_version_last_stable']}") print(f"ro.{partition}.build.version.release_or_codename={config['Platform_version_name']}") print(f"ro.{partition}.build.version.sdk={config['Platform_sdk_version']}") + print(f"ro.{partition}.build.version.sdk_full={config['Platform_sdk_version_full']}") def generate_build_info(args): print() @@ -196,6 +198,7 @@ def generate_build_info(args): print(f"ro.build.display.id?={config['BuildDesc']}") print(f"ro.build.version.incremental={config['BuildNumber']}") print(f"ro.build.version.sdk={config['Platform_sdk_version']}") + print(f"ro.build.version.sdk_full={config['Platform_sdk_version_full']}") print(f"ro.build.version.preview_sdk={config['Platform_preview_sdk_version']}") print(f"ro.build.version.preview_sdk_fingerprint={config['PlatformPreviewSdkFingerprint']}") print(f"ro.build.version.codename={config['Platform_sdk_codename']}") |