diff options
| author | Ying Wang <wangying@google.com> | 2010-07-22 11:24:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-22 11:24:38 -0700 |
| commit | 84a5ba03b469a28f3678eb58ecd9aada5b416493 (patch) | |
| tree | b6b0b04284be72c733a710cb515c84136c7079a1 /core | |
| parent | 1a631273eb1178198a83150672a15114706bf74f (diff) | |
| parent | b96e8a8cc629c3e3a196263cc548bd55824e4ade (diff) | |
| download | build-84a5ba03b469a28f3678eb58ecd9aada5b416493.tar.gz build-84a5ba03b469a28f3678eb58ecd9aada5b416493.tar.bz2 build-84a5ba03b469a28f3678eb58ecd9aada5b416493.zip | |
am b96e8a8c: am d9dea715: am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
Merge commit 'b96e8a8cc629c3e3a196263cc548bd55824e4ade'
* commit 'b96e8a8cc629c3e3a196263cc548bd55824e4ade':
add phony target "all_modules" and use it as make goal for "mm"/"mmm"
Diffstat (limited to 'core')
| -rw-r--r-- | core/main.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/main.mk b/core/main.mk index 60d561bc9..da66c3698 100644 --- a/core/main.mk +++ b/core/main.mk @@ -287,7 +287,6 @@ ifneq ($(filter dalvik.gc.type-precise,$(PRODUCT_TAGS)),) ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dexopt-flags=m=y endif -ifeq (,$(TARGET_BUILD_APPS)) # Install an apns-conf.xml file if one's not already being installed. ifeq (,$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES))) PRODUCT_COPY_FILES += \ @@ -308,7 +307,6 @@ ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),) endif endif endif -endif # !TARGET_BUILD_APPS ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android @@ -763,6 +761,10 @@ endif # droid in $(MAKECMDGOALS) .PHONY: droid tests tests: droidcore +# phony target that include any targets in $(ALL_MODULES) +.PHONY: all_modules +all_modules: $(ALL_MODULES) + .PHONY: docs docs: $(ALL_DOCS) |