Merge "Remove ancient ranlib workaround on Mac OS X." (42a3e879) · Commits · e / os / android_build

core/combo/HOST_darwin-x86.mk

+1 −7

Original line number	Diff line number	Diff line
		@@ -56,12 +56,6 @@ $(combo_2nd_arch_prefix)HOST_JNILIB_SUFFIX := .jnilib
		$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += \
		-include $(call select-android-config-h,darwin-x86)

		ifneq ($(filter 10.7 10.7.% 10.8 10.8.%, $(build_mac_version)),)
		$(combo_2nd_arch_prefix)HOST_RUN_RANLIB_AFTER_COPYING := false
		else
		$(combo_2nd_arch_prefix)HOST_RUN_RANLIB_AFTER_COPYING := true
		PRE_LION_DYNAMIC_LINKER_OPTIONS := -Wl,-dynamic
		endif
		$(combo_2nd_arch_prefix)HOST_GLOBAL_ARFLAGS := cqs

		############################################################
		@@ -91,7 +85,7 @@ define transform-host-o-to-executable-inner
		$(hide) $(PRIVATE_CXX) \
		-Wl,-rpath,@loader_path/../$(notdir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)) \
		-o $@ \
		$(PRE_LION_DYNAMIC_LINKER_OPTIONS) -Wl,-headerpad_max_install_names \
		-Wl,-headerpad_max_install_names \
		$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_LD_DIRS) \
		$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
		$(PRIVATE_HOST_GLOBAL_LDFLAGS) \

+0 −5

Original line number	Diff line number	Diff line
		@@ -55,11 +55,6 @@ HOST_JNILIB_SUFFIX := .jnilib
		HOST_GLOBAL_CFLAGS += \
		-include $(call select-android-config-h,darwin-x86)

		ifneq ($(filter 10.7 10.7.% 10.8 10.8.%, $(build_mac_version)),)
		HOST_RUN_RANLIB_AFTER_COPYING := false
		else
		HOST_RUN_RANLIB_AFTER_COPYING := true
		endif
		HOST_GLOBAL_ARFLAGS := cqs

		# We Reuse the following functions with the same name from HOST_darwin-x86.mk:

+0 −26

Original line number	Diff line number	Diff line
		@@ -2091,32 +2091,6 @@ $(foreach t,$(1),\
		$(hide) mkdir -p $(dir $(3)/$(s)); cp -Rf $(t) $(3)/$(s)$(newline))
		endef

		###########################################################
		## On some platforms (MacOS), after copying a static
		## library, ranlib must be run to update an internal
		## timestamp!?!?!
		###########################################################

		ifeq ($(HOST_RUN_RANLIB_AFTER_COPYING),true)
		define transform-host-ranlib-copy-hack
		$(hide) ranlib $@ \|\| true
		endef
		else
		define transform-host-ranlib-copy-hack
		@true
		endef
		endif

		ifeq ($(TARGET_RUN_RANLIB_AFTER_COPYING),true)
		define transform-ranlib-copy-hack
		$(hide) ranlib $@
		endef
		else
		define transform-ranlib-copy-hack
		@true
		endef
		endif


		###########################################################
		## Commands to call Proguard

+0 −7

Original line number	Diff line number	Diff line
		@@ -256,13 +256,6 @@ $(built_module) : $(my_prebuilt_src_file)
		else
		$(built_module) : $(my_prebuilt_src_file) \| $(ACP)
		$(transform-prebuilt-to-target)
		ifneq ($(prebuilt_module_is_a_library),)
		ifneq ($(LOCAL_IS_HOST_MODULE),)
		$(transform-host-ranlib-copy-hack)
		else
		$(transform-ranlib-copy-hack)
		endif
		endif
		endif
		endif # LOCAL_MODULE_CLASS != APPS