am 570a0eef: Dist userdataimg and tests-zip-package for tests builds
Merge commit '570a0eeffb4c06084f21a058efb25271bb0cd1f6' into gingerbread-plus-aosp
* commit '570a0eeffb4c06084f21a058efb25271bb0cd1f6':
Dist userdataimg and tests-zip-package for tests builds
diff --git a/core/Makefile b/core/Makefile
index 2b0e0b4..ba451dd 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -863,6 +863,8 @@
.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
@@ -1133,8 +1135,17 @@
$(TARGET_OUT_DATA),$(zip_root)/DATA)
$(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .)
+.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))
+endif
+
# -----------------------------------------------------------------
# A zip of the symbols directory. Keep the full paths to make it
# more obvious where these files came from.