Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c56dd64 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am a9b02f0b: resolved conflicts for merge of a6bed2f7 to gingerbread 

Merge commit 'a9b02f0b' into gingerbread-plus-aosp

* commit 'a9b02f0b':
  Add phony target dist_libraries
parents 4a1addef a9b02f0b

core/main.mk

+4 −1
Original line number Diff line number Diff line
@@ -700,6 +700,9 @@ ifeq ($(EMMA_INSTRUMENT),true) 
  $(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 @@ else # TARGET_BUILD_APPS 
  endif



# Building a full system-- the default is to build droidcore

droid: droidcore

droid: droidcore dist_libraries



endif