diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-20 13:04:58 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-20 13:04:58 -0700 |
commit | 07f6ea19422ca51eb067e4bdc732c6ede054ecb5 (patch) | |
tree | 3bc0e4e192054a520b7751da1a6957f43bfc632b | |
parent | 65b952a29e474af509043776c217c233eab0e702 (diff) | |
parent | c1c3eee4a15bb64977398e2f8359290a02d61b94 (diff) | |
download | libhardware_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.mk | 2 | ||||
-rw-r--r-- | include/hardware_legacy/IMountService.h | 2 | ||||
-rw-r--r-- | mount/IMountService.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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> |