From 2673cec07a4740f86438b50cfe1b70b258a9a8c8 Mon Sep 17 00:00:00 2001 From: Dees_Troy Date: Tue, 2 Apr 2013 20:22:16 +0000 Subject: Move all AOSP code out of recovery binary Improves license compatibility between GPL and Apache Change-Id: I2b165aa575bb6213af6b07936f99610c113443f0 --- minuitwrp/Android.mk | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'minuitwrp/Android.mk') diff --git a/minuitwrp/Android.mk b/minuitwrp/Android.mk index f0c708927..59ca2ccc5 100644 --- a/minuitwrp/Android.mk +++ b/minuitwrp/Android.mk @@ -1,7 +1,9 @@ LOCAL_PATH := $(call my-dir) + include $(CLEAR_VARS) LOCAL_SRC_FILES := events.c resources.c +#LOCAL_SRC_FILES := $(TARGET_OUT_SHARED_LIBRARIES)/libjpegtwrp.so $(TARGET_OUT_SHARED_LIBRARIES)/libpng.so $(TARGET_OUT_SHARED_LIBRARIES)/libpixelflinger.so ifneq ($(TW_BOARD_CUSTOM_GRAPHICS),) LOCAL_SRC_FILES += $(TW_BOARD_CUSTOM_GRAPHICS) @@ -9,11 +11,13 @@ else LOCAL_SRC_FILES += graphics.c endif -LOCAL_C_INCLUDES +=\ - external/libpng\ - external/zlib\ - external/jpeg +LOCAL_C_INCLUDES += \ + external/libpng \ + external/zlib \ + system/core/include +LOCAL_C_INCLUDES += \ + bootable/recovery/libjpegtwrp ifeq ($(RECOVERY_TOUCHSCREEN_SWAP_XY), true) LOCAL_CFLAGS += -DRECOVERY_TOUCHSCREEN_SWAP_XY @@ -54,7 +58,9 @@ endif ifneq ($(BOARD_USE_CUSTOM_RECOVERY_FONT),) LOCAL_CFLAGS += -DBOARD_USE_CUSTOM_RECOVERY_FONT=$(BOARD_USE_CUSTOM_RECOVERY_FONT) endif -LOCAL_STATIC_LIBRARY := libpng +LOCAL_SHARED_LIBRARIES += libz libpixelflinger libc libcutils +LOCAL_STATIC_LIBRARIES += libpng libjpegtwrp +LOCAL_MODULE_TAGS := eng LOCAL_MODULE := libminuitwrp -include $(BUILD_STATIC_LIBRARY) +include $(BUILD_SHARED_LIBRARY) \ No newline at end of file -- cgit v1.2.3