Merge "Remove unused (and currently broken) samplecode target."

am: 92f2cd55e3

Change-Id: I60b57b363cb90e782144428a9061c800f76e5190
This commit is contained in:
Sasha Smundak
2019-05-23 01:54:37 -07:00
committed by android-build-merger

View File

@@ -1825,22 +1825,6 @@ tests : host-tests target-tests
# Phony target to run all java compilations that use javac # Phony target to run all java compilations that use javac
.PHONY: javac-check .PHONY: javac-check
ifneq (,$(filter samplecode, $(MAKECMDGOALS)))
.PHONY: samplecode
sample_MODULES := $(sort $(call get-tagged-modules,samples))
sample_APKS_DEST_PATH := $(TARGET_COMMON_OUT_ROOT)/samples
sample_APKS_COLLECTION := \
$(foreach module,$(sample_MODULES),$(sample_APKS_DEST_PATH)/$(notdir $(module)))
$(foreach module,$(sample_MODULES),$(eval $(call \
copy-one-file,$(module),$(sample_APKS_DEST_PATH)/$(notdir $(module)))))
sample_ADDITIONAL_INSTALLED := \
$(filter-out $(modules_to_install) $(modules_to_check),$(sample_MODULES))
samplecode: $(sample_APKS_COLLECTION)
@echo "Collect sample code apks: $^"
# remove apks that are not intended to be installed.
rm -f $(sample_ADDITIONAL_INSTALLED)
endif # samplecode in $(MAKECMDGOALS)
.PHONY: findbugs .PHONY: findbugs
findbugs: $(INTERNAL_FINDBUGS_HTML_TARGET) $(INTERNAL_FINDBUGS_XML_TARGET) findbugs: $(INTERNAL_FINDBUGS_HTML_TARGET) $(INTERNAL_FINDBUGS_XML_TARGET)