diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-25 01:14:02 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-25 01:14:02 +0000 |
commit | a4109e07fb3ffc8bb639564b6e9a1e1173fc374a (patch) | |
tree | c856af15375b401f24ac59ed57677ed132d2448e | |
parent | 6ee355eb9dd52d35124ebef065d4cd24de8b37dc (diff) | |
parent | eb81bcb29235e823b873f4dffa2d66a778d6d55d (diff) | |
download | buddy_system_allocator-android14-qpr2-s1-release.tar.gz |
Snap for 10998418 from eb81bcb29235e823b873f4dffa2d66a778d6d55d to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Change-Id: Iaf685578af59ad7291e74f27270cd55465b39c55
-rw-r--r-- | Android.bp | 6 | ||||
-rw-r--r-- | cargo2android.json | 10 | ||||
-rw-r--r-- | cargo_embargo.json | 15 |
3 files changed, 17 insertions, 14 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --config cargo2android.json. +// This file is generated by cargo_embargo. // Do not modify this file as changes will be overridden on upgrade. package { @@ -32,9 +32,7 @@ rust_library_rlib { "spin", "use_spin", ], - rustlibs: [ - "libspin_nostd", - ], + rustlibs: ["libspin_nostd"], apex_available: [ "//apex_available:platform", "//apex_available:anyapex", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index b80410f..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "alloc": true, - "dependencies": true, - "dependency-suffix": "_nostd", - "device": true, - "force-rlib": true, - "no-host": true, - "no-std": true, - "run": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..9280162 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,15 @@ +{ + "module_name_overrides": { + "libbyteorder": "libbyteorder_nostd", + "libspin": "libspin_nostd" + }, + "package": { + "buddy_system_allocator": { + "alloc": true, + "host_supported": false, + "force_rlib": true, + "no_std": true + } + }, + "run_cargo": false +} |