commit 7ce7da9412eca94e36bc93e72deeb409e7970660
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 24 08:23:25 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 24 08:23:25 2022 +0000
tree 70e1af47abc1a0adfe630643b2ea6c3e82331907
parent 6f362d26213c31b596214dcbae17f33015b6bdc3
parent 7b160bf09f2396541090f803bda7bc9618786ba0

Merge "Add ro.product.cpu.abi to Microdroid"

microdroid/Android.bp

diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 81f94bc..0364896 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -168,7 +168,8 @@
         "grep ro\\.build\\.version\\.security_patch= $(location :buildinfo.prop) && " +
         "grep ro\\.build\\.version\\.known_codenames= $(location :buildinfo.prop) && " +
         "cat $(location build.prop) && " +
-        "echo ro.product.cpu.abilist=x86_64) > $(out)",
+        "echo ro.product.cpu.abilist=x86_64 && " +
+        "echo ro.product.cpu.abi=x86_64) > $(out)",
 }
 
 genrule {
@@ -185,7 +186,8 @@
         "grep ro\\.build\\.version\\.security_patch= $(location :buildinfo.prop) && " +
         "grep ro\\.build\\.version\\.known_codenames= $(location :buildinfo.prop) && " +
         "cat $(location build.prop) && " +
-        "echo ro.product.cpu.abilist=arm64-v8a) > $(out)",
+        "echo ro.product.cpu.abilist=arm64-v8a && " +
+        "echo ro.product.cpu.abi=arm64-v8a) > $(out)",
 }
 
 android_filesystem {