summaryrefslogtreecommitdiffstats
path: root/updater/Android.mk
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-03-04 21:28:30 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-03-04 21:28:30 +0100
commitd29a16afc7918ee921a995950f31dd1d6be6823f (patch)
treee678fcfaf7011a95a64e9d6b9a63538502e4d75b /updater/Android.mk
parentMerge "Restore labels on /postinstall during recovery." am: 60eae72ac6 (diff)
parentMerge "Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES." (diff)
downloadandroid_bootable_recovery-d29a16afc7918ee921a995950f31dd1d6be6823f.tar
android_bootable_recovery-d29a16afc7918ee921a995950f31dd1d6be6823f.tar.gz
android_bootable_recovery-d29a16afc7918ee921a995950f31dd1d6be6823f.tar.bz2
android_bootable_recovery-d29a16afc7918ee921a995950f31dd1d6be6823f.tar.lz
android_bootable_recovery-d29a16afc7918ee921a995950f31dd1d6be6823f.tar.xz
android_bootable_recovery-d29a16afc7918ee921a995950f31dd1d6be6823f.tar.zst
android_bootable_recovery-d29a16afc7918ee921a995950f31dd1d6be6823f.zip
Diffstat (limited to 'updater/Android.mk')
-rw-r--r--updater/Android.mk66
1 files changed, 38 insertions, 28 deletions
diff --git a/updater/Android.mk b/updater/Android.mk
index d7aa613e9..47c56ccd9 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -14,26 +14,50 @@
LOCAL_PATH := $(call my-dir)
-updater_src_files := \
- install.cpp \
- blockimg.cpp \
- updater.cpp
-
-#
-# Build a statically-linked binary to include in OTA packages
-#
+# updater (static executable)
+# ===============================
+# Build a statically-linked binary to include in OTA packages.
include $(CLEAR_VARS)
-# Build only in eng, so we don't end up with a copy of this in /system
-# on user builds. (TODO: find a better way to build device binaries
-# needed only for OTA packages.)
-LOCAL_MODULE_TAGS := eng
+updater_src_files := \
+ install.cpp \
+ blockimg.cpp \
+ updater.cpp
LOCAL_CLANG := true
-
LOCAL_SRC_FILES := $(updater_src_files)
-LOCAL_STATIC_LIBRARIES += libfec libfec_rs libext4_utils_static libsquashfs_utils libcrypto_static
+LOCAL_STATIC_LIBRARIES += \
+ $(TARGET_RECOVERY_UPDATER_LIBS) \
+ $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS) \
+ libfec \
+ libfec_rs \
+ libext4_utils_static \
+ libsquashfs_utils \
+ libcrypto_static \
+ libapplypatch \
+ libbase \
+ libotafault \
+ libedify \
+ libmtdutils \
+ libminzip \
+ libz \
+ libbz \
+ libcutils \
+ liblog \
+ libselinux
+
+tune2fs_static_libraries := \
+ libext2_com_err \
+ libext2_blkid \
+ libext2_quota \
+ libext2_uuid_static \
+ libext2_e2p \
+ libext2fs
+
+LOCAL_STATIC_LIBRARIES += \
+ libtune2fs \
+ $(tune2fs_static_libraries)
ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
LOCAL_CFLAGS += -DUSE_EXT4
@@ -44,20 +68,6 @@ LOCAL_STATIC_LIBRARIES += \
libz
endif
-LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS)
-LOCAL_STATIC_LIBRARIES += libapplypatch libbase libotafault libedify libmtdutils libminzip libz
-LOCAL_STATIC_LIBRARIES += libbz
-LOCAL_STATIC_LIBRARIES += libcutils liblog libc
-LOCAL_STATIC_LIBRARIES += libselinux
-tune2fs_static_libraries := \
- libext2_com_err \
- libext2_blkid \
- libext2_quota \
- libext2_uuid_static \
- libext2_e2p \
- libext2fs
-LOCAL_STATIC_LIBRARIES += libtune2fs $(tune2fs_static_libraries)
-
LOCAL_C_INCLUDES += external/e2fsprogs/misc
LOCAL_C_INCLUDES += $(LOCAL_PATH)/..