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 1/3] 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

From 3ac2be93a9f52103ec60a2f13cbaf31017cfdf54 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 14 Dec 2016 13:06:07 -0800
Subject: [PATCH 2/3] Convert libstorage to Android.bp

See build/soong/README.md for more information.

Test: m -j native
Change-Id: Ieb34d79af10e4e7cd146d0d40fd6946499dd1da0
---
 libs/storage/Android.bp | 19 +++++++++++++++++++
 libs/storage/Android.mk | 19 -------------------
 2 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 libs/storage/Android.bp
 delete mode 100644 libs/storage/Android.mk

diff --git a/libs/storage/Android.bp b/libs/storage/Android.bp
new file mode 100644
index 0000000000000..911bd1d25393f
--- /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 f8524e379599e..0000000000000
--- a/libs/storage/Android.mk
+++ /dev/null
@@ -1,19 +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_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-
-LOCAL_CFLAGS += -Wall -Werror
-
-LOCAL_SHARED_LIBRARIES := libbinder
-
-include $(BUILD_STATIC_LIBRARY)

From 19def9943abae2455ad6fa508f176fb5e1c4c1fd Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 14 Dec 2016 13:34:20 -0800
Subject: [PATCH 3/3] Move hwui private headers to
 frameworks/base/libs/hwui/private

hwui already exports most of its headers, move its private headers
into its source directory.

Bug: 33630870
Test: m -j native
Change-Id: I4968d5aaaa68d9e92c826841d20f29cef349c9d8
---
 {include => libs/hwui}/private/README            | 0
 {include => libs/hwui}/private/hwui/DrawGlInfo.h | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {include => libs/hwui}/private/README (100%)
 rename {include => libs/hwui}/private/hwui/DrawGlInfo.h (100%)

diff --git a/include/private/README b/libs/hwui/private/README
similarity index 100%
rename from include/private/README
rename to libs/hwui/private/README
diff --git a/include/private/hwui/DrawGlInfo.h b/libs/hwui/private/hwui/DrawGlInfo.h
similarity index 100%
rename from include/private/hwui/DrawGlInfo.h
rename to libs/hwui/private/hwui/DrawGlInfo.h