diff options
| author | 2020-07-08 17:13:04 +0000 | |
|---|---|---|
| committer | 2020-07-08 17:13:04 +0000 | |
| commit | c76719609e130e9d7b1a6f5ad6ed69e175b815e0 (patch) | |
| tree | 38f713a1c8ce2d534497d5e775c8b5d5cd328b1d | |
| parent | ce2ff0a9a2b5596e6c5b64c5fb241b8f8dc480c0 (diff) | |
| parent | a64b3351f05fab45f965c57bd1ea6d91fc423f64 (diff) | |
Merge "libbinder_ndk: split C ABI from C++ API" am: bbe3d226f5 am: 29815b55ff am: a64b3351f0
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1356964
Change-Id: If70eee4714edf8e00c13534431f4c01fff8ed900
| -rw-r--r-- | libs/binder/ndk/Android.bp | 13 | ||||
| -rw-r--r-- | libs/binder/ndk/include_cpp/android/binder_auto_utils.h (renamed from libs/binder/ndk/include_ndk/android/binder_auto_utils.h) | 0 | ||||
| -rw-r--r-- | libs/binder/ndk/include_cpp/android/binder_enums.h (renamed from libs/binder/ndk/include_ndk/android/binder_enums.h) | 0 | ||||
| -rw-r--r-- | libs/binder/ndk/include_cpp/android/binder_interface_utils.h (renamed from libs/binder/ndk/include_ndk/android/binder_interface_utils.h) | 0 | ||||
| -rw-r--r-- | libs/binder/ndk/include_cpp/android/binder_parcel_utils.h (renamed from libs/binder/ndk/include_ndk/android/binder_parcel_utils.h) | 0 |
5 files changed, 13 insertions, 0 deletions
diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp index b37db434a5..4fd06573b7 100644 --- a/libs/binder/ndk/Android.bp +++ b/libs/binder/ndk/Android.bp @@ -36,6 +36,7 @@ cc_library { host_supported: true, export_include_dirs: [ + "include_cpp", "include_ndk", "include_platform", ], @@ -101,6 +102,17 @@ ndk_headers { license: "NOTICE", } +// TODO(b/160624671): package with the aidl compiler +ndk_headers { + name: "libbinder_ndk_helper_headers", + from: "include_cpp/android", + to: "android", + srcs: [ + "include_cpp/android/*.h", + ], + license: "NOTICE", +} + ndk_library { name: "libbinder_ndk", symbol_file: "libbinder_ndk.map.txt", @@ -111,6 +123,7 @@ llndk_library { name: "libbinder_ndk", symbol_file: "libbinder_ndk.map.txt", export_include_dirs: [ + "include_cpp", "include_ndk", "include_platform", ], diff --git a/libs/binder/ndk/include_ndk/android/binder_auto_utils.h b/libs/binder/ndk/include_cpp/android/binder_auto_utils.h index 2b61cf18c2..2b61cf18c2 100644 --- a/libs/binder/ndk/include_ndk/android/binder_auto_utils.h +++ b/libs/binder/ndk/include_cpp/android/binder_auto_utils.h diff --git a/libs/binder/ndk/include_ndk/android/binder_enums.h b/libs/binder/ndk/include_cpp/android/binder_enums.h index ee819c0b23..ee819c0b23 100644 --- a/libs/binder/ndk/include_ndk/android/binder_enums.h +++ b/libs/binder/ndk/include_cpp/android/binder_enums.h diff --git a/libs/binder/ndk/include_ndk/android/binder_interface_utils.h b/libs/binder/ndk/include_cpp/android/binder_interface_utils.h index 33e4586137..33e4586137 100644 --- a/libs/binder/ndk/include_ndk/android/binder_interface_utils.h +++ b/libs/binder/ndk/include_cpp/android/binder_interface_utils.h diff --git a/libs/binder/ndk/include_ndk/android/binder_parcel_utils.h b/libs/binder/ndk/include_cpp/android/binder_parcel_utils.h index 09949ea259..09949ea259 100644 --- a/libs/binder/ndk/include_ndk/android/binder_parcel_utils.h +++ b/libs/binder/ndk/include_cpp/android/binder_parcel_utils.h |