aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-10 19:34:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-10 19:34:34 +0000
commit2c33f77c69848d3aac4efeb1f4b5e2ee435ba5a3 (patch)
treebddcffbd646c9bb2508a1ac3e924f559a628ef46
parent9abc2587e07febd557853359047521caef5d032e (diff)
parentcd6df119162775306c5390a4d90481b8bdb9a4e8 (diff)
downloadgoogletest-2c33f77c69848d3aac4efeb1f4b5e2ee435ba5a3.tar.gz
Migrate to cargo_embargo. am: 3cb9189771 am: 5fa3413a89 am: cd6df11916
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/googletest/+/2824500 Change-Id: I26668a0cbcc40236b85952212de397dbaefe6c6f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo2android.json5
-rw-r--r--cargo_embargo.json6
3 files changed, 7 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index 9f2e45e..d7fe4a6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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_library {
name: "libgoogletest_rust",
host_supported: true,
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index c76e391..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "device": true,
- "run": true,
- "suffix": "_rust"
-} \ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..bccaabe
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,6 @@
+{
+ "module_name_overrides": {
+ "libgoogletest": "libgoogletest_rust"
+ },
+ "run_cargo": false
+}