From e78f853e469e37bc2cc4f22d9f102d38d756af04 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 14 Dec 2016 13:03:12 -0800
Subject: [PATCH] Move libstorage includes into frameworks/base/lib/storage

Move the libstorage includes out of the global include path and into
frameworks/base/lib/storage/include, and export it.

Bug: 33630870
Test: m -j native
Change-Id: Idc0735360abc703496b9bc46d1a76ce8039af0d1
---
 libs/storage/Android.mk                                        | 3 +++
 {include => libs/storage/include}/storage/IMountService.h      | 0
 .../storage/include}/storage/IMountServiceListener.h           | 0
 .../storage/include}/storage/IMountShutdownObserver.h          | 0
 {include => libs/storage/include}/storage/IObbActionListener.h | 0
 5 files changed, 3 insertions(+)
 rename {include => libs/storage/include}/storage/IMountService.h (100%)
 rename {include => libs/storage/include}/storage/IMountServiceListener.h (100%)
 rename {include => libs/storage/include}/storage/IMountShutdownObserver.h (100%)
 rename {include => libs/storage/include}/storage/IObbActionListener.h (100%)

diff --git a/libs/storage/Android.mk b/libs/storage/Android.mk
index d0eb6d4eb425a..f8524e379599e 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
similarity index 100%
rename from include/storage/IMountService.h
rename to libs/storage/include/storage/IMountService.h
diff --git a/include/storage/IMountServiceListener.h b/libs/storage/include/storage/IMountServiceListener.h
similarity index 100%
rename from include/storage/IMountServiceListener.h
rename to libs/storage/include/storage/IMountServiceListener.h
diff --git a/include/storage/IMountShutdownObserver.h b/libs/storage/include/storage/IMountShutdownObserver.h
similarity index 100%
rename from include/storage/IMountShutdownObserver.h
rename to libs/storage/include/storage/IMountShutdownObserver.h
diff --git a/include/storage/IObbActionListener.h b/libs/storage/include/storage/IObbActionListener.h
similarity index 100%
rename from include/storage/IObbActionListener.h
rename to libs/storage/include/storage/IObbActionListener.h