Merge "Remove support for building Windows modules in Make" (9a3ef57d) · Commits · e / os / android_build

Changes.md

+5 −0

Original line number	Diff line number	Diff line
		# Build System Changes for Android.mk Writers

		## Windows cross-compiles no longer supported in Android.mk

		Modules that build for Windows (our only `HOST_CROSS` OS currently) must now be
		defined in `Android.bp` files.

		## `LOCAL_MODULE_TAGS := eng debug` deprecation {#LOCAL_MODULE_TAGS}

		`LOCAL_MODULE_TAGS` value `eng` and `debug` are being deprecated. They allowed

core/binary.mk

+10 −19

Original line number	Diff line number	Diff line
		@@ -290,13 +290,11 @@ my_ldlibs := $(filter $(my_allowed_ldlibs),$(my_ldlibs))
		else # LOCAL_IS_HOST_MODULE
		# Add -ldl, -lpthread, -lm and -lrt to host builds to match the default behavior of
		# device builds
		ifneq ($($(my_prefix)OS),windows)
		my_ldlibs += -ldl -lpthread -lm
		ifneq ($(HOST_OS),darwin)
		my_ldlibs += -lrt
		endif
		endif
		endif

		ifneq ($(LOCAL_SDK_VERSION),)
		my_all_ndk_libraries := \
		@@ -315,7 +313,6 @@ endif
		# all code is position independent, and then those warnings get promoted to
		# errors.
		ifneq ($(LOCAL_NO_PIC),true)
		ifneq ($($(my_prefix)OS),windows)
		ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
		my_cflags += -fPIE
		ifndef BUILD_HOST_static
		@@ -327,7 +324,6 @@ ifneq ($(LOCAL_NO_PIC),true)
		my_cflags += -fPIC
		endif
		endif
		endif

		ifdef LOCAL_IS_HOST_MODULE
		my_src_files += $(LOCAL_SRC_FILES_$($(my_prefix)OS)) $(LOCAL_SRC_FILES_$($(my_prefix)OS)_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
		@@ -430,11 +426,6 @@ endif

		include $(BUILD_SYSTEM)/config_sanitizers.mk

		# Statically link libwinpthread when cross compiling win32.
		ifeq ($($(my_prefix)OS),windows)
		my_static_libraries += libwinpthread
		endif

		ifneq ($(filter ../%,$(my_src_files)),)
		my_soong_problems += dotdot_srcs
		endif

core/clang/HOST_CROSS_x86.mk

deleted100644 → 0

+0 −2

Original line number	Diff line number	Diff line
		$(clang_2nd_arch_prefix)HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i386.a
		$(clang_2nd_arch_prefix)HOST_CROSS_LIBCRT_BUILTINS := $(LLVM_RTLIB_PATH)/libclang_rt.bulitins-i386.a

core/clang/HOST_CROSS_x86_64.mk

deleted100644 → 0

+0 −2

$(clang_2nd_arch_prefix)HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-x86_64.a

$(clang_2nd_arch_prefix)HOST_CROSS_LIBCRT_BUILTINS := $(LLVM_RTLIB_PATH)/libclang_rt.builtins-x86_64.a

core/clang/config.mk

+0 −9

Original line number	Diff line number	Diff line
		@@ -44,15 +44,6 @@ clang_2nd_arch_prefix := $(HOST_2ND_ARCH_VAR_PREFIX)
		include $(BUILD_SYSTEM)/clang/HOST_$(HOST_2ND_ARCH).mk
		endif

		ifdef HOST_CROSS_ARCH
		clang_2nd_arch_prefix :=
		include $(BUILD_SYSTEM)/clang/HOST_CROSS_$(HOST_CROSS_ARCH).mk
		ifdef HOST_CROSS_2ND_ARCH
		clang_2nd_arch_prefix := $(HOST_CROSS_2ND_ARCH_VAR_PREFIX)
		include $(BUILD_SYSTEM)/clang/HOST_CROSS_$(HOST_CROSS_2ND_ARCH).mk
		endif
		endif

		# TARGET config
		clang_2nd_arch_prefix :=
		include $(BUILD_SYSTEM)/clang/TARGET_$(TARGET_ARCH).mk