tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Specify a default module for TARGET_RECOVERY_UI_LIB."

Browse source 
am: 9010493189

Change-Id: Id44f823329e40a58416c2f02cc029295e66a2898
This commit is contained in:
Tao Bao 2018-03-27 04:40:33 +00:00 committed by android-build-merger
commit 1da2937623
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Android.mk
View file

@ -18,6 +18,11 @@ LOCAL_PATH := $(call my-dir)
RECOVERY_API_VERSION := 3
RECOVERY_FSTAB_VERSION := 2
# TARGET_RECOVERY_UI_LIB should be one of librecovery_ui_{default,wear,vr} or a device-specific
# module that defines make_device() and the exact RecoveryUI class for the target. It defaults to
# librecovery_ui_default, which uses ScreenRecoveryUI.
TARGET_RECOVERY_UI_LIB ?= librecovery_ui_default
# libmounts (static library)
# ===============================
include $(CLEAR_VARS)
@ -32,8 +37,10 @@ include $(BUILD_STATIC_LIBRARY)
# librecovery (static library)
# ===============================
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
install.cpp
LOCAL_CFLAGS := -Wall -Werror
LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
@ -131,7 +138,6 @@ LOCAL_SRC_FILES := \
roots.cpp \
rotate_logs.cpp \
LOCAL_MODULE := recovery
LOCAL_FORCE_STATIC_EXECUTABLE := true
@ -150,17 +156,9 @@ LOCAL_CFLAGS += -Wall -Werror
LOCAL_C_INCLUDES += \
system/vold \
LOCAL_STATIC_LIBRARIES := librecovery
# If $(TARGET_RECOVERY_UI_LIB) is defined, the recovery calls make_device() from the
# $(TARGET_RECOVERY_UI_LIB), which depends on the librecovery_ui.
ifeq ($(TARGET_RECOVERY_UI_LIB),)
LOCAL_SRC_FILES += default_device.cpp
else
LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UI_LIB)
endif
LOCAL_STATIC_LIBRARIES += \
LOCAL_STATIC_LIBRARIES := \
librecovery \
$(TARGET_RECOVERY_UI_LIB) \
libverifier \
libbatterymonitor \
libbootloader_message \
@ -242,6 +240,16 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_CFLAGS := -Wall -Werror
include $(BUILD_STATIC_LIBRARY)
# Generic device that uses ScreenRecoveryUI.
# ===============================
include $(CLEAR_VARS)
LOCAL_SRC_FILES := default_device.cpp
LOCAL_CFLAGS := -Wall -Werror
LOCAL_MODULE := librecovery_ui_default
include $(BUILD_STATIC_LIBRARY)
# Wear default device
# ===============================
include $(CLEAR_VARS)