commit 839ac86ee1db6203e467c274599877f910772a2b
author Inseob Kim <inseob@google.com> Mon Apr 25 18:24:58 2022 +0900
committer Inseob Kim <inseob@google.com> Mon May 02 09:53:58 2022 +0900
tree fa53fe1588fe293817612ed63227df2b859af10e
parent 08989901d46337f9de0d35acf01a2d4523730820

Remove hard-coded build.prop values

Bug: 189164487
Test: atest MicrodroidTests MicrodroidHostTestCases
Change-Id: I0da6e2920b407663af8613bde92830985016c27f
Merged-In: I0da6e2920b407663af8613bde92830985016c27f
(cherry picked from commit b9465dc0e86c8e478f1432f235c4afbcbba64789)

microdroid/Android.bp

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 {

microdroid/build.prop

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