diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:05:41 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:05:41 +0000 |
commit | 1bb9f6dacbcc30d0da02ed6f39f6dfa14b2d49d3 (patch) | |
tree | 936efc6c35aad8c3b35463bca23ef4bc2601647a | |
parent | f460cdab5c40ed21173f614a78a25e0e01762165 (diff) | |
parent | d13c5afe1e2140f474e4f278e4a739b69410c621 (diff) | |
download | libm-android12-d1-s3-release.tar.gz |
Snap for 7325096 from d13c5afe1e2140f474e4f278e4a739b69410c621 to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-release
Change-Id: I9c9fc6b2802f95a71cae30f59d3dbc2072d1b50c
-rw-r--r-- | Android.bp | 14 | ||||
-rw-r--r-- | cargo2android.json | 11 | ||||
-rw-r--r-- | patches/Android.bp.diff | 12 |
3 files changed, 20 insertions, 17 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --device --dependencies --tests --patch=patches/Android.bp.diff. +// This file is generated by cargo2android.py --config cargo2android.json. +// Do not modify this file as changes will be overridden on upgrade. package { default_applicable_licenses: ["external_rust_crates_libm_license"], @@ -65,6 +66,9 @@ rust_defaults { rust_test_host { name: "libm_host_test_src_lib", defaults: ["libm_defaults"], + test_options: { + unit_test: true, + }, } rust_test { @@ -73,8 +77,8 @@ rust_test { } // dependent_library ["feature_list"] -// no-panic-0.1.14 -// proc-macro2-1.0.24 "default,proc-macro" -// quote-1.0.7 "default,proc-macro" -// syn-1.0.54 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote" +// no-panic-0.1.15 +// proc-macro2-1.0.26 "default,proc-macro" +// quote-1.0.9 "default,proc-macro" +// syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote" // unicode-xid-0.2.1 "default" diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..911c36f --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,11 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.resolv" + ], + "dependencies": true, + "device": true, + "min-sdk-version": "29", + "run": true, + "tests": true +}
\ No newline at end of file diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff deleted file mode 100644 index 003ea83..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- Android.bp 2020-12-14 19:07:52.362403999 +0900 -+++ Android.bp.new 2020-12-14 19:07:02.566865770 +0900 -@@ -7,4 +7,9 @@ rust_library { - srcs: ["src/lib.rs"], - edition: "2018", - features: ["default"], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ ], -+ min_sdk_version: "29", - } |