aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-16 15:40:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-16 15:40:49 +0000
commit6091a07bab59c60014d60782db6a7a3ed6e2bd2b (patch)
tree9ac178718f520f6d1ab26413a4a1c922d0752af6
parent6bc56337513f679eba50e4061f35efd1f2ced4d7 (diff)
parent1f139fc9dcbba7778186aa1f1b267f71e6fbf4f0 (diff)
downloadclang-sys-6091a07bab59c60014d60782db6a7a3ed6e2bd2b.tar.gz
Migrate to cargo_embargo. am: ce94bae5eb am: 681fe3b895 am: 1f139fc9dc
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/clang-sys/+/2833291 Change-Id: Id82dc2943d999f301c530db596a5fa2c8955a6fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json12
3 files changed, 13 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index 9ad59f0..9be8df1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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 a0f1a8e..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "copy-out": true,
- "features": "runtime,clang_10_0",
- "run": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..9f9a4e9
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,12 @@
+{
+ "features": [
+ "runtime",
+ "clang_10_0"
+ ],
+ "package": {
+ "clang-sys": {
+ "copy_out": true,
+ "device_supported": false
+ }
+ }
+}