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

resolved conflicts for merge of a6bed2f7 to gingerbread

Browse Source 
Change-Id: Ic9efcc70af22f15a1bb136f70a30db59dc629e03
This commit is contained in:
Ying Wang
2010-07-13 18:59:56 -07:00
parent 90b1d3dcfe a6bed2f723
commit a9b02f0bfe
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

@@ -696,6 +696,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.
@@ -744,7 +747,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