diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 15:28:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-15 15:28:00 +0000 |
commit | 7754bf823d2e125fb521f6dc6fea610efcf8934b (patch) | |
tree | 42f3e36df36464bdd7d7fcba2e800e7997ef11e6 | |
parent | fba8c92034dd7dde7a6401b6a275b46e5a2791e9 (diff) | |
parent | 81bf93acab848fdfd0b955270a640820a0025f1b (diff) | |
download | gdbstub-android-s-qpr3-beta-1.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
-rw-r--r-- | Android.bp | 13 | ||||
-rw-r--r-- | TEST_MAPPING | 4 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 10 insertions, 12 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --no-subdir. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -22,6 +22,8 @@ rust_library { name: "libgdbstub", host_supported: true, crate_name: "gdbstub", + cargo_env_compat: true, + cargo_pkg_version: "0.5.0", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -37,12 +39,3 @@ rust_library { ], proc_macros: ["libpaste"], } - -// dependent_library ["feature_list"] -// autocfg-1.0.1 -// cfg-if-0.1.10 -// cfg-if-1.0.0 -// log-0.4.14 "std" -// managed-0.8.0 "alloc" -// num-traits-0.2.14 -// paste-1.0.5 diff --git a/TEST_MAPPING b/TEST_MAPPING index 1e91e7e..c09ff4c 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,8 +1,8 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "gdbstub_arch_device_test_src_lib" + "path": "external/rust/crates/gdbstub_arch" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..84da6ae --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,5 @@ +{ + "device": true, + "no-subdir": true, + "run": true +}
\ No newline at end of file |