From 914d8d4cff10f023ccd382fb43b2c7833dd34f72 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 18 Oct 2012 11:28:56 -0700 Subject: [PATCH] Make bionic's dependency on the tzdata explicit. Also stop building the obsolete three files, now bionic and libcore both use the new single file. Bug: 7012465 Change-Id: I1b9b49af7382c57b6cb8820c2275e6d4044b2bb6 --- libc/Android.mk | 1 + libc/zoneinfo/Android.mk | 68 ---------------------------------------- 2 files changed, 1 insertion(+), 68 deletions(-) diff --git a/libc/Android.mk b/libc/Android.mk index cd44f238e..e4947704b 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -878,6 +878,7 @@ endif LOCAL_MODULE:= libc LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_REQUIRED_MODULES := tzdata # WARNING: The only library libc.so should depend on is libdl.so! If you add other libraries, # make sure to add -Wl,--exclude-libs=libgcc.a to the LOCAL_LDFLAGS for those libraries. This diff --git a/libc/zoneinfo/Android.mk b/libc/zoneinfo/Android.mk index e3bc8ea75..fe5099de7 100644 --- a/libc/zoneinfo/Android.mk +++ b/libc/zoneinfo/Android.mk @@ -1,36 +1,5 @@ LOCAL_PATH:= $(call my-dir) -############################################ -include $(CLEAR_VARS) -LOCAL_MODULE := zoneinfo.dat -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/zoneinfo -include $(BUILD_PREBUILT) - -############################################ -include $(CLEAR_VARS) -LOCAL_MODULE := zoneinfo.idx -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/zoneinfo -include $(BUILD_PREBUILT) - -############################################ -include $(CLEAR_VARS) -LOCAL_MODULE := zoneinfo.version -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/zoneinfo -include $(BUILD_PREBUILT) - -############################################ include $(CLEAR_VARS) LOCAL_MODULE := tzdata LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -43,43 +12,6 @@ include $(BUILD_PREBUILT) # The host build doesn't use bionic, but it does use bionic's zoneinfo data ifeq ($(WITH_HOST_DALVIK),true) -############################################ -include $(CLEAR_VARS) -LOCAL_MODULE := zoneinfo-host.dat -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_IS_HOST_MODULE := true -LOCAL_SRC_FILES := zoneinfo.dat -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_STEM := $(LOCAL_SRC_FILES) -LOCAL_MODULE_PATH := $(HOST_OUT)/usr/share/zoneinfo -include $(BUILD_PREBUILT) - -############################################ -include $(CLEAR_VARS) -LOCAL_MODULE := zoneinfo-host.idx -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_IS_HOST_MODULE := true -LOCAL_SRC_FILES := zoneinfo.idx -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_STEM := $(LOCAL_SRC_FILES) -LOCAL_MODULE_PATH := $(HOST_OUT)/usr/share/zoneinfo -include $(BUILD_PREBUILT) - -############################################ -include $(CLEAR_VARS) -LOCAL_MODULE := zoneinfo-host.version -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_IS_HOST_MODULE := true -LOCAL_SRC_FILES := zoneinfo.version -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_STEM := $(LOCAL_SRC_FILES) -LOCAL_MODULE_PATH := $(HOST_OUT)/usr/share/zoneinfo -include $(BUILD_PREBUILT) - -############################################ include $(CLEAR_VARS) LOCAL_MODULE := tzdata-host LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk