StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a9b02f0b: resolved conflicts for merge of a6bed2f7 to gingerbread

Browse Source 
Merge commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13' into gingerbread-plus-aosp

* commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13':
  Add phony target dist_libraries
This commit is contained in:
Ying Wang
2010-07-13 19:02:25 -07:00
committed by Android Git Automerger
parent 4a1addef83 a9b02f0bfe
commit 6c56dd64b2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/main.mk
View File

@@ -700,6 +700,9 @@ ifeq ($(EMMA_INSTRUMENT),true)
$(call dist-for-goals, droid, $(EMMA_META_ZIP)) $(call dist-for-goals, droid, $(EMMA_META_ZIP))
endif endif
# dist_libraries only for putting your library into the dist directory with a full build.
.PHONY: dist_libraries
ifneq ($(TARGET_BUILD_APPS),) ifneq ($(TARGET_BUILD_APPS),)
# If this build is just for apps, only build apps and not the full system by default. # If this build is just for apps, only build apps and not the full system by default.
@@ -748,7 +751,7 @@ else # TARGET_BUILD_APPS
endif endif
# Building a full system-- the default is to build droidcore # Building a full system-- the default is to build droidcore
droid: droidcore droid: droidcore dist_libraries
endif endif