From 3cd669fd5d5317c21d75159d9caabffeb2d1f963 Mon Sep 17 00:00:00 2001 From: Adrien Grassein Date: Thu, 6 Nov 2014 14:53:50 +0100 Subject: Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined The cryptfs.h files is always included, but its path is only included when TARGET_USERIMAGES_USE_EXT4 is defined. Change-Id: Iec6aa4601a56a1feac456a21a53a08557dc1d00d --- Android.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 1a91f0029..4eb18aae8 100644 --- a/Android.mk +++ b/Android.mk @@ -54,6 +54,8 @@ RECOVERY_FSTAB_VERSION := 2 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) LOCAL_CFLAGS += -Wno-unused-parameter +LOCAL_C_INCLUDES += system/vold + LOCAL_STATIC_LIBRARIES := \ libext4_utils_static \ libsparse_static \ @@ -75,7 +77,7 @@ LOCAL_STATIC_LIBRARIES := \ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) LOCAL_CFLAGS += -DUSE_EXT4 - LOCAL_C_INCLUDES += system/extras/ext4_utils system/vold + LOCAL_C_INCLUDES += system/extras/ext4_utils LOCAL_STATIC_LIBRARIES += libext4_utils_static libz endif -- cgit v1.2.3 From a01ce3a229aa5d696a282be13d693c7597cfba2f Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 24 Nov 2014 23:32:33 -0800 Subject: Start losing code to libadb. Bug: 17626262 Change-Id: I8ce7cff2b7789f39f35a4211d7120d072c05a863 --- Android.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 1a91f0029..b55bb4e60 100644 --- a/Android.mk +++ b/Android.mk @@ -62,6 +62,7 @@ LOCAL_STATIC_LIBRARIES := \ libmtdutils \ libmincrypt \ libminadbd \ + libadb \ libfusesideload \ libminui \ libpng \ -- cgit v1.2.3 From 6ed899a9b6798f841595253549d740b446fe24fc Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Thu, 22 Jan 2015 16:38:12 -0800 Subject: Remove superfluous OpenSSL include paths. This include path was needed because system/vold/cryptfs.h included an OpenSSL header just to get the length of a SHA-256 hash. This has been fixed in https://android-review.googlesource.com/#/c/124477/1. Change-Id: I06a8ba0ee5b9efcc3260598f07d9819f065711de --- Android.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 1a91f0029..45aa22ddd 100644 --- a/Android.mk +++ b/Android.mk @@ -92,7 +92,6 @@ else endif LOCAL_C_INCLUDES += system/extras/ext4_utils -LOCAL_C_INCLUDES += external/openssl/include include $(BUILD_EXECUTABLE) -- cgit v1.2.3 From 8f1bfead3f77f16ac3e85ef1d5e0008e52848e79 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 25 Nov 2014 10:55:50 -0800 Subject: Lose USB transport code to libadb. Bug: 17626262 Change-Id: If41031ba20a3a75fa510f155c654a482b47e409d --- Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index e360c6b22..0cb0836cd 100644 --- a/Android.mk +++ b/Android.mk @@ -64,7 +64,7 @@ LOCAL_STATIC_LIBRARIES := \ libmtdutils \ libmincrypt \ libminadbd \ - libadb \ + libadbd \ libfusesideload \ libminui \ libpng \ -- cgit v1.2.3 From 1ddd35050417b79307c5e0a989ee39d6ce2bfc1b Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Wed, 18 Feb 2015 15:58:15 -0800 Subject: Use headers from adb. adb.h has diverged a bit, so that one will be more involved, but these three are all trivial, unimportant changes. Change-Id: Ief8474c1c2927d7e955adf04f887c76ab37077a6 --- Android.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 0cb0836cd..b8ef63e99 100644 --- a/Android.mk +++ b/Android.mk @@ -54,7 +54,10 @@ RECOVERY_FSTAB_VERSION := 2 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) LOCAL_CFLAGS += -Wno-unused-parameter -LOCAL_C_INCLUDES += system/vold +LOCAL_C_INCLUDES += \ + system/vold \ + system/extras/ext4_utils \ + system/core/adb \ LOCAL_STATIC_LIBRARIES := \ libext4_utils_static \ @@ -94,8 +97,6 @@ else LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UI_LIB) endif -LOCAL_C_INCLUDES += system/extras/ext4_utils - include $(BUILD_EXECUTABLE) # All the APIs for testing -- cgit v1.2.3 From f3a5726919ce35d3f5e628e9561496470195ac1f Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 19 Feb 2015 13:21:14 -0800 Subject: Kill of most of the remainder of minadbd. I think everything left now is here to stay (services.c might get massaged in to libadbd if it gets refactored). Bug: 17626262 Change-Id: I01faf8b277a601a40e3a0f4c3b8206c97f1d2ce6 --- Android.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index b8ef63e99..9fd3f866a 100644 --- a/Android.mk +++ b/Android.mk @@ -67,7 +67,6 @@ LOCAL_STATIC_LIBRARIES := \ libmtdutils \ libmincrypt \ libminadbd \ - libadbd \ libfusesideload \ libminui \ libpng \ -- cgit v1.2.3 From 5a50b1bce574f9a6b786f7139ca576fcdedb467b Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 10 Mar 2015 11:56:56 -0700 Subject: Install the recovery binary directly to the recovery image. This eliminated the previous hack, that doesn't work reliably with the "LOCAL_REQUIRED_MODULES := mkfs.f2fs". Bug: 19666886 Change-Id: I1f0a2d41129f402c0165f3b86b6fda077291f282 --- Android.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 9fd3f866a..dd1e96e7a 100644 --- a/Android.mk +++ b/Android.mk @@ -84,11 +84,7 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) LOCAL_STATIC_LIBRARIES += libext4_utils_static libz endif -# This binary is in the recovery ramdisk, which is otherwise a copy of root. -# It gets copied there in config/Makefile. LOCAL_MODULE_TAGS suppresses -# a (redundant) copy of the binary in /system/bin for user builds. -# TODO: Build the ramdisk image in a more principled way. -LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin ifeq ($(TARGET_RECOVERY_UI_LIB),) LOCAL_SRC_FILES += default_device.cpp -- cgit v1.2.3 From 9e7ae8a62652258f3ecbf147b578b73286f6d4d8 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 9 Apr 2015 13:40:31 -0700 Subject: Move default implementations into Device. The current abstract class was a nice idea but has led to a lot of copy & paste in practice. Right now, no one we know of has any extra menu items, so let's make the default menu available to everyone. (If we assume that someone somewhere really does need custom device-specific menu options, a better API would let them add to our menu rather than replacing it.) Change-Id: I59f6a92f3ecd830c2ce78ce9da19eaaf472c5dfa --- Android.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index dd1e96e7a..a567aa5a2 100644 --- a/Android.mk +++ b/Android.mk @@ -30,16 +30,17 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - recovery.cpp \ + adb_install.cpp \ + asn1_decoder.cpp \ bootloader.cpp \ + device.cpp \ + fuse_sdcard_provider.c \ install.cpp \ + recovery.cpp \ roots.cpp \ - ui.cpp \ screen_ui.cpp \ - asn1_decoder.cpp \ + ui.cpp \ verifier.cpp \ - adb_install.cpp \ - fuse_sdcard_provider.c LOCAL_MODULE := recovery -- cgit v1.2.3 From ec28340cf3af1029a00db1c83d78d14e8798e245 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 10 Apr 2015 10:01:53 -0700 Subject: Move "Mount /system" to the main menu. Everyone's adding secret key combinations for this anyway, and it's very useful when debugging. Change-Id: Iad549452b872a7af963dd649f283ebcd3ea24234 --- Android.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index a567aa5a2..a34c2659d 100644 --- a/Android.mk +++ b/Android.mk @@ -107,7 +107,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := verifier_test LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_MODULE_TAGS := tests -LOCAL_CFLAGS += -DNO_RECOVERY_MOUNT LOCAL_CFLAGS += -Wno-unused-parameter LOCAL_SRC_FILES := \ verifier_test.cpp \ -- cgit v1.2.3 From 8fd86d77f1a2f15c6fa95bc390bcbe646374873a Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 13 Apr 2015 14:36:02 -0700 Subject: Move the menu header out of the menu. This makes it easier for us to deal with arbitrary information at the top, and means that headers added by specific commands don't overwrite the default ones. Add the fingerprint back, but broken up so it fits even on sprout's display. Change-Id: Id71da79ab1aa455a611d72756a3100a97ceb4c1c --- Android.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index a34c2659d..0484065a1 100644 --- a/Android.mk +++ b/Android.mk @@ -72,6 +72,7 @@ LOCAL_STATIC_LIBRARIES := \ libminui \ libpng \ libfs_mgr \ + libbase \ libcutils \ liblog \ libselinux \ -- cgit v1.2.3