diff options
| author | Bob Wang <ziyiw@google.com> | 2021-12-06 19:44:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-06 19:44:43 +0000 |
| commit | 191788d96f6a34df8082e2a9a958864bae277f64 (patch) | |
| tree | 384483da0e53bdbf1e0928f0c47244eb07e6caea | |
| parent | dc9d27af5084feb7e76ee7922e812a3ea308143d (diff) | |
| parent | 34b427adf6897e59b43716adf3528988b0b02199 (diff) | |
| download | native-191788d96f6a34df8082e2a9a958864bae277f64.tar.gz | |
Merge "Add apex_available and min_sdk_version." am: 34b427adf6
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1909670
Change-Id: I3ad0ded9c6235ea7d450edce3a78643db286fef4
| -rw-r--r-- | libs/binder/rust/Android.bp | 47 |
1 files changed, 33 insertions, 14 deletions
diff --git a/libs/binder/rust/Android.bp b/libs/binder/rust/Android.bp index 4561d6e494..e2fc18d859 100644 --- a/libs/binder/rust/Android.bp +++ b/libs/binder/rust/Android.bp @@ -24,13 +24,15 @@ rust_library { target: { darwin: { enabled: false, - } + }, }, apex_available: [ "//apex_available:platform", "com.android.compos", + "com.android.uwb", "com.android.virt", ], + min_sdk_version: "current", } rust_library { @@ -45,7 +47,7 @@ rust_library { target: { darwin: { enabled: false, - } + }, }, apex_available: [ "//apex_available:platform", @@ -69,13 +71,15 @@ rust_library { target: { darwin: { enabled: false, - } + }, }, apex_available: [ "//apex_available:platform", "com.android.compos", + "com.android.uwb", "com.android.virt", ], + min_sdk_version: "current", lints: "none", clippy_lints: "none", } @@ -88,20 +92,31 @@ rust_bindgen { bindgen_flags: [ // Unfortunately the only way to specify the rust_non_exhaustive enum // style for a type is to make it the default - "--default-enum-style", "rust_non_exhaustive", + "--default-enum-style", + "rust_non_exhaustive", // and then specify constified enums for the enums we don't want // rustified - "--constified-enum", "android::c_interface::consts::.*", + "--constified-enum", + "android::c_interface::consts::.*", - "--allowlist-type", "android::c_interface::.*", - "--allowlist-type", "AStatus", - "--allowlist-type", "AIBinder_Class", - "--allowlist-type", "AIBinder", - "--allowlist-type", "AIBinder_Weak", - "--allowlist-type", "AIBinder_DeathRecipient", - "--allowlist-type", "AParcel", - "--allowlist-type", "binder_status_t", - "--allowlist-function", ".*", + "--allowlist-type", + "android::c_interface::.*", + "--allowlist-type", + "AStatus", + "--allowlist-type", + "AIBinder_Class", + "--allowlist-type", + "AIBinder", + "--allowlist-type", + "AIBinder_Weak", + "--allowlist-type", + "AIBinder_DeathRecipient", + "--allowlist-type", + "AParcel", + "--allowlist-type", + "binder_status_t", + "--allowlist-function", + ".*", ], shared_libs: [ "libbinder_ndk", @@ -127,8 +142,10 @@ rust_bindgen { apex_available: [ "//apex_available:platform", "com.android.compos", + "com.android.uwb", "com.android.virt", ], + min_sdk_version: "current", } // TODO(b/184872979): remove once the Rust API is created. @@ -142,8 +159,10 @@ rust_bindgen { ], apex_available: [ "com.android.compos", + "com.android.uwb", "com.android.virt", ], + min_sdk_version: "current", } rust_test { |