summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2016-12-15 07:43:29 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-15 07:43:29 +0000
commit87ba88ce6f195b0767317612a85b1493ec8692d8 (patch)
tree2ad5f0316bdee603456cf7e2e0d03979a2fcaefb
parentc6fcacd46ef2a69d1a8332c8996251c5aec62ac6 (diff)
parente6120caf2a77943b64074cbf07879819d3127a9a (diff)
Move libstorage includes into frameworks/base/lib/storage am: e78f853e46 am: afef87b1ba am: f142640afb
am: e6120caf2a Change-Id: I2617bff54282647c2af5755349bf35d650f3d4c8
-rw-r--r--libs/storage/Android.mk3
-rw-r--r--libs/storage/include/storage/IMountService.h (renamed from include/storage/IMountService.h)0
-rw-r--r--libs/storage/include/storage/IMountServiceListener.h (renamed from include/storage/IMountServiceListener.h)0
-rw-r--r--libs/storage/include/storage/IMountShutdownObserver.h (renamed from include/storage/IMountShutdownObserver.h)0
-rw-r--r--libs/storage/include/storage/IObbActionListener.h (renamed from include/storage/IObbActionListener.h)0
5 files changed, 3 insertions, 0 deletions
diff --git a/libs/storage/Android.mk b/libs/storage/Android.mk
index d0eb6d4eb425..f8524e379599 100644
--- a/libs/storage/Android.mk
+++ b/libs/storage/Android.mk
@@ -9,6 +9,9 @@ LOCAL_SRC_FILES:= \
LOCAL_MODULE:= libstorage
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+
LOCAL_CFLAGS += -Wall -Werror
LOCAL_SHARED_LIBRARIES := libbinder
diff --git a/include/storage/IMountService.h b/libs/storage/include/storage/IMountService.h
index c3d34d84958b..c3d34d84958b 100644
--- a/include/storage/IMountService.h
+++ b/libs/storage/include/storage/IMountService.h
diff --git a/include/storage/IMountServiceListener.h b/libs/storage/include/storage/IMountServiceListener.h
index 5b1f21cf98b5..5b1f21cf98b5 100644
--- a/include/storage/IMountServiceListener.h
+++ b/libs/storage/include/storage/IMountServiceListener.h
diff --git a/include/storage/IMountShutdownObserver.h b/libs/storage/include/storage/IMountShutdownObserver.h
index d019e019bc0d..d019e019bc0d 100644
--- a/include/storage/IMountShutdownObserver.h
+++ b/libs/storage/include/storage/IMountShutdownObserver.h
diff --git a/include/storage/IObbActionListener.h b/libs/storage/include/storage/IObbActionListener.h
index d78273cf2dd4..d78273cf2dd4 100644
--- a/include/storage/IObbActionListener.h
+++ b/libs/storage/include/storage/IObbActionListener.h