Move include/binder to libs/binder/include

Also moved include/private/binder to libs/binder/include/private/binder.
This allows libbinder to be compiled without depending on global
headers.

Bug: 33241851
Test: Build, flash, and run sailfish.
Test: Try building with BOARD_VNDK_VERSION := current
Change-Id: I0a82b733353add589de26eb2db7af5a246e5c97f

40 files changed, 7 insertions, 0 deletions

diff --git a/include/binder b/include/binder
new file mode 120000
index 0000000000..35a022ab67
--- /dev/null
+++ b/include/binder
@@ -0,0 +1 @@
+../libs/binder/include/binder/
\ No newline at end of file
diff --git a/include/private/binder b/include/private/binder
new file mode 120000
index 0000000000..09e9076102
--- /dev/null
+++ b/include/private/binder
@@ -0,0 +1 @@
+../../libs/binder/include/private/binder
\ No newline at end of file
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index b225128618..5fc37a9c06 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -12,6 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+cc_library_headers {
+    name: "libbinder_headers",
+    export_include_dirs: ["include"],
+}
+
 cc_library {
     name: "libbinder",
 
diff --git a/include/binder/AppOpsManager.h b/libs/binder/include/binder/AppOpsManager.h
index 4212776e89..4212776e89 100644
--- a/include/binder/AppOpsManager.h
+++ b/libs/binder/include/binder/AppOpsManager.h
diff --git a/include/binder/Binder.h b/libs/binder/include/binder/Binder.h
index 34048816cd..34048816cd 100644
--- a/include/binder/Binder.h
+++ b/libs/binder/include/binder/Binder.h
diff --git a/include/binder/BinderService.h b/libs/binder/include/binder/BinderService.h
index ef703bda90..ef703bda90 100644
--- a/include/binder/BinderService.h
+++ b/libs/binder/include/binder/BinderService.h
diff --git a/include/binder/BpBinder.h b/libs/binder/include/binder/BpBinder.h
index 7ef93aa390..7ef93aa390 100644
--- a/include/binder/BpBinder.h
+++ b/libs/binder/include/binder/BpBinder.h
diff --git a/include/binder/BufferedTextOutput.h b/libs/binder/include/binder/BufferedTextOutput.h
index 9a7c43bb13..9a7c43bb13 100644
--- a/include/binder/BufferedTextOutput.h
+++ b/libs/binder/include/binder/BufferedTextOutput.h
diff --git a/include/binder/Debug.h b/libs/binder/include/binder/Debug.h
index f6a335502f..f6a335502f 100644
--- a/include/binder/Debug.h
+++ b/libs/binder/include/binder/Debug.h
diff --git a/include/binder/IActivityManager.h b/libs/binder/include/binder/IActivityManager.h
index 5ad218035a..5ad218035a 100644
--- a/include/binder/IActivityManager.h
+++ b/libs/binder/include/binder/IActivityManager.h
diff --git a/include/binder/IAppOpsCallback.h b/libs/binder/include/binder/IAppOpsCallback.h
index b62e9e264d..b62e9e264d 100644
--- a/include/binder/IAppOpsCallback.h
+++ b/libs/binder/include/binder/IAppOpsCallback.h
diff --git a/include/binder/IAppOpsService.h b/libs/binder/include/binder/IAppOpsService.h
index dc18045975..dc18045975 100644
--- a/include/binder/IAppOpsService.h
+++ b/libs/binder/include/binder/IAppOpsService.h
diff --git a/include/binder/IBatteryStats.h b/libs/binder/include/binder/IBatteryStats.h
index e15d6f07e9..e15d6f07e9 100644
--- a/include/binder/IBatteryStats.h
+++ b/libs/binder/include/binder/IBatteryStats.h
diff --git a/include/binder/IBinder.h b/libs/binder/include/binder/IBinder.h
index 2e6295787d..2e6295787d 100644
--- a/include/binder/IBinder.h
+++ b/libs/binder/include/binder/IBinder.h
diff --git a/include/binder/IInterface.h b/libs/binder/include/binder/IInterface.h
index 0f1fe5b670..0f1fe5b670 100644
--- a/include/binder/IInterface.h
+++ b/libs/binder/include/binder/IInterface.h
diff --git a/include/binder/IMediaResourceMonitor.h b/libs/binder/include/binder/IMediaResourceMonitor.h
index b21047fc49..b21047fc49 100644
--- a/include/binder/IMediaResourceMonitor.h
+++ b/libs/binder/include/binder/IMediaResourceMonitor.h
diff --git a/include/binder/IMemory.h b/libs/binder/include/binder/IMemory.h
index 15a104fe6a..15a104fe6a 100644
--- a/include/binder/IMemory.h
+++ b/libs/binder/include/binder/IMemory.h
diff --git a/include/binder/IPCThreadState.h b/libs/binder/include/binder/IPCThreadState.h
index 7b826d6dcd..7b826d6dcd 100644
--- a/include/binder/IPCThreadState.h
+++ b/libs/binder/include/binder/IPCThreadState.h
diff --git a/include/binder/IPermissionController.h b/libs/binder/include/binder/IPermissionController.h
index 25f34313f0..25f34313f0 100644
--- a/include/binder/IPermissionController.h
+++ b/libs/binder/include/binder/IPermissionController.h
diff --git a/include/binder/IProcessInfoService.h b/libs/binder/include/binder/IProcessInfoService.h
index 2669f9193d..2669f9193d 100644
--- a/include/binder/IProcessInfoService.h
+++ b/libs/binder/include/binder/IProcessInfoService.h
diff --git a/include/binder/IResultReceiver.h b/libs/binder/include/binder/IResultReceiver.h
index e494fba0b8..e494fba0b8 100644
--- a/include/binder/IResultReceiver.h
+++ b/libs/binder/include/binder/IResultReceiver.h
diff --git a/include/binder/IServiceManager.h b/libs/binder/include/binder/IServiceManager.h
index 3b23f81e43..3b23f81e43 100644
--- a/include/binder/IServiceManager.h
+++ b/libs/binder/include/binder/IServiceManager.h
diff --git a/include/binder/IShellCallback.h b/libs/binder/include/binder/IShellCallback.h
index fda9ee6ba7..fda9ee6ba7 100644
--- a/include/binder/IShellCallback.h
+++ b/libs/binder/include/binder/IShellCallback.h
diff --git a/include/binder/IpPrefix.h b/libs/binder/include/binder/IpPrefix.h
index 96ebaac437..96ebaac437 100644
--- a/include/binder/IpPrefix.h
+++ b/libs/binder/include/binder/IpPrefix.h
diff --git a/include/binder/Map.h b/libs/binder/include/binder/Map.h
index 96a4f8a2a5..96a4f8a2a5 100644
--- a/include/binder/Map.h
+++ b/libs/binder/include/binder/Map.h
diff --git a/include/binder/MemoryBase.h b/libs/binder/include/binder/MemoryBase.h
index 463e26d977..463e26d977 100644
--- a/include/binder/MemoryBase.h
+++ b/libs/binder/include/binder/MemoryBase.h
diff --git a/include/binder/MemoryDealer.h b/libs/binder/include/binder/MemoryDealer.h
index 60a624c5a1..60a624c5a1 100644
--- a/include/binder/MemoryDealer.h
+++ b/libs/binder/include/binder/MemoryDealer.h
diff --git a/include/binder/MemoryHeapBase.h b/libs/binder/include/binder/MemoryHeapBase.h
index ea9b66c497..ea9b66c497 100644
--- a/include/binder/MemoryHeapBase.h
+++ b/libs/binder/include/binder/MemoryHeapBase.h
diff --git a/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h
index 5d36526cb3..5d36526cb3 100644
--- a/include/binder/Parcel.h
+++ b/libs/binder/include/binder/Parcel.h
diff --git a/include/binder/Parcelable.h b/libs/binder/include/binder/Parcelable.h
index d5b57ac587..d5b57ac587 100644
--- a/include/binder/Parcelable.h
+++ b/libs/binder/include/binder/Parcelable.h
diff --git a/include/binder/PermissionCache.h b/libs/binder/include/binder/PermissionCache.h
index bcdf0c2914..bcdf0c2914 100644
--- a/include/binder/PermissionCache.h
+++ b/libs/binder/include/binder/PermissionCache.h
diff --git a/include/binder/PersistableBundle.h b/libs/binder/include/binder/PersistableBundle.h
index 322fef9e4f..322fef9e4f 100644
--- a/include/binder/PersistableBundle.h
+++ b/libs/binder/include/binder/PersistableBundle.h
diff --git a/include/binder/ProcessInfoService.h b/libs/binder/include/binder/ProcessInfoService.h
index 0da61ee3cb..0da61ee3cb 100644
--- a/include/binder/ProcessInfoService.h
+++ b/libs/binder/include/binder/ProcessInfoService.h
diff --git a/include/binder/ProcessState.h b/libs/binder/include/binder/ProcessState.h
index 1ef045d455..1ef045d455 100644
--- a/include/binder/ProcessState.h
+++ b/libs/binder/include/binder/ProcessState.h
diff --git a/include/binder/Status.h b/libs/binder/include/binder/Status.h
index c3738f8b29..c3738f8b29 100644
--- a/include/binder/Status.h
+++ b/libs/binder/include/binder/Status.h
diff --git a/include/binder/TextOutput.h b/libs/binder/include/binder/TextOutput.h
index 851e01f4b8..851e01f4b8 100644
--- a/include/binder/TextOutput.h
+++ b/libs/binder/include/binder/TextOutput.h
diff --git a/include/binder/Value.h b/libs/binder/include/binder/Value.h
index 4dee3d86b0..4dee3d86b0 100644
--- a/include/binder/Value.h
+++ b/libs/binder/include/binder/Value.h
diff --git a/include/private/binder/ParcelValTypes.h b/libs/binder/include/private/binder/ParcelValTypes.h
index 666d22a57f..666d22a57f 100644
--- a/include/private/binder/ParcelValTypes.h
+++ b/libs/binder/include/private/binder/ParcelValTypes.h
diff --git a/include/private/binder/Static.h b/libs/binder/include/private/binder/Static.h
index 3d10456a8d..3d10456a8d 100644
--- a/include/private/binder/Static.h
+++ b/libs/binder/include/private/binder/Static.h
diff --git a/include/private/binder/binder_module.h b/libs/binder/include/private/binder/binder_module.h
index 2f11622e70..2f11622e70 100644
--- a/include/private/binder/binder_module.h
+++ b/libs/binder/include/private/binder/binder_module.h