diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:27 +0000 |
commit | dc88dce33a19aa700ee2e2ec6c68eb5f6108030e (patch) | |
tree | 5e1187bc694e0f6bc7399aabab8abc8f56b88454 | |
parent | 353baf7697c18cabd777523fec3fd8f9390cb7ef (diff) | |
parent | 6e0ac32e8618d45b40a67e29d14fd7ebaeec2b0d (diff) | |
download | protobuf-codegen-dc88dce33a19aa700ee2e2ec6c68eb5f6108030e.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: f4fea204f3 am: 6e0ac32e86
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/protobuf-codegen/+/1912627
Change-Id: I83ed2cc5ef8522d98ce30e65cca756b186543506
-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 |