diff options
| author | Ying Wang <wangying@google.com> | 2015-09-23 19:31:44 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-09-23 19:31:44 -0700 |
| commit | 2f9f1fb32f8e2320cbb515c82a3b471da4b6e848 (patch) | |
| tree | 4ffe1e833fa4990efb71383cbe2c66dbeb0878a0 | |
| parent | a0af56f6989d250f290257967f64f640531472f5 (diff) | |
| parent | 964f06b1782da73150d2f8953a41208898580061 (diff) | |
| download | platform_build-2f9f1fb32f8e2320cbb515c82a3b471da4b6e848.tar.gz platform_build-2f9f1fb32f8e2320cbb515c82a3b471da4b6e848.tar.bz2 platform_build-2f9f1fb32f8e2320cbb515c82a3b471da4b6e848.zip | |
resolved conflicts for 964f06b1 to stage-aosp-master
Change-Id: I0cebad2e440ec7d605afafac893352f06ca2f419
| -rw-r--r-- | core/base_rules.mk | 9 | ||||
| -rw-r--r-- | envsetup.sh | 20 |
2 files changed, 20 insertions, 9 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 72278ce298..d96502d9b2 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -255,6 +255,15 @@ $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MODULE:= $(my_register_name) .PHONY: $(my_register_name) $(my_register_name): $(LOCAL_BUILT_MODULE) $(LOCAL_INSTALLED_MODULE) +# Set up phony targets that covers all modules under the given paths. +# This allows us to build everything in given paths by running mmma/mma. +my_path_components := $(subst /,$(space),$(LOCAL_PATH)) +my_path_prefix := MODULES-IN +$(foreach c, $(my_path_components),\ + $(eval my_path_prefix := $(my_path_prefix)/$(c))\ + $(eval .PHONY : $(my_path_prefix))\ + $(eval $(my_path_prefix) : $(my_register_name))) + ########################################################### ## Module installation rule ########################################################### diff --git a/envsetup.sh b/envsetup.sh index 67b5229596..0f78786575 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -751,7 +751,7 @@ function mmm() MAKEFILE="$MAKEFILE $MFILE" else case $DIR in - showcommands | snod | dist | incrementaljavac | *=*) ARGS="$ARGS $DIR";; + showcommands | snod | dist | *=*) ARGS="$ARGS $DIR";; GET-INSTALL-PATH) GET_INSTALL_PATH=$DIR;; *) echo "No Android.mk in $DIR."; return 1;; esac @@ -780,7 +780,7 @@ function mma() return 1 fi local MY_PWD=`PWD= /bin/pwd|sed 's:'$T'/::'` - $DRV make -C $T -f build/core/main.mk $@ all_modules BUILD_MODULES_IN_PATHS="$MY_PWD" + $DRV make -C $T -f build/core/main.mk $@ MODULES-IN/$MY_PWD fi } @@ -798,23 +798,25 @@ function mmma() MY_PWD=`echo $MY_PWD|sed 's:'$T'/::'` fi local DIR= - local MODULE_PATHS= + local MODULES_IN_PATHS= local ARGS= for DIR in $DIRS ; do if [ -d $DIR ]; then - if [ "$MY_PWD" = "" ]; then - MODULE_PATHS="$MODULE_PATHS $DIR" - else - MODULE_PATHS="$MODULE_PATHS $MY_PWD/$DIR" + # Remove the leading ./ and trailing / if any exists. + DIR=${DIR#./} + DIR=${DIR%/} + if [ "$MY_PWD" != "" ]; then + DIR=$MY_PWD/$DIR fi + MODULES_IN_PATHS="$MODULES_IN_PATHS MODULES-IN/$DIR" else case $DIR in - showcommands | snod | dist | incrementaljavac | *=*) ARGS="$ARGS $DIR";; + showcommands | snod | dist | *=*) ARGS="$ARGS $DIR";; *) echo "Couldn't find directory $DIR"; return 1;; esac fi done - $DRV make -C $T -f build/core/main.mk $DASH_ARGS $ARGS all_modules BUILD_MODULES_IN_PATHS="$MODULE_PATHS" + $DRV make -C $T -f build/core/main.mk $DASH_ARGS $ARGS $MODULES_IN_PATHS else echo "Couldn't locate the top of the tree. Try setting TOP." return 1 |