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

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

Merge "Allow to call dist-for-goals multiple times for the same file" into jb-mr2-dev

parents d8eb27bf 534fcd76

core/Makefile

+2 −6
Original line number Diff line number Diff line
@@ -760,12 +760,8 @@ $(INSTALLED_FILES_FILE): $(FULL_SYSTEMIMAGE_DEPS) 


.PHONY: installed-file-list

installed-file-list: $(INSTALLED_FILES_FILE)

ifneq ($(filter sdk win_sdk,$(MAKECMDGOALS)),)

$(call dist-for-goals, sdk win_sdk, $(INSTALLED_FILES_FILE))

endif

ifneq ($(filter sdk_addon,$(MAKECMDGOALS)),)

$(call dist-for-goals, sdk_addon, $(INSTALLED_FILES_FILE))

endif



$(call dist-for-goals, sdk win_sdk sdk_addon, $(INSTALLED_FILES_FILE))



systemimage_intermediates := \

    $(call intermediates-dir-for,PACKAGING,systemimage)

core/distdir.mk

+12 −8
Original line number Diff line number Diff line
@@ -41,6 +41,11 @@ $(2): $(1) 
	$$(copy-file-to-new-target-with-cp)

endef



# A global variable to remember all dist'ed src:dst pairs.

# So if a src:dst is already dist'ed by another goal,

# we should just establish the dependency and don't really call the

# copy-one-dist-file to avoid multiple rules for the same target.

_all_dist_src_dst_pairs :=

# Other parts of the system should use this function to associate

# certain files with certain goals.  When those goals are built

# and "dist" is specified, the marked files will be copied to DIST_DIR.
@@ -56,12 +61,11 @@ $(foreach file,$(2), \ 
  $(eval src := $(word 1,$(fw))) \

  $(eval dst := $(word 2,$(fw))) \

  $(eval dst := $(if $(dst),$(dst),$(notdir $(src)))) \

  $(eval \

      $(call copy-one-dist-file, \

          $(src), \

          $(DIST_DIR)/$(dst), \

	  $(1) \

       ) \

  $(if $(filter $(_all_dist_src_dst_pairs),$(src):$(dst)),\

    $(eval $(call add-dependency,$(1),$(DIST_DIR)/$(dst))),\

    $(eval $(call copy-one-dist-file,\

      $(src),$(DIST_DIR)/$(dst),$(1)))\

      $(eval _all_dist_src_dst_pairs += $(src):$(dst))\

  )\

)

endef

core/main.mk

+0 −8
Original line number Diff line number Diff line
@@ -779,9 +779,6 @@ droidcore: files \ 
# dist_files only for putting your library into the dist directory with a full build.

.PHONY: dist_files



# Dist for droid if droid is among the cmd goals, or no cmd goal is given.

ifneq ($(filter droid,$(MAKECMDGOALS))$(filter ||,|$(filter-out $(INTERNAL_MODIFIER_TARGETS),$(MAKECMDGOALS))|),)



ifneq ($(TARGET_BUILD_APPS),)

  # If this build is just for apps, only build apps and not the full system by default.
@@ -840,9 +837,6 @@ else # TARGET_BUILD_APPS 
droid: droidcore dist_files



endif # TARGET_BUILD_APPS

endif # droid in $(MAKECMDGOALS)



.PHONY: droid



.PHONY: docs

docs: $(ALL_DOCS)
@@ -850,13 +844,11 @@ docs: $(ALL_DOCS) 
.PHONY: sdk

ALL_SDK_TARGETS := $(INTERNAL_SDK_TARGET)

sdk: $(ALL_SDK_TARGETS)

ifneq ($(filter sdk win_sdk,$(MAKECMDGOALS)),)

$(call dist-for-goals,sdk win_sdk, \

    $(ALL_SDK_TARGETS) \

    $(SYMBOLS_ZIP) \

    $(INSTALLED_BUILD_PROP_TARGET) \

)

endif



# umbrella targets to assit engineers in verifying builds

.PHONY: java native target host java-host java-target native-host native-target \