diff options
| author | Mike Lockwood <lockwood@google.com> | 2012-03-21 17:01:07 -0700 |
|---|---|---|
| committer | Mike Lockwood <lockwood@google.com> | 2012-03-21 17:01:18 -0700 |
| commit | e8eb8df9896e7d3a78047f0922a90b0cd3c2aedc (patch) | |
| tree | f9291bc63cf4b9d93d24b880a22dd4458fd0e2d5 /core/Makefile | |
| parent | 035e1885fb63403b5c831500554a66b9043b1853 (diff) | |
| parent | c6e952fec16c06e66a6825328304fa1dec93278b (diff) | |
| download | build-e8eb8df9896e7d3a78047f0922a90b0cd3c2aedc.zip build-e8eb8df9896e7d3a78047f0922a90b0cd3c2aedc.tar.gz build-e8eb8df9896e7d3a78047f0922a90b0cd3c2aedc.tar.bz2 | |
Merge commit 'c6e952f'
Don't build userdata.img for tests build.
Change-Id: I492cca5e5989cabdeb6f75c3b8a8c9ac3b9ca8c8
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/Makefile b/core/Makefile index ad77836..173932c 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1258,13 +1258,11 @@ 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) +tests-build-target: $(BUILT_TESTS_ZIP_PACKAGE) ifneq (,$(filter $(MAKECMDGOALS),tests-build-target)) $(call dist-for-goals, tests-build-target, \ - $(BUILT_TESTS_ZIP_PACKAGE) \ - $(BUILT_USERDATAIMAGE_TARGET)) + $(BUILT_TESTS_ZIP_PACKAGE)) endif .PHONY: tests |