diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:06:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:06:52 +0000 |
| commit | 645a7a00e985043bff2bc54970477ecda6035815 (patch) | |
| tree | 798d9af21b5be703ca91bae5673e6501a3e38442 | |
| parent | ea94bc3022a29802bf68f25f8b83378e89b1d391 (diff) | |
| parent | a6e8b8492f629b6ba3544df5dd13e1571ae0669a (diff) | |
| download | combine-645a7a00e985043bff2bc54970477ecda6035815.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e092e401eb am: d7bbc3735b am: fc794a63cc am: a6e8b8492f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/combine/+/1912621
Change-Id: I7e181585e75e74e1803f874bd4bdf30fb0344566
| -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 |