commit d60b534505b3c98eb9cc0827a084b224bdde85a0
author Seungjae Yoo <seungjaeyoo@google.com> Thu Jan 12 03:59:35 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 12 03:59:35 2023 +0000
tree 09fd976b5a3be0797b7ea4565ce8368fa96eadff
parent fc79ec8035ef022e8627369100239c4f3bfc95ae
parent 291372f3993e186ee082608a5414b3344f893aed

Merge "Append INFO file containing emulator and architecture"

Android.bp

diff --git a/Android.bp b/Android.bp
index b738062..a3fab20 100644
--- a/Android.bp
+++ b/Android.bp
@@ -77,7 +77,7 @@
          "mkdir -p $(genDir)/root/upper/etc/config && " +
          "cp $(in) $(genDir)/ && " +
          "mv $(genDir)/*.ipk $(genDir)/root/upper/ipks && " +
-         "mv $(genDir)/LICENSE $(genDir)/HOW_TO_GET_SOURCE_CODE $(genDir)/root/upper && " +
+         "mv $(genDir)/LICENSE $(genDir)/HOW_TO_GET_SOURCE_CODE $(genDir)/INFO $(genDir)/root/upper && " +
          "mv $(genDir)/0_default_config $(genDir)/root/upper/etc/uci-defaults && " +
          "find $(genDir) -maxdepth 1 -type f -exec mv {} $(genDir)/root/upper/etc/config \\; && " +
          "ln -s 2 $(genDir)/root/.fs_state && " +
@@ -91,6 +91,7 @@
     srcs: [
         "x86_64/kmods/*",
         "x86_64/packages/*",
+        "x86_64/INFO",
     ],
     out: ["openwrt_rootfs_customization_x86_64.img"],
     defaults: ["openwrt_rootfs_customization_defaults"],
@@ -101,6 +102,7 @@
     srcs: [
         "arm64/kmods/*",
         "arm64/packages/*",
+        "arm64/INFO",
     ],
     out: ["openwrt_rootfs_customization_aarch64.img"],
     defaults: ["openwrt_rootfs_customization_defaults"],

arm64/INFO

diff --git a/arm64/INFO b/arm64/INFO
new file mode 100644
index 0000000..b9a33b2
--- /dev/null
+++ b/arm64/INFO
@@ -0,0 +1 @@
+arch: armvirt_64

x86_64/INFO

diff --git a/x86_64/INFO b/x86_64/INFO
new file mode 100644
index 0000000..c2409f5
--- /dev/null
+++ b/x86_64/INFO
@@ -0,0 +1 @@
+arch: x86_64