p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add phony target "all_modules" and use it as make goal for "mm"/"mmm" 

So that mm/mmm don't depend on phony target "files", which brings in
unwanted files for apps-only build.
Also allow "dist" for mmm.
Bug: http://b/issue?id=2811503

Change-Id: I2c0794aebd1d171d8a0f44eb8cda67855704d6bd
This commit is contained in:
Ying Wang 2010-07-20 16:18:16 -07:00
parent 9269a71175
commit 0188414bc6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/main.mk
View File

@ -282,7 +282,6 @@ ifneq ($(filter dalvik.gc.type-precise,$(PRODUCT_TAGS)),)
ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dexopt-flags=m=y ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dexopt-flags=m=y
endif endif
ifeq (,$(TARGET_BUILD_APPS))
# Install an apns-conf.xml file if one's not already being installed. # Install an apns-conf.xml file if one's not already being installed.
ifeq (,$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES))) ifeq (,$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES)))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
@ -303,7 +302,6 @@ ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
endif endif
endif endif
endif endif
endif # !TARGET_BUILD_APPS
ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android
@ -747,6 +745,10 @@ endif # TARGET_BUILD_APPS
.PHONY: droid tests .PHONY: droid tests
tests: droidcore tests: droidcore
# phony target that include any targets in $(ALL_MODULES)
.PHONY: all_modules
all_modules: $(ALL_MODULES)
.PHONY: docs .PHONY: docs
docs: $(ALL_DOCS) docs: $(ALL_DOCS)

6
envsetup.sh
View File

@ -636,7 +636,7 @@ function mm()
elif [ ! "$M" ]; then elif [ ! "$M" ]; then
echo "Couldn't locate a makefile from the current directory." echo "Couldn't locate a makefile from the current directory."
else else
ONE_SHOT_MAKEFILE=$M make -C $T files $@ ONE_SHOT_MAKEFILE=$M make -C $T all_modules $@
fi fi
fi fi
} }
@ -668,13 +668,15 @@ function mmm()
ARGS="$ARGS snod" ARGS="$ARGS snod"
elif [ "$DIR" = showcommands ]; then elif [ "$DIR" = showcommands ]; then
ARGS="$ARGS showcommands" ARGS="$ARGS showcommands"
elif [ "$DIR" = dist ]; then
ARGS="$ARGS dist"
else else
echo "No Android.mk in $DIR." echo "No Android.mk in $DIR."
return 1 return 1
fi fi
fi fi
done done
ONE_SHOT_MAKEFILE="$MAKEFILE" make -C $T $DASH_ARGS files $ARGS ONE_SHOT_MAKEFILE="$MAKEFILE" make -C $T $DASH_ARGS all_modules $ARGS
else else
echo "Couldn't locate the top of the tree. Try setting TOP." echo "Couldn't locate the top of the tree. Try setting TOP."
fi fi