diff options
| author | 2019-09-19 20:45:44 -0700 | |
|---|---|---|
| committer | 2019-09-19 20:45:44 -0700 | |
| commit | 92c49be9406263a9dd5e8cf221007ca91152be1c (patch) | |
| tree | 705008bb401fde503925cdf4a2f13ce36081d861 | |
| parent | cf0a72660b736bde319bd18dbb58540bca081892 (diff) | |
| parent | ef56813c5a11ec208056a4cfa0e99fa7e4e57f32 (diff) | |
Merge "Revert "libbinder_ndk: host available"" am: b10f1e6c60
am: ef56813c5a
Change-Id: I95a2cdff11c1c22c3c5cacba9f1b494036ed46d5
| -rw-r--r-- | libs/android_runtime_lazy/Android.bp | 1 | ||||
| -rw-r--r-- | libs/binder/ndk/Android.bp | 16 | ||||
| -rw-r--r-- | libs/binder/ndk/include_ndk/android/binder_parcel.h | 1 |
3 files changed, 0 insertions, 18 deletions
diff --git a/libs/android_runtime_lazy/Android.bp b/libs/android_runtime_lazy/Android.bp index 2d6292c4f7..9284acbff3 100644 --- a/libs/android_runtime_lazy/Android.bp +++ b/libs/android_runtime_lazy/Android.bp @@ -34,7 +34,6 @@ 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 851247182d..734a9287e1 100644 --- a/libs/binder/ndk/Android.bp +++ b/libs/binder/ndk/Android.bp @@ -14,25 +14,9 @@ * 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 8c4170754a..2258210f2e 100644 --- a/libs/binder/ndk/include_ndk/android/binder_parcel.h +++ b/libs/binder/ndk/include_ndk/android/binder_parcel.h @@ -26,7 +26,6 @@ #pragma once -#include <stddef.h> #include <sys/cdefs.h> #include <android/binder_status.h> |