diff options
author | Wei-chung Hsu <weihsu@google.com> | 2023-09-20 16:38:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-20 16:38:16 +0000 |
commit | 483ccb2c7987a6d2899298707c63a02481ff7787 (patch) | |
tree | f4db3bc36610ed25254b64467548f2082380ba74 | |
parent | ec0c0d8a89f41fd0fb99aeec04035fab45bb896b (diff) | |
parent | b81669e6a38ec04abb969c07bc600bcc04277e47 (diff) | |
download | cuttlefish_prebuilts-483ccb2c7987a6d2899298707c63a02481ff7787.tar.gz |
Backport prebuilt cvd binary file to solve group_id and version issues. ARM64 cvd BID is 10769592, x86_64 cvd BID is 10763722. am: b81669e6a3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/cuttlefish_prebuilts/+/24696381
Change-Id: I7e03624ae31795d95ff579d57444ca27b58dc0a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 38 | ||||
-rwxr-xr-x | cvd/cvd_arm64 | bin | 0 -> 10792656 bytes | |||
-rwxr-xr-x | cvd/cvd_x86_64 | bin | 0 -> 11715888 bytes | |||
-rwxr-xr-x | cvd/fetch_cvd_arm64 | bin | 0 -> 10792664 bytes | |||
-rwxr-xr-x | cvd/fetch_cvd_x86_64 | bin | 0 -> 11715896 bytes |
5 files changed, 38 insertions, 0 deletions
@@ -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 Binary files differnew file mode 100755 index 00000000..78ddc615 --- /dev/null +++ b/cvd/cvd_arm64 diff --git a/cvd/cvd_x86_64 b/cvd/cvd_x86_64 Binary files differnew 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 Binary files differnew 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 Binary files differnew file mode 100755 index 00000000..87a61603 --- /dev/null +++ b/cvd/fetch_cvd_x86_64 |