summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-20 13:04:58 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-05-20 13:04:58 -0700
commit07f6ea19422ca51eb067e4bdc732c6ede054ecb5 (patch)
tree3bc0e4e192054a520b7751da1a6957f43bfc632b
parent65b952a29e474af509043776c217c233eab0e702 (diff)
parentc1c3eee4a15bb64977398e2f8359290a02d61b94 (diff)
downloadlibhardware_legacy-07f6ea19422ca51eb067e4bdc732c6ede054ecb5.tar.gz
Merge changes 2103,2104
* changes: move libbinder's header files under includes/binder add libbinder to makefile
-rw-r--r--Android.mk2
-rw-r--r--include/hardware_legacy/IMountService.h2
-rw-r--r--mount/IMountService.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index c698e26..405f79f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,7 +6,7 @@ SAVE_MAKEFILES := $(call all-subdir-makefiles)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_SHARED_LIBRARIES := libutils libcutils libwpa_client
+LOCAL_SHARED_LIBRARIES := libutils libbinder libcutils libwpa_client
LOCAL_INCLUDES += $(LOCAL_PATH)
diff --git a/include/hardware_legacy/IMountService.h b/include/hardware_legacy/IMountService.h
index b956ec8..f5f03c9 100644
--- a/include/hardware_legacy/IMountService.h
+++ b/include/hardware_legacy/IMountService.h
@@ -18,7 +18,7 @@
#ifndef ANDROID_HARDWARE_IMOUNTSERVICE_H
#define ANDROID_HARDWARE_IMOUNTSERVICE_H
-#include <utils/IInterface.h>
+#include <binder/IInterface.h>
#include <utils/String16.h>
namespace android {
diff --git a/mount/IMountService.cpp b/mount/IMountService.cpp
index d747ba2..c30ac0b 100644
--- a/mount/IMountService.cpp
+++ b/mount/IMountService.cpp
@@ -17,7 +17,7 @@
#include <stdint.h>
#include <sys/types.h>
-#include <utils/Parcel.h>
+#include <binder/Parcel.h>
#include <hardware_legacy/IMountService.h>