resolved conflicts for merge of 6c56dd64 to master
Change-Id: If806a737c5cc46cd4545788dfa991cdeab488213
diff --git a/core/main.mk b/core/main.mk
index b0aa34c..60d561b 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -696,12 +696,16 @@
$(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 @@
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)