Ethan Yonker
a167416289
This will probably not compile and may need additional work. For tracking purposes so we know what might still need looking at as none of this has been compiled and tested, here is a list of the merge conflicts that I attempted to fix before pushing this set of changes: git pull aosp lollipop-release remote: Finding sources: 100% (992/992) remote: Total 992 (delta 473), reused 992 (delta 473) Receiving objects: 100% (992/992), 1.51 MiB | 516.00 KiB/s, done. Resolving deltas: 100% (473/473), completed with 42 local objects. From https://android.googlesource.com/platform/bootable/recovery * branch lollipop-release -> FETCH_HEAD * [new branch] lollipop-release -> aosp/lollipop-release Auto-merging verifier_test.cpp CONFLICT (content): Merge conflict in verifier_test.cpp Auto-merging verifier.h CONFLICT (content): Merge conflict in verifier.h Auto-merging verifier.cpp CONFLICT (content): Merge conflict in verifier.cpp Auto-merging updater/updater.c Auto-merging updater/install.c CONFLICT (content): Merge conflict in updater/install.c Auto-merging updater/Android.mk CONFLICT (content): Merge conflict in updater/Android.mk Auto-merging uncrypt/Android.mk CONFLICT (content): Merge conflict in uncrypt/Android.mk Auto-merging ui.cpp CONFLICT (content): Merge conflict in ui.cpp Auto-merging screen_ui.cpp Auto-merging roots.cpp CONFLICT (content): Merge conflict in roots.cpp CONFLICT (rename/delete): res-hdpi/images/progress_fill.png deleted in HEAD and renamed incddb68b5ea. Versioncddb68b5eaof res-hdpi/images/progress_fill.png left in tree. CONFLICT (rename/delete): res-hdpi/images/progress_empty.png deleted in HEAD and renamed incddb68b5ea. Versioncddb68b5eaof res-hdpi/images/progress_empty.png left in tree. CONFLICT (rename/delete): res-hdpi/images/icon_error.png deleted in HEAD and renamed incddb68b5ea. Versioncddb68b5eaof res-hdpi/images/icon_error.png left in tree. Auto-merging recovery.cpp CONFLICT (content): Merge conflict in recovery.cpp Auto-merging minui/resources.c CONFLICT (content): Merge conflict in minui/resources.c Auto-merging minui/minui.h CONFLICT (content): Merge conflict in minui/minui.h Auto-merging minui/graphics.c CONFLICT (content): Merge conflict in minui/graphics.c Auto-merging minui/Android.mk CONFLICT (content): Merge conflict in minui/Android.mk Removing minelf/Retouch.h Removing minelf/Retouch.c Auto-merging minadbd/usb_linux_client.c CONFLICT (content): Merge conflict in minadbd/usb_linux_client.c Auto-merging minadbd/adb.h CONFLICT (content): Merge conflict in minadbd/adb.h Auto-merging minadbd/adb.c CONFLICT (content): Merge conflict in minadbd/adb.c Auto-merging minadbd/Android.mk CONFLICT (content): Merge conflict in minadbd/Android.mk Removing make-overlay.py Auto-merging install.h CONFLICT (content): Merge conflict in install.h Auto-merging etc/init.rc CONFLICT (content): Merge conflict in etc/init.rc Auto-merging bootloader.h Auto-merging applypatch/applypatch.c Auto-merging applypatch/Android.mk CONFLICT (content): Merge conflict in applypatch/Android.mk Auto-merging adb_install.cpp CONFLICT (content): Merge conflict in adb_install.cpp Auto-merging Android.mk CONFLICT (content): Merge conflict in Android.mk Automatic merge failed; fix conflicts and then commit the result. Change-Id: I3e0e03e48ad8550912111c7a5c9a140ed0267e2c
96 lines
3.1 KiB
Makefile
96 lines
3.1 KiB
Makefile
# Copyright 2009 The Android Open Source Project
|
|
|
|
LOCAL_PATH := $(call my-dir)
|
|
|
|
updater_src_files := \
|
|
install.c \
|
|
blockimg.c \
|
|
updater.c
|
|
|
|
#
|
|
# 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
|
|
|
|
LOCAL_SRC_FILES := $(updater_src_files)
|
|
|
|
ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
|
|
LOCAL_CFLAGS += -DUSE_EXT4
|
|
LOCAL_CFLAGS += -Wno-unused-parameter
|
|
LOCAL_C_INCLUDES += system/extras/ext4_utils
|
|
LOCAL_STATIC_LIBRARIES += \
|
|
libext4_utils \
|
|
libz
|
|
ifneq ($(wildcard system/core/libmincrypt/rsa_e_3.c),)
|
|
LOCAL_STATIC_LIBRARIES = \
|
|
libext4_utils_static \
|
|
libsparse_static \
|
|
libz
|
|
endif
|
|
ifneq ($(wildcard system/core/include/mincrypt/sha256.h),)
|
|
LOCAL_STATIC_LIBRARIES = \
|
|
libext4_utils_static \
|
|
libsparse_static \
|
|
libz
|
|
endif
|
|
endif
|
|
|
|
LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS)
|
|
LOCAL_STATIC_LIBRARIES += libapplypatch libedify libmtdutils libminzip libz
|
|
LOCAL_STATIC_LIBRARIES += libflashutils libmmcutils libbmlutils
|
|
LOCAL_STATIC_LIBRARIES += libmincrypttwrp libbz
|
|
LOCAL_STATIC_LIBRARIES += libminelf
|
|
LOCAL_STATIC_LIBRARIES += libcutils liblog libstdc++ libc
|
|
LOCAL_STATIC_LIBRARIES += libselinux
|
|
LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
|
|
|
|
# Each library in TARGET_RECOVERY_UPDATER_LIBS should have a function
|
|
# named "Register_<libname>()". Here we emit a little C function that
|
|
# gets #included by updater.c. It calls all those registration
|
|
# functions.
|
|
|
|
# Devices can also add libraries to TARGET_RECOVERY_UPDATER_EXTRA_LIBS.
|
|
# These libs are also linked in with updater, but we don't try to call
|
|
# any sort of registration function for these. Use this variable for
|
|
# any subsidiary static libraries required for your registered
|
|
# extension libs.
|
|
|
|
inc := $(call intermediates-dir-for,PACKAGING,updater_extensions)/register.inc
|
|
|
|
# Encode the value of TARGET_RECOVERY_UPDATER_LIBS into the filename of the dependency.
|
|
# So if TARGET_RECOVERY_UPDATER_LIBS is changed, a new dependency file will be generated.
|
|
# Note that we have to remove any existing depency files before creating new one,
|
|
# so no obsolete dependecy file gets used if you switch back to an old value.
|
|
inc_dep_file := $(inc).dep.$(subst $(space),-,$(sort $(TARGET_RECOVERY_UPDATER_LIBS)))
|
|
$(inc_dep_file): stem := $(inc).dep
|
|
$(inc_dep_file) :
|
|
$(hide) mkdir -p $(dir $@)
|
|
$(hide) rm -f $(stem).*
|
|
$(hide) touch $@
|
|
|
|
$(inc) : libs := $(TARGET_RECOVERY_UPDATER_LIBS)
|
|
$(inc) : $(inc_dep_file)
|
|
$(hide) mkdir -p $(dir $@)
|
|
$(hide) echo "" > $@
|
|
$(hide) $(foreach lib,$(libs),echo "extern void Register_$(lib)(void);" >> $@;)
|
|
$(hide) echo "void RegisterDeviceExtensions() {" >> $@
|
|
$(hide) $(foreach lib,$(libs),echo " Register_$(lib)();" >> $@;)
|
|
$(hide) echo "}" >> $@
|
|
|
|
$(call intermediates-dir-for,EXECUTABLES,updater)/updater.o : $(inc)
|
|
LOCAL_C_INCLUDES += $(dir $(inc))
|
|
|
|
inc :=
|
|
inc_dep_file :=
|
|
|
|
LOCAL_MODULE := updater
|
|
|
|
LOCAL_FORCE_STATIC_EXECUTABLE := true
|
|
|
|
include $(BUILD_EXECUTABLE)
|