diff -ru /tmp/tmp3/build/core/main.mk ./build/core/main.mk --- /tmp/tmp3/build/core/main.mk 2012-01-30 20:00:18.000000000 +1300 +++ ./build/core/main.mk 2012-02-03 08:43:14.000000000 +1300 @@ -70,21 +70,21 @@ $(info Checking build tools versions...) -ifneq ($(HOST_OS),windows) -ifneq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc) -# check for a case sensitive file system -ifneq (a,$(shell mkdir -p $(OUT_DIR) ; \ - echo a > $(OUT_DIR)/casecheck.txt; \ - echo B > $(OUT_DIR)/CaseCheck.txt; \ - cat $(OUT_DIR)/casecheck.txt)) -$(warning ************************************************************) -$(warning You are building on a case-insensitive filesystem.) -$(warning Please move your source tree to a case-sensitive filesystem.) -$(warning ************************************************************) -$(error Case-insensitive filesystems not supported) -endif -endif -endif +# ifneq ($(HOST_OS),windows) +# ifneq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc) +# # check for a case sensitive file system +# ifneq (a,$(shell mkdir -p $(OUT_DIR) ; \ +# echo a > $(OUT_DIR)/casecheck.txt; \ +# echo B > $(OUT_DIR)/CaseCheck.txt; \ +# cat $(OUT_DIR)/casecheck.txt)) +# $(warning ************************************************************) +# $(warning You are building on a case-insensitive filesystem.) +# $(warning Please move your source tree to a case-sensitive filesystem.) +# $(warning ************************************************************) +# $(error Case-insensitive filesystems not supported) +# endif +# endif +# endif # Make sure that there are no spaces in the absolute path; the # build system can't deal with them. @@ -102,37 +102,37 @@ endif -# Check for the correct version of java -java_version := $(shell java -version 2>&1 | head -n 1 | grep '[ "]1\.6[\. "$$]') -ifeq ($(strip $(java_version)),) -$(info ************************************************************) -$(info You are attempting to build with the incorrect version) -$(info of java.) -$(info $(space)) -$(info Your version is: $(shell java -version 2>&1 | head -n 1).) -$(info The correct version is: 1.6.) -$(info $(space)) -$(info Please follow the machine setup instructions at) -$(info $(space)$(space)$(space)$(space)http://source.android.com/download) -$(info ************************************************************) -$(error stop) -endif - -# Check for the correct version of javac -javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.6[\. "$$]') -ifeq ($(strip $(javac_version)),) -$(info ************************************************************) -$(info You are attempting to build with the incorrect version) -$(info of javac.) -$(info $(space)) -$(info Your version is: $(shell javac -version 2>&1 | head -n 1).) -$(info The correct version is: 1.6.) -$(info $(space)) -$(info Please follow the machine setup instructions at) -$(info $(space)$(space)$(space)$(space)http://source.android.com/download) -$(info ************************************************************) -$(error stop) -endif +# # Check for the correct version of java +# java_version := $(shell java -version 2>&1 | head -n 1 | grep '[ "]1\.6[\. "$$]') +# ifeq ($(strip $(java_version)),) +# $(info ************************************************************) +# $(info You are attempting to build with the incorrect version) +# $(info of java.) +# $(info $(space)) +# $(info Your version is: $(shell java -version 2>&1 | head -n 1).) +# $(info The correct version is: 1.6.) +# $(info $(space)) +# $(info Please follow the machine setup instructions at) +# $(info $(space)$(space)$(space)$(space)http://source.android.com/download) +# $(info ************************************************************) +# $(error stop) +# endif + +# # Check for the correct version of javac +# javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.6[\. "$$]') +# ifeq ($(strip $(javac_version)),) +# $(info ************************************************************) +# $(info You are attempting to build with the incorrect version) +# $(info of javac.) +# $(info $(space)) +# $(info Your version is: $(shell javac -version 2>&1 | head -n 1).) +# $(info The correct version is: 1.6.) +# $(info $(space)) +# $(info Please follow the machine setup instructions at) +# $(info $(space)$(space)$(space)$(space)http://source.android.com/download) +# $(info ************************************************************) +# $(error stop) +# endif $(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \ > $(OUT_DIR)/versions_checked.mk) diff -ru /tmp/tmp3/build/target/product/sdk.mk ./build/target/product/sdk.mk --- /tmp/tmp3/build/target/product/sdk.mk 2012-01-30 20:00:18.000000000 +1300 +++ ./build/target/product/sdk.mk 2012-02-03 08:47:52.000000000 +1300 @@ -177,10 +177,10 @@ zh_CN \ zh_TW -# include available languages for TTS in the system image -include external/svox/pico/lang/PicoLangDeDeInSystem.mk -include external/svox/pico/lang/PicoLangEnGBInSystem.mk -include external/svox/pico/lang/PicoLangEnUsInSystem.mk -include external/svox/pico/lang/PicoLangEsEsInSystem.mk -include external/svox/pico/lang/PicoLangFrFrInSystem.mk -include external/svox/pico/lang/PicoLangItItInSystem.mk +# # include available languages for TTS in the system image +# include external/svox/pico/lang/PicoLangDeDeInSystem.mk +# include external/svox/pico/lang/PicoLangEnGBInSystem.mk +# include external/svox/pico/lang/PicoLangEnUsInSystem.mk +# include external/svox/pico/lang/PicoLangEsEsInSystem.mk +# include external/svox/pico/lang/PicoLangFrFrInSystem.mk +# include external/svox/pico/lang/PicoLangItItInSystem.mk diff -ru /tmp/tmp3/external/zlib/Android.mk ./external/zlib/Android.mk --- /tmp/tmp3/external/zlib/Android.mk 2012-02-03 08:58:59.000000000 +1300 +++ ./external/zlib/Android.mk 2012-02-03 09:08:24.000000000 +1300 @@ -30,20 +30,20 @@ zlib_arm_flags += -D__ARM_HAVE_NEON endif -LOCAL_MODULE := libz -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS += -O3 -DUSE_MMAP $(zlib_arm_flags) -LOCAL_SRC_FILES := $(zlib_files) $(zlib_arm_files) -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) - -LOCAL_ARM_MODE := arm -LOCAL_MODULE := libz -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS += -O3 -DUSE_MMAP $(zlib_arm_flags) -LOCAL_SRC_FILES := $(zlib_files) $(zlib_arm_files) -include $(BUILD_STATIC_LIBRARY) +# LOCAL_MODULE := libz +# LOCAL_MODULE_TAGS := optional +# LOCAL_CFLAGS += -O3 -DUSE_MMAP $(zlib_arm_flags) +# LOCAL_SRC_FILES := $(zlib_files) $(zlib_arm_files) +# include $(BUILD_SHARED_LIBRARY) + +# include $(CLEAR_VARS) + +# LOCAL_ARM_MODE := arm +# LOCAL_MODULE := libz +# LOCAL_MODULE_TAGS := optional +# LOCAL_CFLAGS += -O3 -DUSE_MMAP $(zlib_arm_flags) +# LOCAL_SRC_FILES := $(zlib_files) $(zlib_arm_files) +# include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -70,31 +70,31 @@ LOCAL_ARM_MODE := arm include $(BUILD_HOST_STATIC_LIBRARY) -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(unzip_files) -LOCAL_MODULE:= libunz -LOCAL_ARM_MODE := arm -include $(BUILD_STATIC_LIBRARY) +# include $(CLEAR_VARS) +# LOCAL_SRC_FILES := $(unzip_files) +# LOCAL_MODULE:= libunz +# LOCAL_ARM_MODE := arm +# include $(BUILD_STATIC_LIBRARY) -include $(CLEAR_VARS) +# include $(CLEAR_VARS) -LOCAL_SRC_FILES:= \ - minigzip.c +# LOCAL_SRC_FILES:= \ +# minigzip.c -LOCAL_MODULE:= gzip +# LOCAL_MODULE:= gzip -LOCAL_SHARED_LIBRARIES := libz +# LOCAL_SHARED_LIBRARIES := libz -include $(BUILD_EXECUTABLE) +# include $(BUILD_EXECUTABLE) -include $(CLEAR_VARS) +# include $(CLEAR_VARS) -LOCAL_SRC_FILES:= \ - minigzip.c +# LOCAL_SRC_FILES:= \ +# minigzip.c -LOCAL_MODULE:= minigzip +# LOCAL_MODULE:= minigzip -LOCAL_STATIC_LIBRARIES := libz +# LOCAL_STATIC_LIBRARIES := libz -include $(BUILD_HOST_EXECUTABLE) +# include $(BUILD_HOST_EXECUTABLE) diff -ru /tmp/tmp3/system/core/libmincrypt/Android.mk ./system/core/libmincrypt/Android.mk --- /tmp/tmp3/system/core/libmincrypt/Android.mk 2012-01-31 06:00:11.000000000 +1300 +++ ./system/core/libmincrypt/Android.mk 2012-02-03 09:29:46.000000000 +1300 @@ -3,11 +3,11 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := libmincrypt -LOCAL_SRC_FILES := rsa.c sha.c -include $(BUILD_STATIC_LIBRARY) +# LOCAL_MODULE := libmincrypt +# LOCAL_SRC_FILES := rsa.c sha.c +# include $(BUILD_STATIC_LIBRARY) -include $(CLEAR_VARS) +# include $(CLEAR_VARS) LOCAL_MODULE := libmincrypt LOCAL_SRC_FILES := rsa.c sha.c diff -ru /tmp/tmp3/system/core/libzipfile/Android.mk ./system/core/libzipfile/Android.mk --- /tmp/tmp3/system/core/libzipfile/Android.mk 2012-01-31 06:00:11.000000000 +1300 +++ ./system/core/libzipfile/Android.mk 2012-02-03 08:57:00.000000000 +1300 @@ -16,33 +16,33 @@ include $(BUILD_HOST_STATIC_LIBRARY) -# build device static library -include $(CLEAR_VARS) +# # build device static library +# include $(CLEAR_VARS) -LOCAL_SRC_FILES:= \ - centraldir.c \ - zipfile.c +# LOCAL_SRC_FILES:= \ +# centraldir.c \ +# zipfile.c -LOCAL_STATIC_LIBRARIES := \ - libunz +# LOCAL_STATIC_LIBRARIES := \ +# libunz -LOCAL_MODULE:= libzipfile +# LOCAL_MODULE:= libzipfile -LOCAL_C_INCLUDES += external/zlib +# LOCAL_C_INCLUDES += external/zlib -include $(BUILD_STATIC_LIBRARY) +# include $(BUILD_STATIC_LIBRARY) -# build test_zipfile -include $(CLEAR_VARS) +# # build test_zipfile +# include $(CLEAR_VARS) -LOCAL_SRC_FILES:= \ - test_zipfile.c +# LOCAL_SRC_FILES:= \ +# test_zipfile.c -LOCAL_STATIC_LIBRARIES := libzipfile libunz +# LOCAL_STATIC_LIBRARIES := libzipfile libunz -LOCAL_MODULE := test_zipfile +# LOCAL_MODULE := test_zipfile -LOCAL_C_INCLUDES += external/zlib +# LOCAL_C_INCLUDES += external/zlib -include $(BUILD_HOST_EXECUTABLE) +# include $(BUILD_HOST_EXECUTABLE)