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 | f4fea204f328a241ce55d5aeb7fc99b54d8013bb (patch) | |
tree | 5e1187bc694e0f6bc7399aabab8abc8f56b88454 | |
parent | f9fe97a5dcd9b86b8488a5e09417eec9e23a097b (diff) | |
parent | 4747e6faafc96506952828ca665cf82cf9ca6826 (diff) | |
download | protobuf-codegen-f4fea204f328a241ce55d5aeb7fc99b54d8013bb.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 | 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 |