diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-11-16 19:30:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-16 19:30:27 +0000 |
| commit | 9f5e15c2ac3ccd1c2aab6969ab61fde57be3ef97 (patch) | |
| tree | d261c5021cf1151e37b78b4c190a16037bd0575e | |
| parent | 1758121abcb7332cad2d0d99ae6b5854d07e95e6 (diff) | |
| parent | 6d93ae560502250d1d2315f9ffb775b5e6431ce5 (diff) | |
| download | pdl-compiler-9f5e15c2ac3ccd1c2aab6969ab61fde57be3ef97.tar.gz | |
Merge "Migrate to cargo_embargo." into main am: 6d93ae5605
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pdl-compiler/+/2828248
Change-Id: Ia56b5c60b186d487ea4eb37e38a5a6ffbb62c169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | cargo2android.json | 5 | ||||
| -rw-r--r-- | cargo_embargo.json | 10 |
3 files changed, 11 insertions, 9 deletions
@@ -1,8 +1,6 @@ -// 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. - - rust_binary_host { name: "generate_canonical_tests", crate_name: "generate_canonical_tests", @@ -594,4 +592,3 @@ cc_test_host { "libgtest", ], } - diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 46d3c1a..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "run": true, - "host-first-multilib": true, - "add-toplevel-block": "cargo2android_toplevel.bp" -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..b3817ce --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,10 @@ +{ + "package": { + "pdl-compiler": { + "add_toplevel_block": "cargo2android_toplevel.bp", + "device_supported": false, + "host_first_multilib": true + } + }, + "run_cargo": false +} |