diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-27 06:28:44 +0200 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-27 06:28:44 +0200 |
| commit | 90104931890796c040fb71eb9e21cbdd0e54a07b (patch) | |
| tree | 16937527946eaf26cd1c1246faed793a299b00d3 | |
| parent | Merge "Factor out a menu class for screen ui" (diff) | |
| parent | Specify a default module for TARGET_RECOVERY_UI_LIB. (diff) | |
| download | android_bootable_recovery-90104931890796c040fb71eb9e21cbdd0e54a07b.tar android_bootable_recovery-90104931890796c040fb71eb9e21cbdd0e54a07b.tar.gz android_bootable_recovery-90104931890796c040fb71eb9e21cbdd0e54a07b.tar.bz2 android_bootable_recovery-90104931890796c040fb71eb9e21cbdd0e54a07b.tar.lz android_bootable_recovery-90104931890796c040fb71eb9e21cbdd0e54a07b.tar.xz android_bootable_recovery-90104931890796c040fb71eb9e21cbdd0e54a07b.tar.zst android_bootable_recovery-90104931890796c040fb71eb9e21cbdd0e54a07b.zip | |
| -rw-r--r-- | Android.mk | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk index b28929604..5dca32a45 100644 --- a/Android.mk +++ b/Android.mk @@ -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) |