aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-22 21:42:51 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-22 21:42:51 +0000
commit6113d8c374267295adc9bd35bb61e8b38369e0f9 (patch)
tree481daaf95f5d40b05519180575b30a7c148e8a70
parentee78ca326fe5ca45c9dca5b1f9fcbed6b497956f (diff)
parent57f7c032aa71c8522405a534e5e13615184313e6 (diff)
downloadunicode-xid-6113d8c374267295adc9bd35bb61e8b38369e0f9.tar.gz
Snap for 11135399 from 57f7c032aa71c8522405a534e5e13615184313e6 to simpleperf-release
Change-Id: I000d745bb6779bb545f3feb6144e24b742c255fb
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json4
-rw-r--r--rules.mk14
4 files changed, 20 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
index 18d1eed..0f4ab8c 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 {
@@ -69,9 +69,7 @@ rust_test {
},
edition: "2015",
features: ["default"],
- rustlibs: [
- "libcriterion",
- ],
+ rustlibs: ["libcriterion"],
}
rust_test {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index d36fb44..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "device": true,
- "run": true,
- "tests": true
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..c8842d1
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+ "run_cargo": false,
+ "tests": true
+}
diff --git a/rules.mk b/rules.mk
new file mode 100644
index 0000000..1d6396d
--- /dev/null
+++ b/rules.mk
@@ -0,0 +1,14 @@
+# This file is generated by cargo2rulesmk.py --run.
+# Do not modify this file as changes will be overridden on upgrade.
+
+LOCAL_DIR := $(GET_LOCAL_DIR)
+MODULE := $(LOCAL_DIR)
+MODULE_CRATE_NAME := unicode_xid
+MODULE_SRCS := \
+ $(LOCAL_DIR)/src/lib.rs \
+
+MODULE_RUST_EDITION := 2015
+MODULE_RUSTFLAGS += \
+ --cfg 'feature="default"' \
+
+include make/library.mk