diff options
author | Jakub Kotur <qtr@google.com> | 2021-03-16 18:39:57 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-16 18:39:57 +0000 |
commit | 95c9c39bfcf10d8fb6c7d07f41370e415307dfe0 (patch) | |
tree | 766c18e8b369c0cd73588ff9a5e9b6867c479171 | |
parent | d1ac8d794aef7fdf06fe612b0c231601a38e9f1d (diff) | |
parent | 06533c92b9d7bf893f1af1e3ad43fb20fa82e77f (diff) | |
download | regex-95c9c39bfcf10d8fb6c7d07f41370e415307dfe0.tar.gz |
Enable regex on the device. am: 06533c92b9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/regex/+/1635560
Change-Id: I1608368ad3fdc967ed1e080436767dfb707c5afc
-rw-r--r-- | Android.bp | 49 | ||||
-rw-r--r-- | TEST_MAPPING | 5 |
2 files changed, 11 insertions, 43 deletions
@@ -1,45 +1,10 @@ -// This file is generated by cargo2android.py --run --dependencies. +// This file is generated by cargo2android.py --run --device --dependencies. +// Do not modify this file as changes will be overridden on upgrade. -package { - default_applicable_licenses: ["external_rust_crates_regex_license"], -} - -// Added automatically by a large-scale-change that took the approach of -// 'apply every license found to every target'. While this makes sure we respect -// every license restriction, it may not be entirely correct. -// -// e.g. GPL in an MIT project might only apply to the contrib/ directory. -// -// Please consider splitting the single license below into multiple licenses, -// taking care not to lose any license_kind information, and overriding the -// default license using the 'licenses: [...]' property on targets as needed. -// -// For unused files, consider creating a 'fileGroup' with "//visibility:private" -// to attach the license to, and including a comment whether the files may be -// used in the current project. -// -// large-scale-change included anything that looked like it might be a license -// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc. -// -// Please consider removing redundant or irrelevant files from 'license_text:'. -// See: http://go/android-license-faq -license { - name: "external_rust_crates_regex_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - "SPDX-license-identifier-MIT", - "SPDX-license-identifier-Unicode-DFS", - ], - license_text: [ - "LICENSE-APACHE", - "LICENSE-MIT", - ], -} - -rust_library_host { +rust_library { name: "libregex", // has rustc warnings + host_supported: true, crate_name: "regex", srcs: ["src/lib.rs"], edition: "2015", @@ -73,7 +38,7 @@ rust_library_host { // dependent_library ["feature_list"] // aho-corasick-0.7.15 "default,std" -// lazy_static-1.4.0 // memchr-2.3.4 "default,std,use_std" -// regex-syntax-0.6.22 "default,unicode,unicode-age,unicode-bool,unicode-case,unicode-gencat,unicode-perl,unicode-script,unicode-segment" -// thread_local-1.1.0 +// once_cell-1.7.2 "alloc,default,race,std" +// regex-syntax-0.6.23 "default,unicode,unicode-age,unicode-bool,unicode-case,unicode-gencat,unicode-perl,unicode-script,unicode-segment" +// thread_local-1.1.3 diff --git a/TEST_MAPPING b/TEST_MAPPING index 03d7e78..3ad2d9a 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,7 +1,10 @@ -// Generated by cargo2android.py for tests that depend on this crate. +// Generated by update_crate_tests.py for tests that depend on this crate. { "presubmit": [ { + "name": "vpnprofilestore_test" + }, + { "name": "libsqlite3-sys_device_test_src_lib" }, { |