Fix up logd make file rules
logd, the init.recovery.logd.rc, and other related files were
included by default if your device configs specified
TARGET_USES_LOGD := true which would be the case for any device
that has a full ROM tree instead of a minimal TWRP tree.
Change-Id: Ia1e55703631f0f22beab2f4d4479599b88539e1a
diff --git a/Android.mk b/Android.mk
index 0fb934d..2a91c09 100644
--- a/Android.mk
+++ b/Android.mk
@@ -425,11 +425,11 @@
ifneq ($(TW_EXCLUDE_DEFAULT_USB_INIT), true)
LOCAL_ADDITIONAL_DEPENDENCIES += init.recovery.usb.rc
endif
-ifeq ($(TARGET_USES_LOGD), true)
- LOCAL_ADDITIONAL_DEPENDENCIES += logd libsysutils libnl init.recovery.logd.rc
-endif
ifeq ($(TWRP_INCLUDE_LOGCAT), true)
LOCAL_ADDITIONAL_DEPENDENCIES += logcat
+ ifeq ($(TARGET_USES_LOGD), true)
+ LOCAL_ADDITIONAL_DEPENDENCIES += logd libsysutils libnl init.recovery.logd.rc
+ endif
endif
# Allow devices to specify device-specific recovery dependencies
ifneq ($(TARGET_RECOVERY_DEVICE_MODULES),)
diff --git a/etc/Android.mk b/etc/Android.mk
index ac6f813..5e612b6 100644
--- a/etc/Android.mk
+++ b/etc/Android.mk
@@ -31,19 +31,20 @@
endif
-ifeq ($(TARGET_USES_LOGD), true)
+ifeq ($(TWRP_INCLUDE_LOGCAT), true)
+ ifeq ($(TARGET_USES_LOGD), true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := init.recovery.logd.rc
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
+ include $(CLEAR_VARS)
+ LOCAL_MODULE := init.recovery.logd.rc
+ LOCAL_MODULE_TAGS := eng
+ LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
-# Cannot send to TARGET_RECOVERY_ROOT_OUT since build system wipes init*.rc
-# during ramdisk creation and only allows init.recovery.*.rc files to be copied
-# from TARGET_ROOT_OUT thereafter
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+ # Cannot send to TARGET_RECOVERY_ROOT_OUT since build system wipes init*.rc
+ # during ramdisk creation and only allows init.recovery.*.rc files to be copied
+ # from TARGET_ROOT_OUT thereafter
+ LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
+ LOCAL_SRC_FILES := $(LOCAL_MODULE)
+ include $(BUILD_PREBUILT)
+ endif
endif
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 949e359..4476701 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -216,13 +216,13 @@
RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/sgdisk
endif
endif
-ifeq ($(TARGET_USES_LOGD), true)
- RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/logd
- RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libsysutils.so
- RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libnl.so
-endif
ifeq ($(TWRP_INCLUDE_LOGCAT), true)
RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/logcat
+ ifeq ($(TARGET_USES_LOGD), true)
+ RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/logd
+ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libsysutils.so
+ RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libnl.so
+ endif
endif
TWRP_AUTOGEN := $(intermediates)/teamwin
diff --git a/scripts/relink-binaries.sh b/scripts/relink-binaries.sh
old mode 100644
new mode 100755