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

* commit '332bbced6d075eccdf54b00d4178afc59db6f096':
  Conditionally include the 'samplecode' rules.
This commit is contained in:
Ying Wang 2014-02-26 20:15:01 +00:00 committed by Android Git Automerger
commit 557282dbc4
1 changed files with 2 additions and 0 deletions

View File

@ -1011,6 +1011,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
@ -1024,6 +1025,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)