tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolved conflicts for merge of 6c56dd64 to master

Browse source 
Change-Id: If806a737c5cc46cd4545788dfa991cdeab488213
This commit is contained in:
Ying Wang 2010-07-13 21:08:38 -07:00
commit ad8aec94fa
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/main.mk
View file

@ -696,12 +696,16 @@ droidcore: files \
$(INSTALLED_USERDATAIMAGE_TARGET) \
$(INSTALLED_FILES_FILE)
# dist_libraries only for putting your library into the dist directory with a full build.
.PHONY: dist_libraries
ifeq ($(EMMA_INSTRUMENT),true)
$(call dist-for-goals, droid, $(EMMA_META_ZIP))
endif
# 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.
@ -750,7 +754,7 @@ else # TARGET_BUILD_APPS
endif
# Building a full system-- the default is to build droidcore
droid: droidcore
droid: droidcore dist_libraries
endif # TARGET_BUILD_APPS
endif # droid in $(MAKECMDGOALS)