Remove hard-coded build.prop values am: 839ac86ee1 am: 74d7377229
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/17949762
Change-Id: I79b567e0afaca5ca7836b7e8cdfdf5abea4f5f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index b7d844f..3be7eaa 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -153,16 +153,34 @@
genrule {
name: "microdroid_build_prop_gen_x86_64",
- srcs: ["build.prop"],
+ srcs: [
+ "build.prop",
+ ":buildinfo.prop",
+ ],
out: ["build.prop.out"],
- cmd: "cp $(in) $(out); echo ro.product.cpu.abilist=x86_64 >> $(out)",
+ cmd: "(echo '# build properties from buildinfo.prop module' && " +
+ "grep ro\\.build\\.version\\.codename= $(location :buildinfo.prop) && " +
+ "grep ro\\.build\\.version\\.release= $(location :buildinfo.prop) && " +
+ "grep ro\\.build\\.version\\.sdk= $(location :buildinfo.prop) && " +
+ "grep ro\\.build\\.version\\.security_patch= $(location :buildinfo.prop) && " +
+ "cat $(location build.prop) && " +
+ "echo ro.product.cpu.abilist=x86_64) > $(out)",
}
genrule {
name: "microdroid_build_prop_gen_arm64",
- srcs: ["build.prop"],
+ srcs: [
+ "build.prop",
+ ":buildinfo.prop",
+ ],
out: ["build.prop.out"],
- cmd: "cp $(in) $(out); echo ro.product.cpu.abilist=arm64-v8a >> $(out)",
+ cmd: "(echo '# build properties from buildinfo.prop module' && " +
+ "grep ro\\.build\\.version\\.codename= $(location :buildinfo.prop) && " +
+ "grep ro\\.build\\.version\\.release= $(location :buildinfo.prop) && " +
+ "grep ro\\.build\\.version\\.sdk= $(location :buildinfo.prop) && " +
+ "grep ro\\.build\\.version\\.security_patch= $(location :buildinfo.prop) && " +
+ "cat $(location build.prop) && " +
+ "echo ro.product.cpu.abilist=arm64-v8a) > $(out)",
}
android_filesystem {
diff --git a/microdroid/build.prop b/microdroid/build.prop
index 2caadbf..a9824c0 100644
--- a/microdroid/build.prop
+++ b/microdroid/build.prop
@@ -3,11 +3,5 @@
ro.adb.secure=0
service.adb.listen_addrs=vsock:5555
-# TODO(b/189164487): support build related properties
-ro.build.version.codename=Tiramisu
-ro.build.version.release=13
-ro.build.version.sdk=33
-ro.build.version.security_patch=2022-06-05
-
# Payload metadata partition
apexd.payload_metadata.path=/dev/block/by-name/payload-metadata