diff options
| author | Ying Wang <wangying@google.com> | 2010-09-15 11:52:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-15 11:52:34 -0700 |
| commit | 659adc0b54e40b3b194c84ad4ac8d2e775276e60 (patch) | |
| tree | 4888d9fb36b7a1f82f23141723907f5bcf079016 | |
| parent | 78c5ff6d376afc6a1a5fab8a7a24be00211c2d35 (diff) | |
| parent | db2cb63612af2bc9e8bd7ea6d33da2218a33de2d (diff) | |
| download | build-659adc0b54e40b3b194c84ad4ac8d2e775276e60.zip build-659adc0b54e40b3b194c84ad4ac8d2e775276e60.tar.gz build-659adc0b54e40b3b194c84ad4ac8d2e775276e60.tar.bz2 | |
Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread
| -rw-r--r-- | core/Makefile | 17 | ||||
| -rw-r--r-- | core/main.mk | 11 | ||||
| -rw-r--r-- | core/product_config.mk | 5 |
3 files changed, 14 insertions, 19 deletions
diff --git a/core/Makefile b/core/Makefile index 7b67f88..0adc673 100644 --- a/core/Makefile +++ b/core/Makefile @@ -831,8 +831,6 @@ $(INSTALLED_USERDATAIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) \ .PHONY: userdataimage-nodeps userdataimage-nodeps: $(INTERNAL_USERIMAGES_DEPS) $(build-userdataimage-target) - $(hide)mkdir -p $(DIST_DIR) - $(hide)cp $(INSTALLED_USERDATAIMAGE_TARGET) $(DIST_DIR) ####### ## data partition tarball @@ -1106,12 +1104,15 @@ $(BUILT_TESTS_ZIP_PACKAGE): \ .PHONY: tests-zip-package tests-zip-package: $(BUILT_TESTS_ZIP_PACKAGE) -# Dist the files needed by tests builds -# So the build server can run the following commands to build tests packages while avoid a full build: -# $make -j16 tests-zip-package userdataimage-nodeps dist showcommands TARGET_BUILD_VARIANT=tests TARGET_PRODUCT=passion -ifeq ($(filter $(DEFAULT_GOAL) tests-zip-package,$(MAKECMDGOALS)),tests-zip-package) - $(call dist-for-goals, tests-zip-package, \ - $(BUILT_TESTS_ZIP_PACKAGE)) +# Target needed by tests build +.PHONY: tests-build-target +tests-build-target: $(BUILT_TESTS_ZIP_PACKAGE) \ + $(BUILT_USERDATAIMAGE_TARGET) + +ifneq (,$(filter $(MAKECMDGOALS),tests-build-target)) + $(call dist-for-goals, tests-build-target, \ + $(BUILT_TESTS_ZIP_PACKAGE) \ + $(BUILT_USERDATAIMAGE_TARGET)) endif # ----------------------------------------------------------------- diff --git a/core/main.mk b/core/main.mk index 8d6fddf..f3ec53f 100644 --- a/core/main.mk +++ b/core/main.mk @@ -741,17 +741,6 @@ else # TARGET_BUILD_APPS $(INSTALLED_RAMDISK_TARGET) \ ) - # Tests are installed in userdata.img. If we're building the tests - # variant, copy it for "make tests dist". Also copy a zip of the - # contents of userdata.img, so that people can easily extract a - # single .apk. - ifeq ($(TARGET_BUILD_VARIANT),tests) - $(call dist-for-goals, droid, \ - $(INSTALLED_USERDATAIMAGE_TARGET) \ - $(BUILT_TESTS_ZIP_PACKAGE) \ - ) - endif - # Building a full system-- the default is to build droidcore droid: droidcore dist_libraries diff --git a/core/product_config.mk b/core/product_config.mk index 7f79ff7..4824245 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -119,6 +119,11 @@ ifdef product_goals default_goal_substitution := $(DEFAULT_GOAL) endif + # For tests build, only build tests-build-target + ifeq (tests,$(TARGET_BUILD_VARIANT)) + default_goal_substitution := tests-build-target + endif + # Hack to make the linux build servers use dexpreopt (emulator-based # preoptimization). Most engineers don't use this type of target # ("make PRODUCT-blah-user"), so this should only tend to happen when |