am a8d273d3: am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."

* commit 'a8d273d3ce1d062c55dd936ab17792c7494643ca':
  Conditionally include the 'samplecode' rules.
This commit is contained in:
Ying Wang 2014-02-26 20:11:56 +00:00 committed by Android Git Automerger
commit 332bbced6d

View file

@ -1004,6 +1004,7 @@ target-native-tests : native-target-tests
.PHONY: lintall
ifneq (,$(filter samplecode, $(MAKECMDGOALS)))
.PHONY: samplecode
sample_MODULES := $(sort $(call get-tagged-modules,samples))
sample_APKS_DEST_PATH := $(TARGET_COMMON_OUT_ROOT)/samples
@ -1017,6 +1018,7 @@ 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
findbugs: $(INTERNAL_FINDBUGS_HTML_TARGET) $(INTERNAL_FINDBUGS_XML_TARGET)