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

Commit a9b02f0b authored by Ying Wang's avatar Ying Wang
Browse files

resolved conflicts for merge of a6bed2f7 to gingerbread

Change-Id: Ic9efcc70af22f15a1bb136f70a30db59dc629e03
parents 90b1d3dc a6bed2f7
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -696,6 +696,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.

@@ -744,7 +747,7 @@ else # TARGET_BUILD_APPS
  endif

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

endif