Snap for 10927977 from 483ccb2c7987a6d2899298707c63a02481ff7787 to mainline-odp-releaseaml_odp_341717000aml_odp_341610000

Change-Id: I6d67ebfddcd544165296a8b60541a33a75a3ee7e

5 files changed, 38 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 95166aea..d9576e89 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,3 +44,41 @@ cc_prebuilt_binary {
     device_supported: false,
     host_supported: true,
 }
+
+// These are set up as two separate executables rather than a symlink so that
+// either can be downloaded as a standalone statically linked executable from
+// the build system.
+// arch arm64 manifest is at https://ci.android.com/builds/submitted/10769592/
+// aosp_cf_arm64_only_phone-trunk_staging-userdebug/latest/manifest_10769592.xml
+// arch x86_64 manifest is at https://ci.android.com/builds/submitted/10763722/
+// aosp_cf_x86_64_phone-trunk_staging-userdebug/latest/manifest_10763722.xml
+// ARM64 cvd BID is 10769592, x86_64 cvd BID is 10763722.
+
+cc_prebuilt_binary  {
+    name: "cvd",
+    arch: {
+        arm64: {
+            srcs: ["cvd/cvd_arm64"],
+        },
+        x86_64: {
+            srcs: ["cvd/cvd_x86_64"],
+        },
+    },
+    symlinks: ["acloud"],
+    device_supported: false,
+    host_supported: true,
+}
+
+cc_prebuilt_binary  {
+    name: "fetch_cvd",
+    arch: {
+        arm64: {
+            srcs: ["cvd/fetch_cvd_arm64"],
+        },
+        x86_64: {
+            srcs: ["cvd/fetch_cvd_x86_64"],
+        },
+    },
+    device_supported: false,
+    host_supported: true,
+}
diff --git a/cvd/cvd_arm64 b/cvd/cvd_arm64
new file mode 100755
index 00000000..78ddc615
--- /dev/null
+++ b/cvd/cvd_arm64
diff --git a/cvd/cvd_x86_64 b/cvd/cvd_x86_64
new file mode 100755
index 00000000..50c0defd
--- /dev/null
+++ b/cvd/cvd_x86_64
diff --git a/cvd/fetch_cvd_arm64 b/cvd/fetch_cvd_arm64
new file mode 100755
index 00000000..6022bf9a
--- /dev/null
+++ b/cvd/fetch_cvd_arm64
diff --git a/cvd/fetch_cvd_x86_64 b/cvd/fetch_cvd_x86_64
new file mode 100755
index 00000000..87a61603
--- /dev/null
+++ b/cvd/fetch_cvd_x86_64