summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/android_runtime_lazy/Android.bp1
-rw-r--r--libs/binder/ndk/Android.bp16
-rw-r--r--libs/binder/ndk/include_ndk/android/binder_parcel.h1
3 files changed, 18 insertions, 0 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..851247182d 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",
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>