From e8a434d286b7f7a87d6eaa9b5bbd131325f257d9 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Fri, 20 Sep 2019 18:42:35 +0000
Subject: Reland "libbinder_ndk: host available"

This reverts commit f6f0d3b2e7e62e39af41d5802521b6a5c96d0040.

Reason for revert: reland original change
Bug: 141340885
Test: use on host (breakage was mac build, version script moved to
    linux only)

Change-Id: Id7aba2361405c92cf832e4145ce4ff1fd951a66a
---
 libs/android_runtime_lazy/Android.bp               |  1 +
 libs/binder/ndk/Android.bp                         | 27 ++++++++++++++++++++--
 .../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>
-- 
cgit v1.2.3-59-g8ed1b