diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-11-14 14:31:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-11-14 14:31:14 +0000 |
| commit | a28a75e883a06f4d384b555e6a6f9c73bb8e875a (patch) | |
| tree | 8c09d231746162810f31022c7191b09e32fc7856 | |
| parent | 565785578736a4766a9668a83bd02ef5aae63b44 (diff) | |
| parent | 1c55863cb816a643cdd196097431870134bbb464 (diff) | |
| download | bitflags-a28a75e883a06f4d384b555e6a6f9c73bb8e875a.tar.gz | |
Merge "Migrate to cargo_embargo." into main
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | cargo2android.json | 8 | ||||
| -rw-r--r-- | cargo_embargo.json | 11 |
3 files changed, 12 insertions, 9 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 { diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index bc0ef74..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependency-blocklist": [ - "trybuild" - ], - "device": true, - "min-sdk-version": "29", - "run": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..9ce3b17 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,11 @@ +{ + "min_sdk_version": "29", + "package": { + "bitflags": { + "dep_blocklist": [ + "libtrybuild" + ] + } + }, + "run_cargo": false +} |