Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ace2368 authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Load only the current product config makefile."

parents da0311a2 157a5e16

core/base_rules.mk

+0 −3
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ endif 
#$(shell rm -f tag-list.csv)

#tag-list-first-time := false

#endif

#comma := ,

#empty :=

#space := $(empty) $(empty)

#$(shell echo $(lastword $(filter-out config/% out/%,$(MAKEFILE_LIST))),$(LOCAL_MODULE),$(strip $(LOCAL_MODULE_CLASS)),$(subst $(space),$(comma),$(sort $(LOCAL_MODULE_TAGS))) >> tag-list.csv)



LOCAL_UNINSTALLABLE_MODULE := $(strip $(LOCAL_UNINSTALLABLE_MODULE))

core/config.mk

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@ else 
SHELL := /bin/bash

endif



# Utility variables.

empty :=

space := $(empty) $(empty)

comma := ,



# Tell python not to spam the source tree with .pyc files.  This

# only has an effect on python 2.6 and above.

export PYTHONDONTWRITEBYTECODE := 1

core/definitions.mk

+0 −4
Original line number Diff line number Diff line
@@ -569,10 +569,6 @@ endef 
###########################################################

## Convert "a b c" into "a:b:c"

###########################################################



empty :=

space := $(empty) $(empty)



define normalize-path-list

$(subst $(space),:,$(strip $(1)))

endef

core/droiddoc.mk

+0 −2
Original line number Diff line number Diff line
@@ -85,8 +85,6 @@ full_java_libs += $(addprefix $(LOCAL_PATH)/,$(LOCAL_STATIC_JAVA_LIBRARIES)) $(L 
full_java_lib_deps += $(addprefix $(LOCAL_PATH)/,$(LOCAL_STATIC_JAVA_LIBRARIES)) $(LOCAL_CLASSPATH)

endif



empty :=

space := $(empty) $(empty)

$(full_target): PRIVATE_CLASSPATH := $(subst $(space),:,$(full_java_libs))



endif # !LOCAL_IS_HOST_MODULE

core/node_fns.mk

+0 −2
Original line number Diff line number Diff line
@@ -94,8 +94,6 @@ endef 
# - Replace "|||" with spaces, breaking haystack back into

#   individual words.

#

empty :=

space := $(empty) $(empty)

define uniq-word

$(strip \

  $(if $(filter-out 0 1,$(words $(filter $(2),$(1)))), \