From 01fcbe160bd49891c0680b80c5688cd4feb2adbc Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 23 May 2016 17:43:41 -0700 Subject: Disable the meaningless parts of the UI for A/B. Bug: http://b/28748484 Change-Id: Ie86a265f4699503471e7c717d65677a916dbd25b --- Android.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 65d123a86..9a064f236 100644 --- a/Android.mk +++ b/Android.mk @@ -93,6 +93,10 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) LOCAL_STATIC_LIBRARIES += libext4_utils_static libz endif +ifeq ($(AB_OTA_UPDATER),true) + LOCAL_CFLAGS += -DAB_OTA_UPDATER=1 +endif + LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin ifeq ($(TARGET_RECOVERY_UI_LIB),) -- cgit v1.2.3 From 2f272c0551f984e83bc5abaf240e0dddb38a3326 Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Fri, 24 Jun 2016 18:22:02 -0700 Subject: Create bootloader_message static library. bootloader_messages merges bootloader_message_writer and bootloader.cpp, so we can use the same library to manage bootloader_message in normal boot and recovery mode. Bug: 29582118 Change-Id: I9efdf776ef8f02b53911ff43a518e035e0c29618 --- Android.mk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 9a064f236..589bff41f 100644 --- a/Android.mk +++ b/Android.mk @@ -31,7 +31,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ adb_install.cpp \ asn1_decoder.cpp \ - bootloader.cpp \ device.cpp \ fuse_sdcard_provider.cpp \ install.cpp \ @@ -66,6 +65,7 @@ LOCAL_C_INCLUDES += \ LOCAL_STATIC_LIBRARIES := \ libbatterymonitor \ + libbootloader_message \ libext4_utils_static \ libsparse_static \ libminzip \ @@ -143,15 +143,17 @@ LOCAL_SRC_FILES := \ LOCAL_STATIC_LIBRARIES := libcrypto_static include $(BUILD_STATIC_LIBRARY) -include $(LOCAL_PATH)/minui/Android.mk \ +include \ + $(LOCAL_PATH)/applypatch/Android.mk \ + $(LOCAL_PATH)/bootloader_message/Android.mk \ + $(LOCAL_PATH)/edify/Android.mk \ + $(LOCAL_PATH)/minui/Android.mk \ $(LOCAL_PATH)/minzip/Android.mk \ $(LOCAL_PATH)/minadbd/Android.mk \ $(LOCAL_PATH)/mtdutils/Android.mk \ + $(LOCAL_PATH)/otafault/Android.mk \ $(LOCAL_PATH)/tests/Android.mk \ $(LOCAL_PATH)/tools/Android.mk \ - $(LOCAL_PATH)/edify/Android.mk \ $(LOCAL_PATH)/uncrypt/Android.mk \ - $(LOCAL_PATH)/otafault/Android.mk \ $(LOCAL_PATH)/updater/Android.mk \ $(LOCAL_PATH)/update_verifier/Android.mk \ - $(LOCAL_PATH)/applypatch/Android.mk -- cgit v1.2.3