diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:07:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:07:06 +0000 |
| commit | bc9227eceb93d3a8e0b73ae5c45fb7723001a9d1 (patch) | |
| tree | 5e1187bc694e0f6bc7399aabab8abc8f56b88454 | |
| parent | 651be9702175a8baba9e8ea202a7a43a1748fdf1 (diff) | |
| parent | 5fc53347f6589544c1663399c47100279020b423 (diff) | |
| download | protobuf-codegen-bc9227eceb93d3a8e0b73ae5c45fb7723001a9d1.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: f4fea204f3 am: 6e0ac32e86 am: dc88dce33a am: 5fc53347f6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/protobuf-codegen/+/1912627
Change-Id: Ibbfa8e42b7a15e9634e95db48e5394d6f60f6611
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | cargo2android.json | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -33,7 +33,7 @@ rust_library_host { } rust_test_host { - name: "protobuf-codegen_host_test_src_lib", + name: "protobuf-codegen_test_src_lib", crate_name: "protobuf_codegen", cargo_env_compat: true, cargo_pkg_version: "2.25.1", diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..341300b --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,4 @@ +{ + "run": true, + "tests": true +}
\ No newline at end of file |