Merge changes I4968d5aa,Ieb34d79a,Idc073536

* changes:
  Move hwui private headers to frameworks/base/libs/hwui/private
  Convert libstorage to Android.bp
  Move libstorage includes into frameworks/base/lib/storage

8 files changed, 19 insertions, 16 deletions

diff --git a/include/private/README b/libs/hwui/private/README
index ee4149270ae2..ee4149270ae2 100644
--- a/include/private/README
+++ b/libs/hwui/private/README
diff --git a/include/private/hwui/DrawGlInfo.h b/libs/hwui/private/hwui/DrawGlInfo.h
index f57851322716..f57851322716 100644
--- a/include/private/hwui/DrawGlInfo.h
+++ b/libs/hwui/private/hwui/DrawGlInfo.h
diff --git a/libs/storage/Android.bp b/libs/storage/Android.bp
new file mode 100644
index 000000000000..911bd1d25393
--- /dev/null
+++ b/libs/storage/Android.bp
@@ -0,0 +1,19 @@
+cc_library_static {
+    name: "libstorage",
+
+    srcs: [
+        "IMountServiceListener.cpp",
+        "IMountShutdownObserver.cpp",
+        "IObbActionListener.cpp",
+        "IMountService.cpp",
+    ],
+
+    export_include_dirs: ["include"],
+
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+
+    shared_libs: ["libbinder"],
+}
diff --git a/libs/storage/Android.mk b/libs/storage/Android.mk
deleted file mode 100644
index d0eb6d4eb425..000000000000
--- a/libs/storage/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-	IMountServiceListener.cpp \
-	IMountShutdownObserver.cpp \
-	IObbActionListener.cpp \
-	IMountService.cpp
-
-LOCAL_MODULE:= libstorage
-
-LOCAL_CFLAGS += -Wall -Werror
-
-LOCAL_SHARED_LIBRARIES := libbinder
-
-include $(BUILD_STATIC_LIBRARY)
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