From d428e791393399d85bfddf76f6a69814264d6a1c Mon Sep 17 00:00:00 2001 From: Jerry Zhang Date: Thu, 13 Jul 2017 18:17:35 -0700 Subject: Add libasyncio. libadbd_usb depends on libasyncio. Bug: 37916658 Test: Use adb in recovery on bullhead/marlin Change-Id: I77ac3bb2a580d29551e7b5c471bc3cfbf1a3219d --- Android.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index dc066dd48..c35dabc2d 100644 --- a/Android.mk +++ b/Android.mk @@ -127,6 +127,7 @@ LOCAL_STATIC_LIBRARIES := \ libmounts \ libz \ libminadbd \ + libasyncio \ libfusesideload \ libminui \ libpng \ -- cgit v1.2.3 From ded2dac082fd703f1cd7a5c3de59450cd3dc2530 Mon Sep 17 00:00:00 2001 From: Jin Qian Date: Fri, 21 Apr 2017 14:36:12 -0700 Subject: recovery: replace make_ext4 with e2fsprogs Execute mke2fs to create empty ext4 filesystem. Execute e2fsdroid to add files to filesystem. Test: enter recovery mode and wipe data Bug: 35219933 Change-Id: I10a9f4c1f4754ad864b2df45b1f879180ab33876 (cherry picked from commit ac31808cd37cfb98755e5821dbb2efb5fe5cb12a) --- Android.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index dc066dd48..3eed7a696 100644 --- a/Android.mk +++ b/Android.mk @@ -85,9 +85,11 @@ LOCAL_MODULE := recovery LOCAL_FORCE_STATIC_EXECUTABLE := true +LOCAL_REQUIRED_MODULES := e2fsdroid_static mke2fs_static mke2fs.conf + ifeq ($(TARGET_USERIMAGES_USE_F2FS),true) ifeq ($(HOST_OS),linux) -LOCAL_REQUIRED_MODULES := mkfs.f2fs +LOCAL_REQUIRED_MODULES += mkfs.f2fs endif endif @@ -120,6 +122,7 @@ LOCAL_STATIC_LIBRARIES := \ libverifier \ libbatterymonitor \ libbootloader_message \ + libfs_mgr \ libext4_utils \ libsparse \ libziparchive \ @@ -130,7 +133,6 @@ LOCAL_STATIC_LIBRARIES := \ libfusesideload \ libminui \ libpng \ - libfs_mgr \ libcrypto_utils \ libcrypto \ libvintf_recovery \ @@ -159,7 +161,7 @@ else endif ifeq ($(BOARD_CACHEIMAGE_PARTITION_SIZE),) -LOCAL_REQUIRED_MODULES := recovery-persist recovery-refresh +LOCAL_REQUIRED_MODULES += recovery-persist recovery-refresh endif include $(BUILD_EXECUTABLE) -- cgit v1.2.3 From 5f8dd9951d986b65d98d6a9ea38003427e9e46df Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Fri, 28 Jul 2017 00:05:40 -0700 Subject: ui: Move the support for touch inputs into RecoveryUI. - Added detection for EV_ABS events in minui/events.cpp, if it's allowed; - Added listening and processing touch inputs in ui.cpp; - Fixed an issue in recognizing swipe with multi-touch protocol A; - Changed the logic in RecoveryUI::ProcessKey() to be swipe-aware. It now allows turning on text mode with + . The last change also fixed an issue on devices with protocol A: prior to this CL, user may accidentally toggle the text mode during an OTA. Because it was considered as a single-button device, a long tap that sent BTN_TOUCH event would turn on text mode. Test: Allow detecting touch inputs. Swiping (up, down, enter) works on angler, angelfish, dorado respectively. Bug: 36169090 Change-Id: I4bc882b99114ce4ab414f8bdb8f4f7a525b8a8fd --- Android.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 3eed7a696..967b9dfbe 100644 --- a/Android.mk +++ b/Android.mk @@ -108,6 +108,18 @@ else LOCAL_CFLAGS += -DRECOVERY_UI_MARGIN_WIDTH=0 endif +ifneq ($(TARGET_RECOVERY_UI_TOUCH_LOW_THRESHOLD),) +LOCAL_CFLAGS += -DRECOVERY_UI_TOUCH_LOW_THRESHOLD=$(TARGET_RECOVERY_UI_TOUCH_LOW_THRESHOLD) +else +LOCAL_CFLAGS += -DRECOVERY_UI_TOUCH_LOW_THRESHOLD=50 +endif + +ifneq ($(TARGET_RECOVERY_UI_TOUCH_HIGH_THRESHOLD),) +LOCAL_CFLAGS += -DRECOVERY_UI_TOUCH_HIGH_THRESHOLD=$(TARGET_RECOVERY_UI_TOUCH_HIGH_THRESHOLD) +else +LOCAL_CFLAGS += -DRECOVERY_UI_TOUCH_HIGH_THRESHOLD=90 +endif + ifneq ($(TARGET_RECOVERY_UI_VR_STEREO_OFFSET),) LOCAL_CFLAGS += -DRECOVERY_UI_VR_STEREO_OFFSET=$(TARGET_RECOVERY_UI_VR_STEREO_OFFSET) else -- cgit v1.2.3 From 0470ceea381775b09eee931858c3320be88cc637 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 2 Aug 2017 17:11:04 -0700 Subject: Allow customizing WearRecoveryUI via Makefile variables. With the following Makefile variables, we can reduce the work of writing (copy/pasting) device-specific WearRecoveryUI classes. The list of Makefile variables (the ones useful for Wear devices): - TARGET_RECOVERY_UI_MARGIN_HEIGHT (default: 0) - TARGET_RECOVERY_UI_MARGIN_WIDTH (default: 0) Specify the margin space that we don't want to display texts. They replace the former outer_width and outer_height. - TARGET_RECOVERY_UI_TOUCH_LOW_THRESHOLD (default: 50) - TARGET_RECOVERY_UI_TOUCH_HIGH_THRESHOLD (default: 90) Specify the sensitivity of recognizing a swipe. Devices give absolute positions, so for some devices we need to adjust the thresholds. - TARGET_RECOVERY_UI_PROGRESS_BAR_BASELINE Specify the progress bar vertical position, which should be adjusted to the actual height of a device. It replaces the former progress_bar_y. - TARGET_RECOVERY_UI_ANIMATION_FPS (default: 30) Specify the animation FPS if using device-specific animation images. It replaces the former animation_fps. Devices can specify "TARGET_RECOVERY_UI_LIB := librecovery_ui_wear", with optionally defined Makefile vars above, in BoardConfig.mk to customize their WearRecoveryUI. Also remove the obsolete wear_touch.{cpp,h}, which has been merged into ui.cpp in commit 5f8dd9951d986b65d98d6a9ea38003427e9e46df. Bug: 64307776 Test: Change the device BoardConfig.mk and test recovery image. Change-Id: Id0fb2d4e3977ab5ddd31e71f9535470cab70e41b --- Android.mk | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 967b9dfbe..b1ee2440b 100644 --- a/Android.mk +++ b/Android.mk @@ -79,7 +79,6 @@ LOCAL_SRC_FILES := \ ui.cpp \ vr_ui.cpp \ wear_ui.cpp \ - wear_touch.cpp \ LOCAL_MODULE := recovery @@ -120,6 +119,18 @@ else LOCAL_CFLAGS += -DRECOVERY_UI_TOUCH_HIGH_THRESHOLD=90 endif +ifneq ($(TARGET_RECOVERY_UI_PROGRESS_BAR_BASELINE),) +LOCAL_CFLAGS += -DRECOVERY_UI_PROGRESS_BAR_BASELINE=$(TARGET_RECOVERY_UI_PROGRESS_BAR_BASELINE) +else +LOCAL_CFLAGS += -DRECOVERY_UI_PROGRESS_BAR_BASELINE=259 +endif + +ifneq ($(TARGET_RECOVERY_UI_ANIMATION_FPS),) +LOCAL_CFLAGS += -DRECOVERY_UI_ANIMATION_FPS=$(TARGET_RECOVERY_UI_ANIMATION_FPS) +else +LOCAL_CFLAGS += -DRECOVERY_UI_ANIMATION_FPS=30 +endif + ifneq ($(TARGET_RECOVERY_UI_VR_STEREO_OFFSET),) LOCAL_CFLAGS += -DRECOVERY_UI_VR_STEREO_OFFSET=$(TARGET_RECOVERY_UI_VR_STEREO_OFFSET) else @@ -216,6 +227,16 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_CFLAGS := -Werror include $(BUILD_STATIC_LIBRARY) +# Wear default device +# =============================== +include $(CLEAR_VARS) +LOCAL_SRC_FILES := wear_device.cpp + +# Should match TARGET_RECOVERY_UI_LIB in BoardConfig.mk. +LOCAL_MODULE := librecovery_ui_wear + +include $(BUILD_STATIC_LIBRARY) + # vr headset default device # =============================== include $(CLEAR_VARS) -- cgit v1.2.3 From eea3af3f911d36ac1a82a9fb95d24912cc07e3b1 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Fri, 11 Aug 2017 13:50:24 -0700 Subject: wear_ui: Expose menu_unusable_rows via Makefile var. This variable is useful on small screens (e.g. on watches) to handle long menus. We should have better way to handle this value smartly. Prior to that, expose the value to be overridable by using the generic wearable UI module (librecovery_ui_wear). Bug: 64307776 Test: Define the variable, build and boot into recovery image and check the UI menu. Change-Id: I5d7a6baa8bb4cc852bfcc2a7b3cc9686c1c8817e --- Android.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index b1ee2440b..776e6ea19 100644 --- a/Android.mk +++ b/Android.mk @@ -131,6 +131,12 @@ else LOCAL_CFLAGS += -DRECOVERY_UI_ANIMATION_FPS=30 endif +ifneq ($(TARGET_RECOVERY_UI_MENU_UNUSABLE_ROWS),) +LOCAL_CFLAGS += -DRECOVERY_UI_MENU_UNUSABLE_ROWS=$(TARGET_RECOVERY_UI_MENU_UNUSABLE_ROWS) +else +LOCAL_CFLAGS += -DRECOVERY_UI_MENU_UNUSABLE_ROWS=9 +endif + ifneq ($(TARGET_RECOVERY_UI_VR_STEREO_OFFSET),) LOCAL_CFLAGS += -DRECOVERY_UI_VR_STEREO_OFFSET=$(TARGET_RECOVERY_UI_VR_STEREO_OFFSET) else -- cgit v1.2.3 From c89d1e7e2a6a8a07bb336db35db88f5452d8a51d Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Mon, 28 Aug 2017 14:15:07 -0700 Subject: Turn on -Wall for recovery modules Turn on -Wall for all modules. Also remove the obsolete file_cmp() in apply_patch test and now() in wear_ui. The only exception is lib_edify due to the unused functions in the intermediate cpp files generated from the lex files. It will be handled in a seperate CL. Bug: 64939312 Test: mma, unit tests pass Change-Id: Ic53f76b60b6401ab20db3d98130d674c08e3702f --- Android.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 776e6ea19..b8e5837ef 100644 --- a/Android.mk +++ b/Android.mk @@ -93,7 +93,7 @@ endif endif LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) -LOCAL_CFLAGS += -Wno-unused-parameter -Werror +LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Werror ifneq ($(TARGET_RECOVERY_UI_MARGIN_HEIGHT),) LOCAL_CFLAGS += -DRECOVERY_UI_MARGIN_HEIGHT=$(TARGET_RECOVERY_UI_MARGIN_HEIGHT) @@ -203,7 +203,7 @@ LOCAL_SRC_FILES := \ rotate_logs.cpp LOCAL_MODULE := recovery-persist LOCAL_SHARED_LIBRARIES := liblog libbase -LOCAL_CFLAGS := -Werror +LOCAL_CFLAGS := -Wall -Werror LOCAL_INIT_RC := recovery-persist.rc include $(BUILD_EXECUTABLE) @@ -215,7 +215,7 @@ LOCAL_SRC_FILES := \ rotate_logs.cpp LOCAL_MODULE := recovery-refresh LOCAL_SHARED_LIBRARIES := liblog libbase -LOCAL_CFLAGS := -Werror +LOCAL_CFLAGS := -Wall -Werror LOCAL_INIT_RC := recovery-refresh.rc include $(BUILD_EXECUTABLE) @@ -230,13 +230,14 @@ LOCAL_STATIC_LIBRARIES := \ libcrypto_utils \ libcrypto \ libbase -LOCAL_CFLAGS := -Werror +LOCAL_CFLAGS := -Wall -Werror include $(BUILD_STATIC_LIBRARY) # Wear default device # =============================== include $(CLEAR_VARS) LOCAL_SRC_FILES := wear_device.cpp +LOCAL_CFLAGS := -Wall -Werror # Should match TARGET_RECOVERY_UI_LIB in BoardConfig.mk. LOCAL_MODULE := librecovery_ui_wear @@ -248,6 +249,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := vr_device.cpp +LOCAL_CFLAGS := -Wall -Werror # should match TARGET_RECOVERY_UI_LIB set in BoardConfig.mk LOCAL_MODULE := librecovery_ui_vr -- cgit v1.2.3 From a26e32d2a366c8319944b2ac887a175a870f034d Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 28 Sep 2017 18:46:19 -0700 Subject: otafault: Move to soong. Test: mmma bootable/recovery Change-Id: I5f2520ea457ba66743aa3aa1d5b3b488a93084a3 --- Android.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 801141249..c55771fbe 100644 --- a/Android.mk +++ b/Android.mk @@ -263,7 +263,6 @@ include \ $(LOCAL_PATH)/edify/Android.mk \ $(LOCAL_PATH)/minadbd/Android.mk \ $(LOCAL_PATH)/minui/Android.mk \ - $(LOCAL_PATH)/otafault/Android.mk \ $(LOCAL_PATH)/tests/Android.mk \ $(LOCAL_PATH)/tools/Android.mk \ $(LOCAL_PATH)/uncrypt/Android.mk \ -- cgit v1.2.3 From cfe53c2c018eaac7991faa98b144543c8fcd174d Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Tue, 3 Oct 2017 14:37:21 -0700 Subject: otautil: Export headers. Test: mmma bootable/recovery Change-Id: Ic01b68e2a394d578fc9fc09da2dabe9061b98122 --- Android.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index c55771fbe..ac72bac01 100644 --- a/Android.mk +++ b/Android.mk @@ -56,6 +56,7 @@ endif LOCAL_MODULE := librecovery LOCAL_STATIC_LIBRARIES := \ libminui \ + libotautil \ libvintf_recovery \ libcrypto_utils \ libcrypto \ -- cgit v1.2.3 From e6f7f95d3493b47514a6104e11d206a455a6433e Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 4 Oct 2017 09:33:01 -0700 Subject: edify: Export the header and move to Soong. Also make matching changes to applypatch modules which include edify/expr.h. Test: mmma bootable/recovery Change-Id: Ia72be3caa010d7f56a70add2da345e631b306378 --- Android.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index ac72bac01..b40e23dc4 100644 --- a/Android.mk +++ b/Android.mk @@ -261,7 +261,6 @@ include $(BUILD_STATIC_LIBRARY) include \ $(LOCAL_PATH)/applypatch/Android.mk \ $(LOCAL_PATH)/boot_control/Android.mk \ - $(LOCAL_PATH)/edify/Android.mk \ $(LOCAL_PATH)/minadbd/Android.mk \ $(LOCAL_PATH)/minui/Android.mk \ $(LOCAL_PATH)/tests/Android.mk \ -- cgit v1.2.3 From 09e468f84cc245fba61d69165b4af8f1ec4cdfd5 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Fri, 29 Sep 2017 14:39:33 -0700 Subject: Move rangeset.h and print_sha1.h into otautil. Also drop the "bootable/recovery" path in LOCAL_C_INCLUDES from applypatch modules. Test: lunch aosp_{angler,bullhead,fugu,dragon,sailfish}-userdebug; mmma bootable/recovery Change-Id: Idd602a796894f971ee4f8fa3eafe36c42d9de986 --- Android.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index b40e23dc4..5fe37fd60 100644 --- a/Android.mk +++ b/Android.mk @@ -229,6 +229,7 @@ LOCAL_SRC_FILES := \ asn1_decoder.cpp \ verifier.cpp LOCAL_STATIC_LIBRARIES := \ + libotautil \ libcrypto_utils \ libcrypto \ libbase -- cgit v1.2.3 From 582b67850fc9ea9819ea28047b341d4e31c89ca7 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 5 Oct 2017 09:06:21 -0700 Subject: applypatch: Move to Soong. Test: mmma bootable/recovery Change-Id: Ie163aff1c4c2b3b15bb705825779ada6bc38ad67 --- Android.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 5fe37fd60..04b1625bf 100644 --- a/Android.mk +++ b/Android.mk @@ -260,7 +260,6 @@ LOCAL_MODULE := librecovery_ui_vr include $(BUILD_STATIC_LIBRARY) include \ - $(LOCAL_PATH)/applypatch/Android.mk \ $(LOCAL_PATH)/boot_control/Android.mk \ $(LOCAL_PATH)/minadbd/Android.mk \ $(LOCAL_PATH)/minui/Android.mk \ -- cgit v1.2.3 From 99f0d9e52bdbe314d77300f883d66e4470d4a5ee Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 13 Oct 2016 12:46:38 -0700 Subject: Drop -Wno-unused-parameter. The only one left is libedify. Will handle that in a separate CL. Test: mmma bootable/recovery Change-Id: I732a5f85229da90fd767bee2e46c5c95f529c396 --- Android.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 5fe37fd60..132c6fe4a 100644 --- a/Android.mk +++ b/Android.mk @@ -94,7 +94,7 @@ endif endif LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) -LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Werror +LOCAL_CFLAGS += -Wall -Werror ifneq ($(TARGET_RECOVERY_UI_MARGIN_HEIGHT),) LOCAL_CFLAGS += -DRECOVERY_UI_MARGIN_HEIGHT=$(TARGET_RECOVERY_UI_MARGIN_HEIGHT) @@ -173,9 +173,7 @@ LOCAL_STATIC_LIBRARIES := \ libcutils \ libutils \ liblog \ - libselinux \ - libm \ - libc + libselinux LOCAL_HAL_STATIC_LIBRARIES := libhealthd -- cgit v1.2.3 From 000148dbc9921ab94c2b6bfc1843710a28c0a9ab Mon Sep 17 00:00:00 2001 From: Jin Qian Date: Fri, 3 Nov 2017 11:52:33 -0700 Subject: recovery: fix library dependency After removing some deadcode from libext4_utils, libz is optimized out by linker. However, it's still required by libvintf. Moving libz down the list fixed the build. Bug: 64395169 Change-Id: I23ecd70c83af83a219faced59d8227dc3c4e43d5 --- Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 7e34c10f9..985131b02 100644 --- a/Android.mk +++ b/Android.mk @@ -158,7 +158,6 @@ LOCAL_STATIC_LIBRARIES := \ libziparchive \ libotautil \ libmounts \ - libz \ libminadbd \ libasyncio \ libfusesideload \ @@ -173,7 +172,8 @@ LOCAL_STATIC_LIBRARIES := \ libcutils \ libutils \ liblog \ - libselinux + libselinux \ + libz LOCAL_HAL_STATIC_LIBRARIES := libhealthd -- cgit v1.2.3 From a2a68a522e7601233a01787d01f1591e9efaa550 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Fri, 29 Sep 2017 14:06:20 -0700 Subject: uncrypt: Move to Soong. Test: mmma -j bootable/recovery Change-Id: I405f2a70f51904c02c49a287c23cbc115a4c5132 --- Android.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 985131b02..d9966b7cc 100644 --- a/Android.mk +++ b/Android.mk @@ -263,6 +263,5 @@ include \ $(LOCAL_PATH)/minui/Android.mk \ $(LOCAL_PATH)/tests/Android.mk \ $(LOCAL_PATH)/tools/Android.mk \ - $(LOCAL_PATH)/uncrypt/Android.mk \ $(LOCAL_PATH)/updater/Android.mk \ $(LOCAL_PATH)/update_verifier/Android.mk \ -- cgit v1.2.3 From e8e4c40246a8c15208b70b4467a0d1790c7ce8fb Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Wed, 8 Nov 2017 14:56:03 -0800 Subject: is_battery_ok use health 2.0 HAL Test: call is_battery_ok in graphics test, and test manually Bug: 69268160 Bug: 63702641 Change-Id: Ifcf4d2e2cb459689c11fc5d1b880bb053aaae8ae --- Android.mk | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index d9966b7cc..50627b9b9 100644 --- a/Android.mk +++ b/Android.mk @@ -147,10 +147,21 @@ endif LOCAL_C_INCLUDES += \ system/vold \ +# Health HAL dependency LOCAL_STATIC_LIBRARIES := \ + android.hardware.health@2.0-impl \ + android.hardware.health@2.0 \ + android.hardware.health@1.0 \ + android.hardware.health@1.0-convert \ + libhidltransport \ + libhidlbase \ + libhwbinder \ + libvndksupport \ + libbatterymonitor + +LOCAL_STATIC_LIBRARIES += \ librecovery \ libverifier \ - libbatterymonitor \ libbootloader_message \ libfs_mgr \ libext4_utils \ @@ -169,8 +180,8 @@ LOCAL_STATIC_LIBRARIES := \ libvintf \ libtinyxml2 \ libbase \ - libcutils \ libutils \ + libcutils \ liblog \ libselinux \ libz -- cgit v1.2.3 From c1c7311b8ada7fce948afaabe91d72f4a7c0cb68 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Tue, 28 Nov 2017 19:48:05 -0800 Subject: add sload.f2fs for recovery format Change-Id: Iddfe54b2b36f2d531925cbe61c98dbfb4903c0d1 Signed-off-by: Jaegeuk Kim --- Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index d9966b7cc..2f57db344 100644 --- a/Android.mk +++ b/Android.mk @@ -89,7 +89,7 @@ LOCAL_REQUIRED_MODULES := e2fsdroid_static mke2fs_static mke2fs.conf ifeq ($(TARGET_USERIMAGES_USE_F2FS),true) ifeq ($(HOST_OS),linux) -LOCAL_REQUIRED_MODULES += mkfs.f2fs +LOCAL_REQUIRED_MODULES += sload.f2fs mkfs.f2fs endif endif -- cgit v1.2.3 From bd84bd438aa8bee6ed975af962a4d8abe0a5ce57 Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Wed, 10 Jan 2018 16:18:42 -0800 Subject: Statically link with libhealthstoragedefault This is to add empty implementations of Health HAL methods to report storage info. Bug: 68388678 Test: vts-tradefed run vts -m VtsHalHealthV2_0 Change-Id: I4f093903f485519e16f39384f5c96fcd031438ba --- Android.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 54f405466..199cee7ec 100644 --- a/Android.mk +++ b/Android.mk @@ -153,6 +153,7 @@ LOCAL_STATIC_LIBRARIES := \ android.hardware.health@2.0 \ android.hardware.health@1.0 \ android.hardware.health@1.0-convert \ + libhealthstoragedefault \ libhidltransport \ libhidlbase \ libhwbinder \ -- cgit v1.2.3 From 91b48f9161a918e4af6233af7fa842b9af0a6bac Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Tue, 6 Mar 2018 17:59:58 -0800 Subject: recovery: add libhidl-gen-utils depedency introduced as a depedency to libvintf. Test: builds Bug: 73556059 Change-Id: Ia51ba81ef462879481dcacb80d9ea9ea35e8b0bb Merged-In: Ia51ba81ef462879481dcacb80d9ea9ea35e8b0bb --- Android.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 199cee7ec..461ad9449 100644 --- a/Android.mk +++ b/Android.mk @@ -179,6 +179,7 @@ LOCAL_STATIC_LIBRARIES += \ libcrypto \ libvintf_recovery \ libvintf \ + libhidl-gen-utils \ libtinyxml2 \ libbase \ libutils \ -- cgit v1.2.3 From 10b3faa10db9ea1af66f2ae8ecdf9225f882f7f6 Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Tue, 3 Apr 2018 12:45:45 -0700 Subject: Use non-LTO variant of libhwbinder ... as a workaround for build system does not currently infer non-LTO usage from Android.mk. Test: m Bug: 77320844 Change-Id: I6e9954b895051cc20408a30d0761e164e4c5bfd9 --- Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 461ad9449..4f7ced268 100644 --- a/Android.mk +++ b/Android.mk @@ -156,7 +156,7 @@ LOCAL_STATIC_LIBRARIES := \ libhealthstoragedefault \ libhidltransport \ libhidlbase \ - libhwbinder \ + libhwbinder_nolto \ libvndksupport \ libbatterymonitor -- cgit v1.2.3 From 2ca4a403e72e9b602d8ff656b405266c3b24a16e Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Mon, 9 Apr 2018 10:38:24 -0700 Subject: Use the non-LTO, non-PGO version of libhwbinder Bug: http://b/77320844 Android.mk doesn't have support for PGO either. This causes linker error (about missing __llvm_profile symbols) in the PGO-instrumentation enabled builds in the release branch. Test: m ANDROID_PGO_INSTRUMENT=ALL Change-Id: Ib5dfdea88073bd95da2cd02e92c85bfffcca80d6 --- Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 4f7ced268..7e0ad122e 100644 --- a/Android.mk +++ b/Android.mk @@ -156,7 +156,7 @@ LOCAL_STATIC_LIBRARIES := \ libhealthstoragedefault \ libhidltransport \ libhidlbase \ - libhwbinder_nolto \ + libhwbinder_noltopgo \ libvndksupport \ libbatterymonitor -- cgit v1.2.3