Merge "Remove FORCE from gpl_source.tgz" am: 1c0112f556

am: d86e80e04e

Change-Id: I01ffeaea6b47f95d0e385e5a0bfb0332056c97a7
This commit is contained in:
Colin Cross 2017-11-18 00:48:32 +00:00 committed by android-build-merger
commit 311c3bb80e
1 changed files with 10 additions and 8 deletions

View File

@ -12,20 +12,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
gpl_source_tgz := $(call intermediates-dir-for,PACKAGING,gpl_source,HOST,COMMON)/gpl_source.tgz
ifdef dist_goal
# The rule below doesn't have dependenices on the files that it copies,
# so manually generate directly into the DIST_DIR directory that is always
# wiped between dist builds.
gpl_source_tgz := $(DIST_DIR)/gpl_source.tgz
# FORCE since we can't know whether any of the sources changed
$(gpl_source_tgz): PRIVATE_PATHS := $(sort $(patsubst %/, %, $(dir $(ALL_GPL_MODULE_LICENSE_FILES))))
$(gpl_source_tgz) : $(ALL_GPL_MODULE_LICENSE_FILES) FORCE
$(gpl_source_tgz) : $(ALL_GPL_MODULE_LICENSE_FILES)
@echo Package gpl sources: $@
@rm -rf $(dir $@) && mkdir -p $(dir $@)
$(hide) tar cfz $@ --exclude ".git*" $(PRIVATE_PATHS)
.PHONY: gpl_source_tgz
gpl_source_tgz : $(gpl_source_tgz)
# Dist the tgz only if we are doing a full build
ifeq (,$(TARGET_BUILD_APPS))
$(call dist-for-goals, droidcore, $(gpl_source_tgz))
droidcore: $(gpl_source_tgz)
endif
endif # dist_goal