diff options
| author | 2019-09-20 15:33:02 -0700 | |
|---|---|---|
| committer | 2019-09-20 15:33:02 -0700 | |
| commit | dad1dc149ccf305dac800dad1b2b7caad595116a (patch) | |
| tree | febaa79ca2c1956dff412540026414500345fac9 | |
| parent | 1aa9e023dd483698f35c06dc9caaefe53e005be4 (diff) | |
| parent | c0c415d2a3417b8152bcc7c94c095b17c6582da0 (diff) | |
Merge "Reland "libbinder_ndk: host available"" am: 2ea8cdc9b4 am: 6143e7f0e0
am: c0c415d2a3
Change-Id: I62e82ceffde90f190cb66811419e0db16a65ede4
| -rw-r--r-- | libs/android_runtime_lazy/Android.bp | 1 | ||||
| -rw-r--r-- | libs/binder/ndk/Android.bp | 27 | ||||
| -rw-r--r-- | libs/binder/ndk/include_ndk/android/binder_parcel.h | 1 |
3 files changed, 27 insertions, 2 deletions
diff --git a/libs/android_runtime_lazy/Android.bp b/libs/android_runtime_lazy/Android.bp index 9284acbff3..2d6292c4f7 100644 --- a/libs/android_runtime_lazy/Android.bp +++ b/libs/android_runtime_lazy/Android.bp @@ -34,6 +34,7 @@ cc_library { name: "libandroid_runtime_lazy", vendor_available: true, double_loadable: true, + host_supported: true, cflags: [ "-Wall", diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp index 734a9287e1..62a0f9f9b1 100644 --- a/libs/binder/ndk/Android.bp +++ b/libs/binder/ndk/Android.bp @@ -14,9 +14,25 @@ * limitations under the License. */ +// TODO(b/31559095): bionic on host should define this +cc_defaults { + name: "libbinder_ndk_host_user", + target: { + host: { + cflags: [ + "-D__INTRODUCED_IN(n)=", + "-D__assert(a,b,c)=", + ], + }, + }, +} + cc_library_shared { name: "libbinder_ndk", + defaults: ["libbinder_ndk_host_user"], + host_supported: true, + export_include_dirs: [ "include_ndk", "include_platform", @@ -52,10 +68,17 @@ cc_library_shared { "jni_headers", ], - version_script: "libbinder_ndk.map.txt", + target: { + linux: { + version_script: "libbinder_ndk.map.txt", + }, + }, stubs: { symbol_file: "libbinder_ndk.map.txt", - versions: ["29", "30"], + versions: [ + "29", + "30", + ], }, } diff --git a/libs/binder/ndk/include_ndk/android/binder_parcel.h b/libs/binder/ndk/include_ndk/android/binder_parcel.h index 2258210f2e..8c4170754a 100644 --- a/libs/binder/ndk/include_ndk/android/binder_parcel.h +++ b/libs/binder/ndk/include_ndk/android/binder_parcel.h @@ -26,6 +26,7 @@ #pragma once +#include <stddef.h> #include <sys/cdefs.h> #include <android/binder_status.h> |