summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-05-11 23:50:21 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-05-11 23:50:21 +0200
commit81726e443016d2fe3a587c01945438f39c6c6141 (patch)
tree76140537ed27c00f731e34128ae38f4b89bb0277
parentMerge "tests: Add tests for ScreenRecoveryUI." am: 8c6f699b36 (diff)
parentMerge "Move device.cpp into librecovery_ui." (diff)
downloadandroid_bootable_recovery-81726e443016d2fe3a587c01945438f39c6c6141.tar
android_bootable_recovery-81726e443016d2fe3a587c01945438f39c6c6141.tar.gz
android_bootable_recovery-81726e443016d2fe3a587c01945438f39c6c6141.tar.bz2
android_bootable_recovery-81726e443016d2fe3a587c01945438f39c6c6141.tar.lz
android_bootable_recovery-81726e443016d2fe3a587c01945438f39c6c6141.tar.xz
android_bootable_recovery-81726e443016d2fe3a587c01945438f39c6c6141.tar.zst
android_bootable_recovery-81726e443016d2fe3a587c01945438f39c6c6141.zip
-rw-r--r--Android.mk17
1 files changed, 10 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk
index c1a79bb69..2fa9d53bd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,6 +23,11 @@ RECOVERY_FSTAB_VERSION := 2
# librecovery_ui_default, which uses ScreenRecoveryUI.
TARGET_RECOVERY_UI_LIB ?= librecovery_ui_default
+recovery_common_cflags := \
+ -Wall \
+ -Werror \
+ -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
+
# librecovery (static library)
# ===============================
include $(CLEAR_VARS)
@@ -30,8 +35,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
install.cpp
-LOCAL_CFLAGS := -Wall -Werror
-LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
+LOCAL_CFLAGS := $(recovery_common_cflags)
ifeq ($(AB_OTA_UPDATER),true)
LOCAL_CFLAGS += -DAB_OTA_UPDATER=1
@@ -54,13 +58,12 @@ include $(BUILD_STATIC_LIBRARY)
# ===============================
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
+ device.cpp \
screen_ui.cpp \
ui.cpp \
vr_ui.cpp \
wear_ui.cpp
-LOCAL_CFLAGS := -Wall -Werror
-
LOCAL_MODULE := librecovery_ui
LOCAL_STATIC_LIBRARIES := \
@@ -68,6 +71,8 @@ LOCAL_STATIC_LIBRARIES := \
libotautil \
libbase
+LOCAL_CFLAGS := $(recovery_common_cflags)
+
ifneq ($(TARGET_RECOVERY_UI_MARGIN_HEIGHT),)
LOCAL_CFLAGS += -DRECOVERY_UI_MARGIN_HEIGHT=$(TARGET_RECOVERY_UI_MARGIN_HEIGHT)
else
@@ -124,7 +129,6 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
adb_install.cpp \
- device.cpp \
fuse_sdcard_provider.cpp \
logging.cpp \
recovery.cpp \
@@ -147,8 +151,7 @@ LOCAL_REQUIRED_MODULES += sload.f2fs mkfs.f2fs
endif
endif
-LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
-LOCAL_CFLAGS += -Wall -Werror
+LOCAL_CFLAGS := $(recovery_common_cflags)
LOCAL_C_INCLUDES += \
system/vold \