diff options
| author | Victor Khimenko <khim@google.com> | 2020-07-14 17:18:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-14 17:18:35 +0000 |
| commit | 4b2220c0c0cdf33d694e39444e31df4532d037c6 (patch) | |
| tree | 2b430e36987d52f95db902b7cf4d7c8e555b8031 | |
| parent | 9aacd0cffd172b636f55f73fb620375c7c04021f (diff) | |
| parent | 9a12a013eeca75b2a3bf49492ec6557245a6f8fc (diff) | |
| download | native-4b2220c0c0cdf33d694e39444e31df4532d037c6.tar.gz | |
Merge changes from topic "rvc.nb.rs" into rvc-dev
* changes:
Make libbinder buildable for native_bridge
Make libarect buildable for native_bridge
| -rw-r--r-- | libs/arect/Android.bp | 2 | ||||
| -rw-r--r-- | libs/binder/Android.bp | 4 | ||||
| -rw-r--r-- | libs/nativebase/Android.bp | 2 | ||||
| -rw-r--r-- | libs/nativewindow/Android.bp | 2 |
4 files changed, 10 insertions, 0 deletions
diff --git a/libs/arect/Android.bp b/libs/arect/Android.bp index f66673f6ad..258a4e3748 100644 --- a/libs/arect/Android.bp +++ b/libs/arect/Android.bp @@ -29,6 +29,8 @@ cc_library_static { name: "libarect", host_supported: true, vendor_available: true, + // TODO(b/153609531): remove when no longer needed. + native_bridge_supported: true, export_include_dirs: ["include"], target: { windows: { diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index db4aba8640..b24a577588 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -17,6 +17,8 @@ cc_library_headers { export_include_dirs: ["include"], vendor_available: true, host_supported: true, + // TODO(b/153609531): remove when no longer needed. + native_bridge_supported: true, header_libs: [ "libbase_headers", @@ -62,6 +64,8 @@ cc_library { }, double_loadable: true, host_supported: true, + // TODO(b/153609531): remove when no longer needed. + native_bridge_supported: true, // TODO(b/31559095): get headers from bionic on host include_dirs: [ diff --git a/libs/nativebase/Android.bp b/libs/nativebase/Android.bp index 9e7e4a2291..8399e8ce0a 100644 --- a/libs/nativebase/Android.bp +++ b/libs/nativebase/Android.bp @@ -16,6 +16,8 @@ cc_library_headers { name: "libnativebase_headers", vendor_available: true, host_supported: true, + // TODO(b/153609531): remove when no longer needed. + native_bridge_supported: true, export_include_dirs: ["include"], target: { diff --git a/libs/nativewindow/Android.bp b/libs/nativewindow/Android.bp index ee006aaaba..52d73e0a56 100644 --- a/libs/nativewindow/Android.bp +++ b/libs/nativewindow/Android.bp @@ -25,6 +25,8 @@ cc_library_headers { name: "libnativewindow_headers", export_include_dirs: ["include"], vendor_available: true, + // TODO(b/153609531): remove when no longer needed. + native_bridge_supported: true, min_sdk_version: "29", } |