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

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

am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for... 

am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo

Merge commit 'd5c217ac' into gingerbread

* commit 'd5c217ac':
  add phony target "all_modules" and use it as make goal for "mm"/"mmm"
parents ebf93bb5 d5c217ac

core/main.mk

+4 −2
Original line number Diff line number Diff line
@@ -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
@@ -755,6 +753,10 @@ endif 
.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)

envsetup.sh

+4 −2
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ function mm() 
        elif [ ! "$M" ]; then

            echo "Couldn't locate a makefile from the current directory."

        else

            ONE_SHOT_MAKEFILE=$M make -C $T files $@

            ONE_SHOT_MAKEFILE=$M make -C $T all_modules $@

        fi

    fi

}
@@ -681,13 +681,15 @@ function mmm() 
                    ARGS="$ARGS snod"

                elif [ "$DIR" = showcommands ]; then

                    ARGS="$ARGS showcommands"

                elif [ "$DIR" = dist ]; then

                    ARGS="$ARGS dist"

                else

                    echo "No Android.mk in $DIR."

                    return 1

                fi

            fi

        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

        echo "Couldn't locate the top of the tree.  Try setting TOP."

    fi