commit a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13
author Ying Wang <wangying@google.com> Tue Jul 13 18:59:56 2010 -0700
committer Ying Wang <wangying@google.com> Tue Jul 13 18:59:56 2010 -0700
tree c4331554c53e7aa848167ead929215b067aa98f9
parent 90b1d3dcfece8eef53277cbcf0326deda9f16f09
parent a6bed2f723cce6e684102890b4e6cb224412a1ce

resolved conflicts for merge of a6bed2f7 to gingerbread

Change-Id: Ic9efcc70af22f15a1bb136f70a30db59dc629e03

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 8c9393e..cb3bbd2 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -696,6 +696,9 @@
   $(call dist-for-goals, droid, $(EMMA_META_ZIP))
 endif
 
+# dist_libraries only for putting your library into the dist directory with a full build.
+.PHONY: dist_libraries
+
 ifneq ($(TARGET_BUILD_APPS),)
   # If this build is just for apps, only build apps and not the full system by default.
 
@@ -744,7 +747,7 @@
   endif
 
 # Building a full system-- the default is to build droidcore
-droid: droidcore
+droid: droidcore dist_libraries
 
 endif