summaryrefslogtreecommitdiff
path: root/Parcel.cpp
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2019-09-17 15:30:29 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-17 15:30:29 -0700
commitdd9b1e9cde2a437125650b357e656ca66f4ed5da (patch)
tree163aa1fd7ba7cfe92c175f439f1ec5b9b749421a /Parcel.cpp
parentb8267af550e6d19923432a7907b204682b59b93c (diff)
parent675fd5f9f15ea50c51d33538bd6aa308546be35b (diff)
downloadlibhwbinder-dd9b1e9cde2a437125650b357e656ca66f4ed5da.tar.gz
Merge "stop exporting kernel headers" am: 4f35e0bc27 am: 23680bd41d am: 9c53e8a3d1
am: 675fd5f9f1 Change-Id: I822bf81f4e07b7296c42be64f9b14a1b1d2d27db
Diffstat (limited to 'Parcel.cpp')
-rw-r--r--Parcel.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/Parcel.cpp b/Parcel.cpp
index c3ee87f..1f9795d 100644
--- a/Parcel.cpp
+++ b/Parcel.cpp
@@ -36,7 +36,6 @@
#include <hwbinder/Parcel.h>
#include <hwbinder/ProcessState.h>
#include <hwbinder/TextOutput.h>
-#include <hwbinder/binder_kernel.h>
#include <cutils/ashmem.h>
#include <utils/Debug.h>
@@ -45,7 +44,7 @@
#include <utils/String8.h>
#include <utils/String16.h>
-#include <private/binder/binder_module.h>
+#include "binder_kernel.h"
#include <hwbinder/Static.h>
#ifndef INT32_MAX