Merge "Dist api fingerprint file in singleton build actions" into main am: 496c71d48b am: 57ef30628d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3495389
Change-Id: Ic21c766ff3cf861ca302584c5ed5eb98f4cca3d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index 33e04a4..a15fe86 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -31,9 +31,6 @@
pluginFor: ["soong_build"],
}
-// All FlaggedApi flags associated with platform API.
-// By default this uses the platform APIs associated with android.jar
-// but other verticals/platforms can override via soong config setting.
all_aconfig_declarations {
name: "all_aconfig_declarations",
visibility: [
diff --git a/android/api_levels.go b/android/api_levels.go
index 6d0c389..c042eeb 100644
--- a/android/api_levels.go
+++ b/android/api_levels.go
@@ -468,6 +468,7 @@
"Tiramisu": 33,
"UpsideDownCake": 34,
"VanillaIceCream": 35,
+ "Baklava": 36,
}, nil
}
diff --git a/android/variable.go b/android/variable.go
index 81999f3..a655717 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -216,6 +216,7 @@
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 deca723..fa8dfaf 100644
--- a/cc/api_level.go
+++ b/cc/api_level.go
@@ -31,11 +31,7 @@
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 caad688..24dabdb3 100644
--- a/java/droidstubs.go
+++ b/java/droidstubs.go
@@ -565,7 +565,9 @@
}
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 35319ae..b3071d7 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -424,7 +424,6 @@
"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 74befd5..cef7241 100644
--- a/scripts/gen_build_prop.py
+++ b/scripts/gen_build_prop.py
@@ -113,6 +113,7 @@
print("####################################")
config = args.config
+ build_flags = config["BuildFlags"]
partition = args.partition
if partition == "system":
@@ -164,6 +165,7 @@
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 @@
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']}")