allow use of unzip version 6.0

[android-x86/build.git] / core / main.mk

diff --git a/core/main.mk b/core/main.mk
index 59d216f..9986f94 100644 (file)
--- a/core/main.mk
+++ b/core/main.mk
@@ -54,6 +54,12 @@ include $(BUILD_SYSTEM)/config.mk
 # be generated correctly
 include $(BUILD_SYSTEM)/cleanbuild.mk
 
+VERSION_CHECK_SEQUENCE_NUMBER := 1
+-include $(OUT_DIR)/versions_checked.mk
+ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))
+
+$(info Checking build tools versions...)
+
 ifneq ($(HOST_OS),windows)
 ifneq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc)
 # check for a case sensitive file system
@@ -123,6 +129,10 @@ endif
 
 endif # windows
 
+$(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \
+        > $(OUT_DIR)/versions_checked.mk)
+endif
+
 # These are the modifier targets that don't do anything themselves, but
 # change the behavior of the build.
 # (must be defined before including definitions.make)
@@ -220,7 +230,8 @@ ifeq ($(TARGET_BUILD_VARIANT),eng)
 tags_to_install := user debug eng
   # Don't require the setup wizard on eng builds
   ADDITIONAL_BUILD_PROPERTIES := $(filter-out ro.setupwizard.mode=%,\
-          $(call collapse-pairs, $(ADDITIONAL_BUILD_PROPERTIES)))
+          $(call collapse-pairs, $(ADDITIONAL_BUILD_PROPERTIES))) \
+          ro.setupwizard.mode=OPTIONAL
 endif
 
 ## tests ##
@@ -241,8 +252,6 @@ tags_to_install := user debug eng
 ADDITIONAL_BUILD_PROPERTIES += xmpp.auto-presence=true
 ADDITIONAL_BUILD_PROPERTIES += ro.config.nocheckin=yes
 else # !sdk
-# Enable sync for non-sdk builds only (sdk builds lack SubscribedFeedsProvider).
-ADDITIONAL_BUILD_PROPERTIES += ro.config.sync=yes
 endif
 
 ## precise GC ##
@@ -277,6 +286,7 @@ ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
 endif
 
 ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android
+ADDITIONAL_BUILD_PROPERTIES += ro.config.sync=yes
 
 # enable vm tracing in files for now to help track
 # the cause of ANRs in the content process
@@ -327,8 +337,6 @@ endif
 # Bring in all modules that need to be built.
 ifneq ($(dont_bother),true)
 
-subdir_makefiles :=
-
 ifeq ($(HOST_OS),windows)
 SDK_ONLY := true
 endif
@@ -341,12 +349,14 @@ ifeq ($(SDK_ONLY),true)
 subdirs := \
        prebuilt \
        build/libs/host \
+       build/tools/zipalign \
        dalvik/dexdump \
        dalvik/libdex \
        dalvik/tools/dmtracedump \
        dalvik/tools/hprof-conv \
        development/emulator/mksdcard \
        development/tools/line_endings \
+       development/tools/sdklauncher \
        development/host \
        external/expat \
        external/libpng \
@@ -368,7 +378,6 @@ ifneq (,$(shell which javac 2>/dev/null))
 $(warning sdk-only: javac available.)
 subdirs += \
        build/tools/signapk \
-       build/tools/zipalign \
        dalvik/dx \
        dalvik/libcore \
        development/apps \
@@ -381,6 +390,7 @@ subdirs += \
        development/tools/sdkstats \
        development/tools/sdkmanager \
        development/tools/mkstubs \
+       development/tools/layoutopt \
        frameworks/base \
        frameworks/base/tools/layoutlib \
        external/googleclient \
@@ -426,15 +436,6 @@ endif      # !BUILD_TINY_ANDROID
 
 endif  # !SDK_ONLY
 
-# Can't use first-makefiles-under here because
-# --mindepth=2 makes the prunes not work.
-subdir_makefiles += \
-       $(shell build/tools/findleaves.sh --prune="./out" $(subdirs) Android.mk)
-
-#
-# Include all of the makefiles in the system
-#
-
 ifneq ($(ONE_SHOT_MAKEFILE),)
 # We've probably been invoked by the "mm" shell function
 # with a subdirectory's makefile.
@@ -450,9 +451,21 @@ FULL_BUILD :=
 # when using ONE_SHOT_MAKEFILE.
 NOTICE-HOST-%: ;
 NOTICE-TARGET-%: ;
-else
+
+else # ONE_SHOT_MAKEFILE
+
+#
+# Include all of the makefiles in the system
+#
+
+# Can't use first-makefiles-under here because
+# --mindepth=2 makes the prunes not work.
+subdir_makefiles := \
+       $(shell build/tools/findleaves.py --prune=out --prune=.repo --prune=.git $(subdirs) Android.mk)
+
 include $(subdir_makefiles)
-endif
+endif # ONE_SHOT_MAKEFILE
+
 # -------------------------------------------------------------------
 # All module makefiles have been included at this point.
 # -------------------------------------------------------------------