diff options
| author | Jeffrey Vander Stoep <jeffv@google.com> | 2023-01-17 19:46:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-17 19:46:44 +0000 |
| commit | 3e4908c63e8ed75b7a4d442959b1e48214fbdf7f (patch) | |
| tree | 101c0eaebaab537018f21668985d598c12490ac0 | |
| parent | 1f350c71e158fedc3fe50ffc702e39cf56ae9e9b (diff) | |
| parent | 5eaa717bf1c6774301f38e89c2dca9f13480b82b (diff) | |
| download | static_assertions-3e4908c63e8ed75b7a4d442959b1e48214fbdf7f.tar.gz | |
Merge "static_assertions: add build variants" am: deb902935d am: 48246d6053 am: 5eaa717bf1
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/static_assertions/+/2361906
Change-Id: I5c5f8fdf8f1fa15304e29c2a55c3e5100c855d40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | cargo2android.json | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -1,8 +1,6 @@ // 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_static_assertions_license", @@ -33,4 +31,6 @@ rust_library_rlib { "//apex_available:platform", "//apex_available:anyapex", ], + vendor_available: true, + min_sdk_version: "29", } diff --git a/cargo2android.json b/cargo2android.json index 953a143..f41bf78 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -2,5 +2,7 @@ "device": true, "force-rlib": true, "no_pkg_vers": true, + "min-sdk-version": "29", + "vendor-available": true, "run": true } |