Merge "Revert "Add soong_cc_prebuilt.mk"" (be2ae162) · Commits · e / os / android_build

core/base_rules.mk

+0 −5

Original line number	Diff line number	Diff line
		@@ -328,11 +328,7 @@ LOCAL_INTERMEDIATE_TARGETS += $(LOCAL_BUILT_MODULE)
		# As .KATI_RESTAT is specified to .toc files and commit-change-for-toc is used,
		# dependent binaries of a .toc file will be rebuilt only when the content of
		# the .toc file is changed.
		#
		# Don't create .toc files for Soong shared libraries, that is handled in
		# Soong and soong_cc_prebuilt.mk
		###########################################################
		ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
		ifeq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES)
		LOCAL_INTERMEDIATE_TARGETS += $(LOCAL_BUILT_MODULE).toc
		$(LOCAL_BUILT_MODULE).toc: $(LOCAL_BUILT_MODULE)
		@@ -349,7 +345,6 @@ $(eval $(call copy-one-file,$(LOCAL_BUILT_MODULE).toc,$(OVERRIDE_BUILT_MODULE_PA
		$(OVERRIDE_BUILT_MODULE_PATH)/$(my_built_module_stem).toc: $(OVERRIDE_BUILT_MODULE_PATH)/$(my_built_module_stem)
		endif
		endif
		endif

		###########################################################
		## logtags: Add .logtags files to global list

core/binary.mk

+52 −29

Original line number	Diff line number	Diff line
		@@ -372,7 +372,10 @@ my_static_libraries := $(LOCAL_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_V
		my_whole_static_libraries := $(LOCAL_WHOLE_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_WHOLE_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_whole_static_libraries)
		my_header_libraries := $(LOCAL_HEADER_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_HEADER_LIBRARIES_$(my_32_64_bit_suffix)) $(my_header_libraries)

		# soong defined modules already have done through this
		ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
		include $(BUILD_SYSTEM)/cxx_stl_setup.mk
		endif

		# Add static HAL libraries
		ifdef LOCAL_HAL_STATIC_LIBRARIES
		@@ -389,6 +392,8 @@ else
		my_linker := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)LINKER)
		endif

		# Modules from soong do not need this since the dependencies are already handled there.
		ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
		include $(BUILD_SYSTEM)/config_sanitizers.mk

		ifneq ($(LOCAL_NO_LIBCOMPILER_RT),true)
		@@ -402,6 +407,7 @@ endif
		ifeq ($($(my_prefix)OS),windows)
		my_static_libraries += libwinpthread
		endif
		endif # this module is not from soong

		ifneq ($(filter ../%,$(my_src_files)),)
		my_soong_problems += dotdot_srcs
		@@ -1264,6 +1270,9 @@ ifneq ($(LOCAL_USE_VNDK),)
		## switch all soong libraries over to the /vendor
		## variant.
		####################################################
		ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
		# We don't do this renaming for soong-defined modules since they already have correct
		# names (with .vendor suffix when necessary) in their LOCAL_*_LIBRARIES.
		my_whole_static_libraries := $(foreach l,$(my_whole_static_libraries),\
		$(if $(SPLIT_VENDOR.STATIC_LIBRARIES.$(l)),$(l).vendor,$(l)))
		my_static_libraries := $(foreach l,$(my_static_libraries),\
		@@ -1275,13 +1284,16 @@ ifneq ($(LOCAL_USE_VNDK),)
		my_header_libraries := $(foreach l,$(my_header_libraries),\
		$(if $(SPLIT_VENDOR.HEADER_LIBRARIES.$(l)),$(l).vendor,$(l)))
		endif
		endif

		# Platform can use vendor public libraries. If a required shared lib is one of
		# the vendor public libraries, the lib is switched to the stub version of the lib.
		ifeq ($(LOCAL_USE_VNDK),)
		ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
		my_shared_libraries := $(foreach l,$(my_shared_libraries),\
		$(if $(filter $(l),$(VENDOR_PUBLIC_LIBRARIES)),$(l).vendorpublic,$(l)))
		endif
		endif

		##########################################################
		## Set up installed module dependency
		@@ -1601,6 +1613,8 @@ ifeq ($(my_strict),true)
		endif

		# Check if -Werror or -Wno-error is used in C compiler flags.
		# Modules defined in $(SOONG_ANDROID_MK) are checked in soong's cc.go.
		ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
		# Header libraries do not need cflags.
		ifneq (HEADER_LIBRARIES,$(LOCAL_MODULE_CLASS))
		# Prebuilt modules do not need cflags.
		@@ -1623,6 +1637,7 @@ ifneq (HEADER_LIBRARIES,$(LOCAL_MODULE_CLASS))
		endif
		endif
		endif
		endif

		# Disable clang-tidy if it is not found.
		ifeq ($(PATH_TO_CLANG_TIDY),)
		@@ -1749,6 +1764,12 @@ all_libraries := \
		###########################################################
		export_includes := $(intermediates)/export_includes
		export_cflags := $(foreach d,$(my_export_c_include_dirs),-I $(d))
		# Soong exports cflags instead of include dirs, so that -isystem can be included.
		ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
		export_cflags += $(LOCAL_EXPORT_CFLAGS)
		else ifdef LOCAL_EXPORT_CFLAGS
		$(call pretty-error,LOCAL_EXPORT_CFLAGS can only be used by Soong, use LOCAL_EXPORT_C_INCLUDE_DIRS instead)
		endif
		$(export_includes): PRIVATE_EXPORT_CFLAGS := $(export_cflags)
		# Headers exported by whole static libraries are also exported by this library.
		export_include_deps := $(strip \
		@@ -1793,6 +1814,7 @@ export_cflags :=
		# Make sure export_includes gets generated when you are running mm/mmm
		$(LOCAL_BUILT_MODULE) : \| $(export_includes)

		ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
		ifneq (,$(filter-out $(LOCAL_PATH)/%,$(my_export_c_include_dirs)))
		my_soong_problems += non_local__export_c_include_dirs
		endif
		@@ -1808,6 +1830,7 @@ SOONG_CONV.$(LOCAL_MODULE).DEPS := \
		$(my_system_shared_libraries))
		SOONG_CONV.$(LOCAL_MODULE).TYPE := native
		SOONG_CONV := $(SOONG_CONV) $(LOCAL_MODULE)
		endif

		###########################################################
		# Coverage packaging.

core/clear_vars.mk

+3 −8

Original line number	Diff line number	Diff line
		@@ -3,7 +3,6 @@
		###########################################################

		# '',true
		LOCAL_2ND_ARCH_VAR_PREFIX:=
		LOCAL_32_BIT_ONLY:=
		LOCAL_AAPT2_ONLY:=
		LOCAL_AAPT_FLAGS:=
		@@ -67,16 +66,13 @@ LOCAL_DONT_DELETE_JAR_META_INF:=
		LOCAL_DONT_MERGE_MANIFESTS:=
		LOCAL_DPI_FILE_STEM:=
		LOCAL_DPI_VARIANTS:=
		LOCAL_DROIDDOC_ANNOTATIONS_ZIP :=
		LOCAL_DROIDDOC_ASSET_DIR:=
		LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=
		LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=
		LOCAL_DROIDDOC_DOC_ZIP :=
		LOCAL_DROIDDOC_HTML_DIR:=
		LOCAL_DROIDDOC_OPTIONS:=
		LOCAL_DROIDDOC_SOURCE_PATH:=
		LOCAL_DROIDDOC_STUB_OUT_DIR:=
		LOCAL_DROIDDOC_STUBS_SRCJAR :=
		LOCAL_DROIDDOC_TEMPLATE_DIR:=
		LOCAL_DROIDDOC_USE_STANDARD_DOCLET:=
		LOCAL_DX_FLAGS:=
		@@ -111,7 +107,6 @@ LOCAL_GROUP_STATIC_LIBRARIES:=
		LOCAL_GTEST:=true
		LOCAL_HAL_STATIC_LIBRARIES:=
		LOCAL_HEADER_LIBRARIES:=
		LOCAL_HOST_PREFIX:=
		LOCAL_HOST_REQUIRED_MODULES:=
		LOCAL_INIT_RC:=
		LOCAL_INSTALLED_MODULE:=
		@@ -257,13 +252,13 @@ LOCAL_SOONG_DEX_JAR :=
		LOCAL_SOONG_EXPORT_PROGUARD_FLAGS :=
		LOCAL_SOONG_HEADER_JAR :=
		LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=
		LOCAL_SOONG_LINK_TYPE :=
		LOCAL_SOONG_PROGUARD_DICT :=
		LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=
		LOCAL_SOONG_RRO_DIRS :=
		LOCAL_SOONG_STATIC_LIBRARY_EXTRA_PACKAGES :=
		LOCAL_SOONG_TOC :=
		LOCAL_SOONG_UNSTRIPPED_BINARY :=
		LOCAL_DROIDDOC_STUBS_SRCJAR :=
		LOCAL_DROIDDOC_DOC_ZIP :=
		LOCAL_DROIDDOC_ANNOTATIONS_ZIP :=
		# '',true
		LOCAL_SOURCE_FILES_ALL_GENERATED:=
		LOCAL_SRC_FILES:=

core/header_library_internal.mk

+10 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,16 @@ ifneq ($(strip $(LOCAL_MODULE_STEM)$(LOCAL_BUILT_MODULE_STEM)),)
		$(error $(LOCAL_PATH): Cannot set module stem for a library)
		endif

		ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
		ifdef LOCAL_USE_VNDK
		name_without_suffix := $(patsubst %.vendor,%,$(LOCAL_MODULE))
		ifneq ($(name_without_suffix),$(LOCAL_MODULE))
		SPLIT_VENDOR.$(LOCAL_MODULE_CLASS).$(name_without_suffix) := 1
		endif
		name_without_suffix :=
		endif
		endif

		include $(BUILD_SYSTEM)/binary.mk

		ifneq ($(strip $(all_objects)),)

core/prebuilt_internal.mk

+24 −2

Original line number	Diff line number	Diff line
		@@ -68,6 +68,20 @@ else
		prebuilt_module_is_a_library :=
		endif

		ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
		ifeq ($(prebuilt_module_is_a_library),true)
		SOONG_ALREADY_CONV := $(SOONG_ALREADY_CONV) $(LOCAL_MODULE)
		endif

		ifdef LOCAL_USE_VNDK
		name_without_suffix := $(patsubst %.vendor,%,$(LOCAL_MODULE))
		ifneq ($(name_without_suffix),$(LOCAL_MODULE)
		SPLIT_VENDOR.$(LOCAL_MODULE_CLASS).$(name_without_suffix) := 1
		endif
		name_without_suffix :=
		endif
		endif

		# Don't install static libraries by default.
		ifndef LOCAL_UNINSTALLABLE_MODULE
		ifeq (STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS))
		@@ -142,6 +156,12 @@ else # my_strip_module not true
		ifdef prebuilt_module_is_a_library
		export_includes := $(intermediates)/export_includes
		export_cflags := $(foreach d,$(LOCAL_EXPORT_C_INCLUDE_DIRS),-I $(d))
		# Soong exports cflags instead of include dirs, so that -isystem can be included.
		ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
		export_cflags += $(LOCAL_EXPORT_CFLAGS)
		else ifdef LOCAL_EXPORT_CFLAGS
		$(call pretty-error,LOCAL_EXPORT_CFLAGS can only be used by Soong, use LOCAL_EXPORT_C_INCLUDE_DIRS instead)
		endif
		$(export_includes): PRIVATE_EXPORT_CFLAGS := $(export_cflags)
		$(export_includes): $(LOCAL_EXPORT_C_INCLUDE_DEPS)
		@echo Export includes file: $< -- $@
		@@ -190,9 +210,11 @@ my_shared_libraries := $(LOCAL_SHARED_LIBRARIES)
		# Extra shared libraries introduced by LOCAL_CXX_STL.
		include $(BUILD_SYSTEM)/cxx_stl_setup.mk
		ifdef LOCAL_USE_VNDK
		ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
		my_shared_libraries := $(foreach l,$(my_shared_libraries),\
		$(if $(SPLIT_VENDOR.SHARED_LIBRARIES.$(l)),$(l).vendor,$(l)))
		endif
		endif
		$(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += \
		$(my_register_name):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(my_shared_libraries))