commit d3138a4e341c22690e9b34546504ff17d4e94151
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 09 08:41:31 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 09 08:41:31 2019 +0000
tree 6412300e78ad07459f4ad1d957a7e9207e930b4a
parent 152b3e4727d2dd6bcfb31ac88aa16daed73a6c35
parent 6b7ea2af336bbc3d0f543a2d18fd40817c8d26a3

Merge "libbinder_ndk: mv include_{apex,platform}"

libs/binder/ndk/Android.bp

diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp
index bb2bb72..734a928 100644
--- a/libs/binder/ndk/Android.bp
+++ b/libs/binder/ndk/Android.bp
@@ -19,7 +19,7 @@
 
     export_include_dirs: [
         "include_ndk",
-        "include_apex",
+        "include_platform",
     ],
 
     cflags: [
@@ -80,6 +80,6 @@
     symbol_file: "libbinder_ndk.map.txt",
     export_include_dirs: [
         "include_ndk",
-        "include_apex",
+        "include_platform",
     ],
 }

libs/binder/ndk/include_platform/android/binder_manager.h

diff --git a/libs/binder/ndk/include_apex/android/binder_manager.h b/libs/binder/ndk/include_platform/android/binder_manager.h
similarity index 100%
rename from libs/binder/ndk/include_apex/android/binder_manager.h
rename to libs/binder/ndk/include_platform/android/binder_manager.h

libs/binder/ndk/include_platform/android/binder_process.h

diff --git a/libs/binder/ndk/include_apex/android/binder_process.h b/libs/binder/ndk/include_platform/android/binder_process.h
similarity index 100%
rename from libs/binder/ndk/include_apex/android/binder_process.h
rename to libs/binder/ndk/include_platform/android/binder_process.h

libs/binder/ndk/include_platform/android/binder_stability.h

diff --git a/libs/binder/ndk/include_apex/android/binder_stability.h b/libs/binder/ndk/include_platform/android/binder_stability.h
similarity index 100%
rename from libs/binder/ndk/include_apex/android/binder_stability.h
rename to libs/binder/ndk/include_platform/android/binder_stability.h