Skip to content
Snippets Groups Projects
Commit 305e977c authored by Joel Galenson's avatar Joel Galenson Committed by Automerger Merge Worker
Browse files

Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: fc032e38

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-width/+/1912797

Change-Id: I32cc2a6cee89b1cc3f07eb331f1bdfa4c63ed2bb
parents 0229238b fc032e38
Branches aosp-new/android12-mainline-adbd-release aosp-new/android12-mainline-art-release aosp-new/android12-mainline-captiveportallogin-release aosp-new/android12-mainline-cellbroadcast-release aosp-new/android12-mainline-conscrypt-release aosp-new/android12-mainline-documentsui-release aosp-new/android12-mainline-extservices-release aosp-new/android12-mainline-ipsec-release aosp-new/android12-mainline-media-release aosp-new/android12-mainline-media-swcodec-release aosp-new/android12-mainline-mediaprovider-release aosp-new/android12-mainline-networkstack-release aosp-new/android12-mainline-neuralnetworks-release aosp-new/android12-mainline-permission-release aosp-new/android12-mainline-resolv-release aosp-new/android12-mainline-sdkext-release aosp-new/android12-mainline-statsd-release aosp-new/android12-mainline-tethering-release aosp-new/android12-mainline-wifi-release aosp-new/aosp-new/android12-mainline-adbd-release aosp-new/aosp-new/android12-mainline-art-release aosp-new/aosp-new/android12-mainline-captiveportallogin-release aosp-new/aosp-new/android12-mainline-cellbroadcast-release aosp-new/aosp-new/android12-mainline-conscrypt-release aosp-new/aosp-new/android12-mainline-documentsui-release aosp-new/aosp-new/android12-mainline-extservices-release aosp-new/aosp-new/android12-mainline-ipsec-release aosp-new/aosp-new/android12-mainline-media-release aosp-new/aosp-new/android12-mainline-media-swcodec-release aosp-new/aosp-new/android12-mainline-mediaprovider-release aosp-new/aosp-new/android12-mainline-networkstack-release aosp-new/aosp-new/android12-mainline-neuralnetworks-release aosp-new/aosp-new/android12-mainline-permission-release aosp-new/aosp-new/android12-mainline-resolv-release aosp-new/aosp-new/android12-mainline-sdkext-release aosp-new/aosp-new/android12-mainline-statsd-release aosp-new/aosp-new/android12-mainline-tethering-release aosp-new/aosp-new/android12-mainline-wifi-release
Tags aml_doc_310851020 aml_mpr_311911090 aml_pco_311011000 aml_sdk_311710000 aml_tet_311811050 aml_tz3_311312010 aml_wif_311811030 android-mainline-12.0.0_r1 android-mainline-12.0.0_r10 android-mainline-12.0.0_r100 android-mainline-12.0.0_r101 android-mainline-12.0.0_r102 android-mainline-12.0.0_r103 android-mainline-12.0.0_r104 android-mainline-12.0.0_r105 android-mainline-12.0.0_r106 android-mainline-12.0.0_r107 android-mainline-12.0.0_r108 android-mainline-12.0.0_r109 android-mainline-12.0.0_r11 android-mainline-12.0.0_r110 android-mainline-12.0.0_r113 android-mainline-12.0.0_r114 android-mainline-12.0.0_r115 android-mainline-12.0.0_r116 android-mainline-12.0.0_r117 android-mainline-12.0.0_r118 android-mainline-12.0.0_r119 android-mainline-12.0.0_r12 android-mainline-12.0.0_r120 android-mainline-12.0.0_r121 android-mainline-12.0.0_r122 android-mainline-12.0.0_r123 android-mainline-12.0.0_r124 android-mainline-12.0.0_r125 android-mainline-12.0.0_r126 android-mainline-12.0.0_r13 android-mainline-12.0.0_r14 android-mainline-12.0.0_r15 android-mainline-12.0.0_r16 android-mainline-12.0.0_r17 android-mainline-12.0.0_r18 android-mainline-12.0.0_r19 android-mainline-12.0.0_r2 android-mainline-12.0.0_r20 android-mainline-12.0.0_r21 android-mainline-12.0.0_r22 android-mainline-12.0.0_r23 android-mainline-12.0.0_r24 android-mainline-12.0.0_r25 android-mainline-12.0.0_r26 android-mainline-12.0.0_r27 android-mainline-12.0.0_r28 android-mainline-12.0.0_r29 android-mainline-12.0.0_r3 android-mainline-12.0.0_r30 android-mainline-12.0.0_r31 android-mainline-12.0.0_r32 android-mainline-12.0.0_r33 android-mainline-12.0.0_r34 android-mainline-12.0.0_r35 android-mainline-12.0.0_r37 android-mainline-12.0.0_r38 android-mainline-12.0.0_r39 android-mainline-12.0.0_r40 android-mainline-12.0.0_r41 android-mainline-12.0.0_r42 android-mainline-12.0.0_r43 android-mainline-12.0.0_r44 android-mainline-12.0.0_r45 android-mainline-12.0.0_r46 android-mainline-12.0.0_r47 android-mainline-12.0.0_r48 android-mainline-12.0.0_r49 android-mainline-12.0.0_r5 android-mainline-12.0.0_r50 android-mainline-12.0.0_r51 android-mainline-12.0.0_r52 android-mainline-12.0.0_r53 android-mainline-12.0.0_r56 android-mainline-12.0.0_r57 android-mainline-12.0.0_r58 android-mainline-12.0.0_r59 android-mainline-12.0.0_r6 android-mainline-12.0.0_r60 android-mainline-12.0.0_r61 android-mainline-12.0.0_r62 android-mainline-12.0.0_r63 android-mainline-12.0.0_r64 android-mainline-12.0.0_r65 android-mainline-12.0.0_r66 android-mainline-12.0.0_r67 android-mainline-12.0.0_r68 android-mainline-12.0.0_r69 android-mainline-12.0.0_r7 android-mainline-12.0.0_r70 android-mainline-12.0.0_r71 android-mainline-12.0.0_r72 android-mainline-12.0.0_r73 android-mainline-12.0.0_r74
No related merge requests found
// This file is generated by cargo2android.py --run --device --tests.
// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
......@@ -50,28 +50,19 @@ rust_library {
features: ["default"],
}
rust_defaults {
name: "unicode-width_test_defaults",
crate_name: "unicode_width",
rust_test {
name: "unicode-width_test_src_lib",
// has rustc warnings
srcs: ["src/lib.rs"],
host_supported: true,
crate_name: "unicode_width",
cargo_env_compat: true,
cargo_pkg_version: "0.1.9",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2015",
features: ["default"],
}
rust_test_host {
name: "unicode-width_host_test_src_lib",
defaults: ["unicode-width_test_defaults"],
test_options: {
unit_test: true,
},
}
rust_test {
name: "unicode-width_device_test_src_lib",
defaults: ["unicode-width_test_defaults"],
edition: "2015",
features: ["default"],
}
......@@ -2,7 +2,30 @@
{
"presubmit": [
{
"name": "unicode-width_device_test_src_lib"
"name": "keystore2_test"
},
{
"name": "keystore2_vintf_test"
},
{
"name": "legacykeystore_test"
},
{
"name": "unicode-width_test_src_lib"
}
],
"presubmit-rust": [
{
"name": "keystore2_test"
},
{
"name": "keystore2_vintf_test"
},
{
"name": "legacykeystore_test"
},
{
"name": "unicode-width_test_src_lib"
}
]
}
{
"device": true,
"run": true,
"tests": true
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment