Merge changes from topic "rust-property-bindings"
* changes:
Improve the Rust property bindings.
Migrate keystore2's Rust system library bindings to bionic.
diff --git a/libc/Android.bp b/libc/Android.bp
index 390e2bd..c1d6d6b 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1979,8 +1979,12 @@
static: {
system_shared_libs: [],
},
- shared: {
- system_shared_libs: ["libc"],
+ target: {
+ bionic: {
+ shared: {
+ system_shared_libs: ["libc"],
+ },
+ },
},
//TODO (dimitry): This is to work around b/24465209. Remove after root cause is fixed
diff --git a/libm/Android.bp b/libm/Android.bp
index 6c3abd1..52229b6 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -509,7 +509,11 @@
tidy_checks: ["-cert-dcl16-c"],
include_dirs: ["bionic/libc"],
- system_shared_libs: ["libc"],
+ target: {
+ bionic: {
+ system_shared_libs: ["libc"],
+ },
+ },
sanitize: {
address: false,