commit 2f7afe1e463a6875e58a5975ab547dbac181f789
author Captain Throwback <captainthrowback@hotmail.com> Sat Jan 30 11:46:11 2021 -0500
committer Captain Throwback <captainthrowback@hotmail.com> Thu Feb 04 20:37:09 2021 -0500
tree 62880920065fc3b4679a0de2a8e33aa854a60317
parent aaedfa81aff93713581066b1f7c57b1337541e34

tzdata: add to TWRP build automatically

Fixes "__bionic_open_tzdata" errors in recovery log

Use "TW_EXCLUDE_TZDATA := true" flag to exclude from build
if needed for space reasons. Will automatically be excluded
is "TW_OEM_BUILD := true" flag is present

Change-Id: I2f4a0f3a354a32c2f4f9733b3e88beedc4773020

Android.mk

diff --git a/Android.mk b/Android.mk
index 08080ae..f5821cc 100755
--- a/Android.mk
+++ b/Android.mk
@@ -176,6 +176,7 @@
     BOARD_HAS_NO_REAL_SDCARD := true
     TW_USE_TOOLBOX := true
     TW_EXCLUDE_MTP := true
+    TW_EXCLUDE_TZDATA := true
 endif
 
 ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
@@ -525,6 +526,9 @@
         endif
     endif
 endif
+ifneq ($(TW_EXCLUDE_TZDATA), true)
+    TWRP_REQUIRED_MODULES += tzdata_twrp
+endif
 # Allow devices to specify device-specific recovery dependencies
 ifneq ($(TARGET_RECOVERY_DEVICE_MODULES),)
     TWRP_REQUIRED_MODULES += $(TARGET_RECOVERY_DEVICE_MODULES)

prebuilt/Android.mk

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index e27f6cd..0cdf5c2 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -600,3 +600,25 @@
         $(error magiskboot prebuilts not present; exiting)
     endif
 endif
+
+# Include tzdata in TWRP to fix "__bionic_open_tzdata" log spam
+# Dummy file to apply post-install patch
+ifneq ($(TW_EXCLUDE_TZDATA), true)
+    include $(CLEAR_VARS)
+    LOCAL_MODULE := tzdata_twrp
+    LOCAL_MODULE_TAGS := optional
+    LOCAL_MODULE_CLASS := ETC
+    LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/sbin
+    LOCAL_REQUIRED_MODULES := tzdata
+
+    ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
+        LOCAL_POST_INSTALL_CMD += \
+            mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/usr/share/zoneinfo; \
+            cp -f $(TARGET_OUT)/usr/share/zoneinfo/tzdata $(TARGET_RECOVERY_ROOT_OUT)/system_root/system/usr/share/zoneinfo/;
+    else
+        LOCAL_POST_INSTALL_CMD += \
+            mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/usr/share/zoneinfo; \
+            cp -f $(TARGET_OUT)/usr/share/zoneinfo/tzdata $(TARGET_RECOVERY_ROOT_OUT)/system/usr/share/zoneinfo/;
+    endif
+    include $(BUILD_PHONY_PACKAGE)
+endif