PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp

Browse Source 
Change-Id: I861e3a6aa07c448909b2ae54618bba178bd6e457
This commit is contained in:
Kenny Root
2012-10-16 17:44:21 -07:00
parent d0d4d44d34 78afed1c15
commit cd74108cda
11 changed files with 4 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.mk
+1 -12
View File
@@ -46,6 +46,7 @@ LOCAL_STATIC_LIBRARIES := \
libpixelflinger_static \
libpng \
libcutils \
libselinux \
libstdc++ \
libm \
libc
@@ -56,12 +57,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.
@@ -74,12 +69,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)