From dec666b5f9c6d77425fb2853dae297b076080116 Mon Sep 17 00:00:00 2001 From: Andrew Walbran Date: Thu, 1 Jun 2023 15:54:00 +0000 Subject: Use new no-std cargo2android flag rather than patch. Bug: 279614907 Test: Compared Android.bp Change-Id: I8dc013bedf941668cd759d82604ebb2b946f6981 --- Android.bp | 4 ++-- cargo2android.json | 2 +- patches/Android.bp.patch | 17 ----------------- 3 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 patches/Android.bp.patch diff --git a/Android.bp b/Android.bp index 5ce080e..3ac933a 100644 --- a/Android.bp +++ b/Android.bp @@ -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 { -- cgit v1.2.3