diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-05-12 16:54:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-12 16:54:16 +0000 |
| commit | 6f6303905a914c646ae241f2e41b5550969f2445 (patch) | |
| tree | 5324a0378db3cbccc3dff6c6a7a2c59d91ca6a48 | |
| parent | 447753233b118f5a66030fd039dc9f4130cae409 (diff) | |
| parent | 72bfb9111e9bef2ae66f9e3cc84ef132b997473a (diff) | |
| download | psci-main.tar.gz | |
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/psci/+/2584687
Change-Id: I396934f78ae53d4ab4e914c0de169aa5e8924623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | cargo2android.json | 2 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 17 |
3 files changed, 3 insertions, 20 deletions
@@ -51,14 +51,14 @@ rust_library_rlib { "//apex_available:platform", "//apex_available:anyapex", ], - product_available: true, - vendor_available: true, prefer_rlib: true, no_stdlibs: true, stdlibs: [ "libcompiler_builtins.rust_sysroot", "libcore.rust_sysroot", ], + product_available: true, + vendor_available: true, } rust_test { diff --git a/cargo2android.json b/cargo2android.json index f3802fd..7da9df5 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -4,7 +4,7 @@ "features": "hvc", "force-rlib": true, "no-host": true, - "patch": "patches/Android.bp.patch", + "no-std": true, "run": true, "tests": true } diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index 1fa0e93..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 34d110a..2348c03 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -53,6 +53,12 @@ rust_library_rlib { - ], - product_available: true, - vendor_available: true, -+ prefer_rlib: true, -+ no_stdlibs: true, -+ stdlibs: [ -+ "libcompiler_builtins.rust_sysroot", -+ "libcore.rust_sysroot", -+ ], - } - - rust_test { |