diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:02:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:02:11 +0000 |
| commit | d7bbc3735bba5fa71812437c00018a22e5a0583e (patch) | |
| tree | 798d9af21b5be703ca91bae5673e6501a3e38442 | |
| parent | a96cf09fd24cb332d8432c23857192adb0179639 (diff) | |
| parent | e092e401ebbe24b50db21dadf98fe9dae4043e21 (diff) | |
| download | combine-d7bbc3735bba5fa71812437c00018a22e5a0583e.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e092e401eb
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/1912621
Change-Id: Icac074761468751a1dc8e8005b1fbff4fe4ee77a
| -rw-r--r-- | TEST_MAPPING | 49 | ||||
| -rw-r--r-- | cargo2android.json | 2 |
2 files changed, 3 insertions, 48 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index 89d071b..a21e10e 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,53 +1,8 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ + "imports": [ { - "name": "jni_device_test_src_lib" - }, - { - "name": "jni_device_test_tests_executor" - }, - { - "name": "jni_device_test_tests_executor_nested_attach" - }, - { - "name": "jni_device_test_tests_java_integers" - }, - { - "name": "jni_device_test_tests_jmap" - }, - { - "name": "jni_device_test_tests_jni_api" - }, - { - "name": "jni_device_test_tests_jni_global_refs" - }, - { - "name": "jni_device_test_tests_threads_attach_guard" - }, - { - "name": "jni_device_test_tests_threads_detach" - }, - { - "name": "jni_device_test_tests_threads_detach_daemon" - }, - { - "name": "jni_device_test_tests_threads_explicit_detach" - }, - { - "name": "jni_device_test_tests_threads_explicit_detach_daemon" - }, - { - "name": "jni_device_test_tests_threads_explicit_detach_permanent" - }, - { - "name": "jni_device_test_tests_threads_nested_attach_daemon" - }, - { - "name": "jni_device_test_tests_threads_nested_attach_guard" - }, - { - "name": "jni_device_test_tests_threads_nested_attach_permanently" + "path": "external/rust/crates/jni" } ] } diff --git a/cargo2android.json b/cargo2android.json index 8d76784..6852966 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -4,6 +4,6 @@ "com.android.uwb" ], "device": true, - "min_sdk_version": "29", + "min-sdk-version": "29", "run": true }
\ No newline at end of file |