am a9b02f0b: resolved conflicts for merge of a6bed2f7 to gingerbread
Merge commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13' into gingerbread-plus-aosp
* commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13':
Add phony target dist_libraries
diff --git a/core/main.mk b/core/main.mk
index a69d87b..be06b0c 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -700,6 +700,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.
@@ -748,7 +751,7 @@
endif
# Building a full system-- the default is to build droidcore
-droid: droidcore
+droid: droidcore dist_libraries
endif