diff options
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/core/Makefile b/core/Makefile index 49a94c8..63f96a4 100644 --- a/core/Makefile +++ b/core/Makefile @@ -907,6 +907,7 @@ INTERNAL_USERDATAIMAGE_FILES += \ $(filter $(TARGET_OUT_DATA)/%,$(tests_MODULES)) endif +ifneq (true,$(BOARD_DONT_BUILD_USERDATA_IMG)) userdataimage_intermediates := \ $(call intermediates-dir-for,PACKAGING,userdata) BUILT_USERDATAIMAGE_TARGET := $(PRODUCT_OUT)/userdata.img @@ -932,6 +933,8 @@ $(INSTALLED_USERDATAIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) \ userdataimage-nodeps: | $(INTERNAL_USERIMAGES_DEPS) $(build-userdataimage-target) +endif # no BOARD_DONT_BUILD_USERDATA_IMG + ####### ## data partition tarball define build-userdatatarball-target @@ -1222,6 +1225,7 @@ endif # TARGET_NO_KERNEL != true endif # TARGET_DEVICE != generic* endif # TARGET_PRODUCT != sdk +ifdef is_tests_build # ----------------------------------------------------------------- # A zip of the tests that are built when running "make tests". # This is very similar to BUILT_TARGET_FILES_PACKAGE, but we @@ -1252,23 +1256,13 @@ $(BUILT_TESTS_ZIP_PACKAGE): \ $(TARGET_OUT_DATA),$(zip_root)/DATA) $(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .) -.PHONY: tests-zip-package -tests-zip-package: $(BUILT_TESTS_ZIP_PACKAGE) - -# Target needed by tests build -.PHONY: tests-build-target -tests-build-target: $(BUILT_TESTS_ZIP_PACKAGE) - -ifneq (,$(filter $(MAKECMDGOALS),tests-build-target)) - $(call dist-for-goals, tests-build-target, \ - $(BUILT_TESTS_ZIP_PACKAGE)) -endif - .PHONY: tests tests: $(BUILT_TESTS_ZIP_PACKAGE) + ifneq (,$(filter tests, $(MAKECMDGOALS))) -$(call dist-for-goals, tests, $(BUILT_TESTS_ZIP_PACKAGE)) + $(call dist-for-goals, tests, $(BUILT_TESTS_ZIP_PACKAGE)) endif +endif # is_tests_build # ----------------------------------------------------------------- # A zip of the symbols directory. Keep the full paths to make it @@ -1438,7 +1432,6 @@ deps := \ $(atree_dir)/sdk.atree \ $(sdk_tools_atree_files) \ $(HOST_OUT_EXECUTABLES)/atree \ - $(ALL_HOST_INSTALLED_FILES) \ $(HOST_OUT_EXECUTABLES)/line_endings INTERNAL_SDK_TARGET := $(sdk_dir)/$(sdk_name).zip |