diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-11-09 12:22:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-11-09 12:22:53 +0000 |
| commit | dd3e8e83613943d326403da1f7d3f056cbf70423 (patch) | |
| tree | 3c2fa27cba8b14c31f1ace2791f629e08b7f13cd | |
| parent | 3998fb2dc9c834c91381263b34ebbe3773fe6141 (diff) | |
| parent | 9d34a81e9762e0054f893f3ee892d3f1ee566554 (diff) | |
| download | foreign-types-dd3e8e83613943d326403da1f7d3f056cbf70423.tar.gz | |
Merge "Migrate to cargo_embargo." into main
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | cargo2android.json | 11 | ||||
| -rw-r--r-- | cargo_embargo.json | 13 |
3 files changed, 15 insertions, 15 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 { @@ -45,9 +45,7 @@ rust_library_rlib { cargo_pkg_version: "0.3.1", srcs: ["src/lib.rs"], edition: "2015", - rustlibs: [ - "libforeign_types_shared", - ], + rustlibs: ["libforeign_types_shared"], apex_available: [ "//apex_available:platform", "com.android.compos", diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 94e72b7..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "apex-available": [ - "//apex_available:platform", - "com.android.compos", - "com.android.virt" - ], - "device": true, - "force-rlib": true, - "run": true, - "vendor-available": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..f93ab69 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,13 @@ +{ + "apex_available": [ + "//apex_available:platform", + "com.android.compos", + "com.android.virt" + ], + "package": { + "foreign-types": { + "force_rlib": true + } + }, + "run_cargo": false +} |