diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-06-01 20:24:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-01 20:24:17 +0000 |
| commit | 5048de99593dde54c4741f4c884c30c6dac71502 (patch) | |
| tree | 046cf1e8226516044505c2371a1ab773ecd17f9d | |
| parent | c0aeb8d805e2dfb991c1998a92b720d12a4efded (diff) | |
| parent | ede872e6c1b0bf4a92e2880b559788c5cc81bb73 (diff) | |
| download | smccc-5048de99593dde54c4741f4c884c30c6dac71502.tar.gz | |
Use new no-std cargo2android flag rather than patch. am: dec666b5f9 am: f02eb75a3c am: 334a8db1e6 am: 9c6f565e0e am: ede872e6c1
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smccc/+/2611449
Change-Id: I09a9ced59b1eeaf613c88f4e7efa651b78f883ba
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
@@ -14,14 +14,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 c402bab..c78127b 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -3,7 +3,7 @@ "device": true, "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 { |