From a7b9a4660c18a88413280c84c03917ae953d62b0 Mon Sep 17 00:00:00 2001 From: Jed Estep Date: Tue, 15 Dec 2015 16:04:53 -0800 Subject: IO fault injection for OTA packages Bug: 25951086 Change-Id: I31c74c735eb7a975b7f41fe2b2eff042e5699c0c (cherry-picked from commit f1fc48c6e62cfee42d25ad12f443e22d50c15d0b) --- updater/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index 6fdd30895..d7aa613e9 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -45,7 +45,7 @@ LOCAL_STATIC_LIBRARIES += \ endif LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS) -LOCAL_STATIC_LIBRARIES += libapplypatch libbase libedify libmtdutils libminzip libz +LOCAL_STATIC_LIBRARIES += libapplypatch libbase libotafault libedify libmtdutils libminzip libz LOCAL_STATIC_LIBRARIES += libbz LOCAL_STATIC_LIBRARIES += libcutils liblog libc LOCAL_STATIC_LIBRARIES += libselinux -- cgit v1.2.3 From d80a99883d5ae2b117c54f076fe1df7eae86d2f8 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 3 Mar 2016 11:43:47 -0800 Subject: Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES. If two libraries both use LOCAL_WHOLE_STATIC_LIBRARIES and include a same library, there would be linking errors when generating a shared library (or executable) that depends on the two libraries both. Also clean up Android.mk files. Remove the "LOCAL_MODULE_TAGS := eng" line for the updater module. The module will then default to "optional" which won't be built until needed. Change-Id: I3ec227109b8aa744b7568e7f82f575aae3fe0e6f --- updater/Android.mk | 66 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 28 deletions(-) (limited to 'updater/Android.mk') 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)/.. -- cgit v1.2.3 From 452df6d99c81c4eeee3d2c7b2171901e8b7bc54a Mon Sep 17 00:00:00 2001 From: Mattias Nissler Date: Mon, 4 Apr 2016 16:17:01 +0200 Subject: Convert recovery to use BoringSSL instead of mincrypt. This changes the verification code in bootable/recovery to use BoringSSL instead of mincrypt. Change-Id: I37b37d84b22e81c32ac180cd1240c02150ddf3a7 --- updater/Android.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index 47c56ccd9..7c3f6160c 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -34,6 +34,7 @@ LOCAL_STATIC_LIBRARIES += \ libfec_rs \ libext4_utils_static \ libsquashfs_utils \ + libcrypto_utils_static \ libcrypto_static \ libapplypatch \ libbase \ -- cgit v1.2.3 From 63a319201fc0f5c34c1c62b446527e06f57f8d40 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 9 Jun 2016 17:41:22 -0700 Subject: Remove obsolete MTD support. Bug: http://b/29250988 Change-Id: Ia97ba9082a165c37f74d6e1c3f71a367adc59945 --- updater/Android.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index 7c3f6160c..75af4bdd0 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -40,8 +40,8 @@ LOCAL_STATIC_LIBRARIES += \ libbase \ libotafault \ libedify \ - libmtdutils \ libminzip \ + libmounts \ libz \ libbz \ libcutils \ @@ -60,14 +60,11 @@ LOCAL_STATIC_LIBRARIES += \ libtune2fs \ $(tune2fs_static_libraries) -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 += \ libsparse_static \ libz -endif LOCAL_C_INCLUDES += external/e2fsprogs/misc LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. -- cgit v1.2.3 From 073164f24b212685c181c8620f0397d13e9d79c0 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Fri, 5 Aug 2016 15:59:05 -0700 Subject: Fix references to libcrypto_utils_static. Bug: http://b/30708454 Change-Id: I7a5048beff1d8b783a9683dcb4a79606a77f20ee --- updater/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index 75af4bdd0..b4d427c5d 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -34,8 +34,8 @@ LOCAL_STATIC_LIBRARIES += \ libfec_rs \ libext4_utils_static \ libsquashfs_utils \ - libcrypto_utils_static \ - libcrypto_static \ + libcrypto_utils \ + libcrypto \ libapplypatch \ libbase \ libotafault \ -- cgit v1.2.3 From 7b0ad9c638176dc364dabb65b363536055a0ea9c Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Fri, 5 Aug 2016 18:00:04 -0700 Subject: Switch recovery to libbase logging Clean up the recovery image and switch to libbase logging. Bug: 28191554 Change-Id: Icd999c3cc832f0639f204b5c36cea8afe303ad35 Merged-In: Icd999c3cc832f0639f204b5c36cea8afe303ad35 --- updater/Android.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index b4d427c5d..e4d73a45a 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -37,7 +37,6 @@ LOCAL_STATIC_LIBRARIES += \ libcrypto_utils \ libcrypto \ libapplypatch \ - libbase \ libotafault \ libedify \ libminzip \ @@ -46,7 +45,9 @@ LOCAL_STATIC_LIBRARIES += \ libbz \ libcutils \ liblog \ - libselinux + libselinux \ + libbase \ + liblog tune2fs_static_libraries := \ libext2_com_err \ -- cgit v1.2.3 From 7aa88748f6ec4e53333d1a15747bc44826ccc410 Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Wed, 28 Sep 2016 11:42:17 -0700 Subject: Turn on -Werror for recovery Also remove the 0xff comparison when validating the bootloader message fields. As the fields won't be erased to 0xff after we remove the MTD support. Bug: 28202046 Test: The recovery folder compiles for aosp_x86-eng Change-Id: Ibb30ea1b2b28676fb08c7e92a1e5f7b6ef3247ab --- updater/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index e4d73a45a..507088dcd 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -61,7 +61,7 @@ LOCAL_STATIC_LIBRARIES += \ libtune2fs \ $(tune2fs_static_libraries) -LOCAL_CFLAGS += -Wno-unused-parameter +LOCAL_CFLAGS += -Wno-unused-parameter -Werror LOCAL_C_INCLUDES += system/extras/ext4_utils LOCAL_STATIC_LIBRARIES += \ libsparse_static \ -- cgit v1.2.3 From de40ba59c8e5091221752e9d7c6e072c29a7055f Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 5 Oct 2016 23:17:01 -0700 Subject: Update the header path for ext4_utils. Test: `mmma bootable/recovery` Change-Id: I70ccddb3ddf46bb012fdc5f632afc46ebdd5473e --- updater/Android.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index 507088dcd..d9fc72c8f 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -62,7 +62,6 @@ LOCAL_STATIC_LIBRARIES += \ $(tune2fs_static_libraries) LOCAL_CFLAGS += -Wno-unused-parameter -Werror -LOCAL_C_INCLUDES += system/extras/ext4_utils LOCAL_STATIC_LIBRARIES += \ libsparse_static \ libz -- cgit v1.2.3 From 0c7839ac14a00f32d740c23ddf6df65f2757ece5 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Mon, 10 Oct 2016 15:48:37 -0700 Subject: Refactor libupdater into a seperate module. So that we can write native tests for updater functions. This CL adds a testcase for getprop() function. Test: mmma bootable/recovery; Run recovery_component_test on device. Change-Id: Iff4c1ff63c5c71aded2f9686fed6b71cc298c228 --- updater/Android.mk | 111 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 44 deletions(-) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index d9fc72c8f..33e97385e 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -14,41 +14,6 @@ LOCAL_PATH := $(call my-dir) -# updater (static executable) -# =============================== -# Build a statically-linked binary to include in OTA packages. -include $(CLEAR_VARS) - -updater_src_files := \ - install.cpp \ - blockimg.cpp \ - updater.cpp - -LOCAL_CLANG := true -LOCAL_SRC_FILES := $(updater_src_files) - -LOCAL_STATIC_LIBRARIES += \ - $(TARGET_RECOVERY_UPDATER_LIBS) \ - $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS) \ - libfec \ - libfec_rs \ - libext4_utils_static \ - libsquashfs_utils \ - libcrypto_utils \ - libcrypto \ - libapplypatch \ - libotafault \ - libedify \ - libminzip \ - libmounts \ - libz \ - libbz \ - libcutils \ - liblog \ - libselinux \ - libbase \ - liblog - tune2fs_static_libraries := \ libext2_com_err \ libext2_blkid \ @@ -57,17 +22,77 @@ tune2fs_static_libraries := \ libext2_e2p \ libext2fs -LOCAL_STATIC_LIBRARIES += \ +updater_common_static_libraries := \ + libapplypatch \ + libedify \ + libminzip \ + libmounts \ + libotafault \ + libext4_utils_static \ + libfec \ + libfec_rs \ + liblog \ + libselinux \ + libsparse_static \ + libsquashfs_utils \ + libbz \ + libz \ + libbase \ + libcrypto \ + libcrypto_utils \ + libcutils \ libtune2fs \ $(tune2fs_static_libraries) -LOCAL_CFLAGS += -Wno-unused-parameter -Werror -LOCAL_STATIC_LIBRARIES += \ - libsparse_static \ - libz +# libupdater (static library) +# =============================== +include $(CLEAR_VARS) + +LOCAL_MODULE := libupdater + +LOCAL_SRC_FILES := \ + install.cpp \ + blockimg.cpp + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/.. \ + $(LOCAL_PATH)/include \ + external/e2fsprogs/misc + +LOCAL_CFLAGS := \ + -Wno-unused-parameter \ + -Werror -LOCAL_C_INCLUDES += external/e2fsprogs/misc -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. +LOCAL_EXPORT_C_INCLUDE_DIRS := \ + $(LOCAL_PATH)/include + +LOCAL_STATIC_LIBRARIES := \ + $(updater_common_static_libraries) + +include $(BUILD_STATIC_LIBRARY) + +# updater (static executable) +# =============================== +include $(CLEAR_VARS) + +LOCAL_MODULE := updater + +LOCAL_SRC_FILES := \ + updater.cpp + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/.. \ + $(LOCAL_PATH)/include + +LOCAL_CFLAGS := \ + -Wno-unused-parameter \ + -Werror + +LOCAL_STATIC_LIBRARIES := \ + libupdater \ + $(TARGET_RECOVERY_UPDATER_LIBS) \ + $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS) \ + $(updater_common_static_libraries) # Each library in TARGET_RECOVERY_UPDATER_LIBS should have a function # named "Register_()". Here we emit a little C function that @@ -108,8 +133,6 @@ LOCAL_C_INCLUDES += $(dir $(inc)) inc := inc_dep_file := -LOCAL_MODULE := updater - LOCAL_FORCE_STATIC_EXECUTABLE := true include $(BUILD_EXECUTABLE) -- cgit v1.2.3 From 8cf5c8f60f51049278b08ae4cbc31df397b651fd Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Thu, 8 Sep 2016 20:10:11 -0700 Subject: Replace minzip with libziparchive Clean up the duplicated codes that handle the zip files in bootable/recovery; and rename the library of the remaining utility functions to libotautil. Test: Update package installed successfully on angler. Bug: 19472796 Change-Id: Iea8962fcf3004473cb0322b6bb3a9ea3ca7f679e --- updater/Android.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index 33e97385e..3c1d0d41f 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -25,7 +25,9 @@ tune2fs_static_libraries := \ updater_common_static_libraries := \ libapplypatch \ libedify \ - libminzip \ + libziparchive \ + libotautil \ + libutils \ libmounts \ libotafault \ libext4_utils_static \ -- cgit v1.2.3 From bedf5fc11cea9cc6b92f37597fe8624d25b8d371 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Fri, 18 Nov 2016 12:01:26 -0800 Subject: updater: Refactor set_stage() and get_stage() functions. Add read_bootloader_message_from() and write_bootloader_message_to() to allow specifying the BCB device (/misc). Also add testcases for set_stage() and get_stage(). Test: recovery_component_test passes. Test: Build a recovery image and apply a two-step OTA package. Change-Id: If5ab06a1aaaea168d2a9e5dd63c07c0a3190e4ae --- updater/Android.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index 3c1d0d41f..5d328a3fa 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -27,12 +27,14 @@ updater_common_static_libraries := \ libedify \ libziparchive \ libotautil \ + libbootloader_message \ libutils \ libmounts \ libotafault \ libext4_utils_static \ libfec \ libfec_rs \ + libfs_mgr \ liblog \ libselinux \ libsparse_static \ -- cgit v1.2.3 From 31653660adad6aa220f1a975545042126ee83b84 Mon Sep 17 00:00:00 2001 From: Alex Deymo Date: Wed, 11 Jan 2017 14:02:13 -0800 Subject: Remove "_static" suffix from libext4_utils. Bug: 34220783 Change-Id: I34ccc3b11da0d1b48805967ad75b9ddade569930 --- updater/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index 5d328a3fa..22c73241a 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -31,7 +31,7 @@ updater_common_static_libraries := \ libutils \ libmounts \ libotafault \ - libext4_utils_static \ + libext4_utils \ libfec \ libfec_rs \ libfs_mgr \ -- cgit v1.2.3 From 67f3aa880499c1143ed9aa1e5294a912a6962f28 Mon Sep 17 00:00:00 2001 From: Alex Deymo Date: Wed, 11 Jan 2017 14:38:20 -0800 Subject: Remove "_static" suffix from libsparse Bug: 34220783 Change-Id: I358f931f0b29f5bd526e1475180e477e2e90b936 --- updater/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index 22c73241a..d8a84c248 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -37,7 +37,7 @@ updater_common_static_libraries := \ libfs_mgr \ liblog \ libselinux \ - libsparse_static \ + libsparse \ libsquashfs_utils \ libbz \ libz \ -- cgit v1.2.3 From 7c5dbd67517b4c96455617ed59628e1de0b3fcbb Mon Sep 17 00:00:00 2001 From: Alex Deymo Date: Fri, 13 Jan 2017 17:32:20 -0800 Subject: Remove '_static' suffix from libext2* references. Bug: 34220783 Test: make checkbuild Change-Id: Iceea20e440a4bb6a3b254486a65a86401a2241ef --- updater/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index d8a84c248..ac26bf42d 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -18,7 +18,7 @@ tune2fs_static_libraries := \ libext2_com_err \ libext2_blkid \ libext2_quota \ - libext2_uuid_static \ + libext2_uuid \ libext2_e2p \ libext2fs -- cgit v1.2.3 From 25c56979dd85a33a6467949ab76f99a987a0a006 Mon Sep 17 00:00:00 2001 From: Sen Jiang Date: Tue, 10 May 2016 15:23:25 -0700 Subject: Use bspatch from external/bsdiff. Now ApplyBSDiffPatch() will stream the output to sink as we go instead of sinking everything at the end. Test: recovery_host_test Bug: 26982501 Change-Id: I05b6ed40d45e4b1b19ae72784cf705b731b976e3 --- updater/Android.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index ac26bf42d..3a47dacd5 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -24,6 +24,7 @@ tune2fs_static_libraries := \ updater_common_static_libraries := \ libapplypatch \ + libbspatch \ libedify \ libziparchive \ libotautil \ -- cgit v1.2.3 From edec27a5bd08ff2779d980dc5fa7b8b7dca34fa0 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 21 Mar 2017 16:41:14 -0700 Subject: Fix updater include generation w/installclean Since this was putting the intermediate file in obj/PACKAGING, every installclean was removing it and triggering updater to rebuild. Instead, use the standard generated-sources-dir. The dep file can also be removed now that ninja will re-run the generator if the command line changes. Test: m -j updater; m installclean; m -j updater Test: Only change to aosp_fugu updater before/after is the debug info Change-Id: I20928bd2049d4a3d4e21f83fd64d16cfdc541958 --- updater/Android.mk | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'updater/Android.mk') diff --git a/updater/Android.mk b/updater/Android.mk index 3a47dacd5..a113fe86c 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -110,21 +110,11 @@ LOCAL_STATIC_LIBRARIES := \ # 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 $@ +LOCAL_MODULE_CLASS := EXECUTABLES +inc := $(call local-generated-sources-dir)/register.inc $(inc) : libs := $(TARGET_RECOVERY_UPDATER_LIBS) -$(inc) : $(inc_dep_file) +$(inc) : $(hide) mkdir -p $(dir $@) $(hide) echo "" > $@ $(hide) $(foreach lib,$(libs),echo "extern void Register_$(lib)(void);" >> $@;) @@ -132,11 +122,9 @@ $(inc) : $(inc_dep_file) $(hide) $(foreach lib,$(libs),echo " Register_$(lib)();" >> $@;) $(hide) echo "}" >> $@ -$(call intermediates-dir-for,EXECUTABLES,updater,,,$(TARGET_PREFER_32_BIT))/updater.o : $(inc) -LOCAL_C_INCLUDES += $(dir $(inc)) +LOCAL_GENERATED_SOURCES := $(inc) inc := -inc_dep_file := LOCAL_FORCE_STATIC_EXECUTABLE := true -- cgit v1.2.3