diff options
| author | 2019-08-09 02:42:17 -0700 | |
|---|---|---|
| committer | 2019-08-09 02:42:17 -0700 | |
| commit | d2984d0426f99ffbc492c664c44679939661e7d9 (patch) | |
| tree | c8b60cfff16a334e05dd4ad4c6d9e4a48d151bfe | |
| parent | f1e71bd53c62df73494b528ccead8b364ec44729 (diff) | |
| parent | 22bda9c24b2d1fcb7c9305b337e6ed7222ef5cf3 (diff) | |
Merge "libbinder_ndk: mv include_{apex,platform}" am: d3138a4e34 am: 48475bf531 am: 16c3b98e59 am: b9664b8ff1
am: 22bda9c24b
Change-Id: Ic22dfd17114332b551dfca0863b3fafc8924022e
| -rw-r--r-- | libs/binder/ndk/Android.bp | 4 | ||||
| -rw-r--r-- | libs/binder/ndk/include_platform/android/binder_manager.h (renamed from libs/binder/ndk/include_apex/android/binder_manager.h) | 0 | ||||
| -rw-r--r-- | libs/binder/ndk/include_platform/android/binder_process.h (renamed from libs/binder/ndk/include_apex/android/binder_process.h) | 0 | ||||
| -rw-r--r-- | libs/binder/ndk/include_platform/android/binder_stability.h (renamed from libs/binder/ndk/include_apex/android/binder_stability.h) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp index bb2bb729d1..734a9287e1 100644 --- a/libs/binder/ndk/Android.bp +++ b/libs/binder/ndk/Android.bp @@ -19,7 +19,7 @@ cc_library_shared { export_include_dirs: [ "include_ndk", - "include_apex", + "include_platform", ], cflags: [ @@ -80,6 +80,6 @@ llndk_library { symbol_file: "libbinder_ndk.map.txt", export_include_dirs: [ "include_ndk", - "include_apex", + "include_platform", ], } diff --git a/libs/binder/ndk/include_apex/android/binder_manager.h b/libs/binder/ndk/include_platform/android/binder_manager.h index 055c79bca1..055c79bca1 100644 --- a/libs/binder/ndk/include_apex/android/binder_manager.h +++ b/libs/binder/ndk/include_platform/android/binder_manager.h diff --git a/libs/binder/ndk/include_apex/android/binder_process.h b/libs/binder/ndk/include_platform/android/binder_process.h index fdefbb4b8a..fdefbb4b8a 100644 --- a/libs/binder/ndk/include_apex/android/binder_process.h +++ b/libs/binder/ndk/include_platform/android/binder_process.h diff --git a/libs/binder/ndk/include_apex/android/binder_stability.h b/libs/binder/ndk/include_platform/android/binder_stability.h index e6aeb04e6f..e6aeb04e6f 100644 --- a/libs/binder/ndk/include_apex/android/binder_stability.h +++ b/libs/binder/ndk/include_platform/android/binder_stability.h |