From 91eb7219696a9bff72c3464c37798e70f7e605ee Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Thu, 23 Aug 2012 15:20:16 -0700
Subject: Add libm due to libpng dependency.

Change-Id: I0bdc2df5ef358813587f613a1b50eaa850e95782
---
 Android.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 1c78b4287..215cfe569 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,6 +47,7 @@ LOCAL_STATIC_LIBRARIES := \
     libpng \
     libcutils \
     libstdc++ \
+    libm \
     libc
 
 ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
-- 
cgit v1.2.3


From 7eb7567aa3faebfb22bd052f3505d485ee23d585 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Tue, 16 Oct 2012 10:47:27 -0700
Subject: Remove HAVE_SELINUX guards

Change-Id: Ia96201f20f7838d7d9e8926208977d3f8318ced4
---
 Android.mk | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 1c78b4287..cd368a006 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,6 +46,7 @@ LOCAL_STATIC_LIBRARIES := \
     libpixelflinger_static \
     libpng \
     libcutils \
+    libselinux \
     libstdc++ \
     libc
 
@@ -55,12 +56,6 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
     LOCAL_STATIC_LIBRARIES += libext4_utils_static libz
 endif
 
-ifeq ($(HAVE_SELINUX), true)
-  LOCAL_C_INCLUDES += external/libselinux/include
-  LOCAL_STATIC_LIBRARIES += libselinux
-  LOCAL_CFLAGS += -DHAVE_SELINUX
-endif # HAVE_SELINUX
-
 # This binary is in the recovery ramdisk, which is otherwise a copy of root.
 # It gets copied there in config/Makefile.  LOCAL_MODULE_TAGS suppresses
 # a (redundant) copy of the binary in /system/bin for user builds.
@@ -73,12 +68,6 @@ else
   LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UI_LIB)
 endif
 
-ifeq ($(HAVE_SELINUX),true)
-  LOCAL_C_INCLUDES += external/libselinux/include
-  LOCAL_STATIC_LIBRARIES += libselinux
-  LOCAL_CFLAGS += -DHAVE_SELINUX
-endif # HAVE_SELINUX
-
 LOCAL_C_INCLUDES += system/extras/ext4_utils
 
 include $(BUILD_EXECUTABLE)
-- 
cgit v1.2.3


From f35d1cef7c19db975a1295e8c23c7fb8bd2489f9 Mon Sep 17 00:00:00 2001
From: Ken Sumrall <ksumrall@android.com>
Date: Wed, 13 Feb 2013 12:59:35 -0800
Subject: Move to using the new unified fstab in recovery.

Instead of reading it's own fstab, have recovery invoke
fs_mgr to read the unified fstab.

Change-Id: I80c75d2c53b809ac60a4a69f0ef7ebfa707c39e9
---
 Android.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index f4ecdb5dd..35151ee70 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,6 +32,7 @@ LOCAL_MODULE := recovery
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 
 RECOVERY_API_VERSION := 3
+RECOVERY_FSTAB_VERSION := 2
 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
 
 LOCAL_STATIC_LIBRARIES := \
@@ -45,6 +46,7 @@ LOCAL_STATIC_LIBRARIES := \
     libminui \
     libpixelflinger_static \
     libpng \
+    libfs_mgr \
     libcutils \
     libselinux \
     libstdc++ \
-- 
cgit v1.2.3


From 4e21482d979f6f81b34f92e664adf137555d4504 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Tue, 9 Apr 2013 21:41:29 -0700
Subject: Add liblog

Bug: 8580410
Change-Id: Ie60dade81c06589cb0daee431611ded34adef8e6
---
 Android.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 35151ee70..075fa2cfe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,6 +48,7 @@ LOCAL_STATIC_LIBRARIES := \
     libpng \
     libfs_mgr \
     libcutils \
+    liblog \
     libselinux \
     libstdc++ \
     libm \
-- 
cgit v1.2.3