resolved conflicts for merge of a8df6091 to master (9f42af5b) · Commits · e / os / android_build

core/clear_vars.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,7 @@ LOCAL_CLANG:=
		LOCAL_ADDRESS_SANITIZER:=
		LOCAL_JAR_EXCLUDE_FILES:=
		LOCAL_LINT_FLAGS:=
		LOCAL_SOURCE_FILES_ALL_GENERATED:= # '',true

		# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
		# iterate over thousands of entries every time.

+6 −3

Original line number	Diff line number	Diff line
		@@ -15,8 +15,11 @@ endif #PDK

		# Make sure there's something to build.
		# It's possible to build a package that doesn't contain any classes.
		ifeq (,$(strip $(LOCAL_SRC_FILES)$(all_res_assets)$(LOCAL_STATIC_JAVA_LIBRARIES)))
		$(error $(LOCAL_PATH): Target java module does not define any source or resource files)
		# LOCAL_SOURCE_FILES_ALL_GENERATED is set only if the module does not have static source files,
		# but generated source files in its LOCAL_INTERMEDIATE_SOURCE_DIR.
		# You have to set up the dependency in some other way.
		ifeq (,$(strip $(LOCAL_SRC_FILES)$(all_res_assets)$(LOCAL_STATIC_JAVA_LIBRARIES))$(filter true,$(LOCAL_SOURCE_FILES_ALL_GENERATED)))
		$(warning $(LOCAL_PATH): Target java module does not define any source or resource files)
		endif

		LOCAL_NO_STANDARD_LIBRARIES:=$(strip $(LOCAL_NO_STANDARD_LIBRARIES))
		@@ -232,7 +235,7 @@ $(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON)
		# If the module includes java code (i.e., it's not framework-res), compile it.
		full_classes_jar :=
		built_dex :=
		ifneq (,$(strip $(all_java_sources)$(full_static_java_libs)))
		ifneq (,$(strip $(all_java_sources)$(full_static_java_libs))$(filter true,$(LOCAL_SOURCE_FILES_ALL_GENERATED)))

		# If LOCAL_BUILT_MODULE_STEM wasn't overridden by our caller,
		# full_classes_jar will be the same module as LOCAL_BUILT_MODULE.