Merge changes I40fe9b79,I4b6f8331
* changes:
logd: SerializedLogBuffer: never wait for a reader during prune/clear
logd: always wake 'wrapped' readers on prune
diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp
index 04a99a3..e95efc0 100644
--- a/healthd/healthd_mode_charger.cpp
+++ b/healthd/healthd_mode_charger.cpp
@@ -693,7 +693,7 @@
InitAnimation();
- ret = CreateDisplaySurface(batt_anim_.fail_file.c_str(), &surf_unknown_);
+ ret = CreateDisplaySurface(batt_anim_.fail_file, &surf_unknown_);
if (ret < 0) {
LOGE("Cannot load custom battery_fail image. Reverting to built in: %d\n", ret);
ret = CreateDisplaySurface((system_animation_root + "charger/battery_fail.png"s).c_str(),
@@ -708,7 +708,7 @@
int scale_count;
int scale_fps; // Not in use (charger/battery_scale doesn't have FPS text
// chunk). We are using hard-coded frame.disp_time instead.
- ret = CreateMultiDisplaySurface(batt_anim_.animation_file.c_str(), &scale_count, &scale_fps,
+ ret = CreateMultiDisplaySurface(batt_anim_.animation_file, &scale_count, &scale_fps,
&scale_frames);
if (ret < 0) {
LOGE("Cannot load battery_scale image\n");
diff --git a/init/Android.mk b/init/Android.mk
index da94daf..2fbbf4a 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -119,6 +119,13 @@
# First stage init is weird: it may start without stdout/stderr, and no /proc.
LOCAL_NOSANITIZE := hwaddress
include $(BUILD_EXECUTABLE)
+
+# LOCAL_FORCE_STATIC_EXECUTABLE targets are skipped and not defined for ASAN builds
+init_vendor_deps :=
+ifneq (true,$(my_skip_this_target))
+ init_vendor_deps += init_first_stage
+endif # my_skip_this_target is true
+
endif
include $(CLEAR_VARS)
@@ -133,8 +140,7 @@
LOCAL_MODULE := init_vendor
ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
-LOCAL_REQUIRED_MODULES := \
- init_first_stage \
-
+LOCAL_REQUIRED_MODULES := $(init_vendor_deps)
endif
include $(BUILD_PHONY_PACKAGE)
+init_vendor_deps :=