am f57689a2: Reconcile with ics-mr1-release
* commit 'f57689a2875c5834e583d269149555f87eb69629':
diff --git a/build/sdk-android-armeabi-v7a.atree b/build/sdk-android-armeabi-v7a.atree
index 8867bf7..ddf2f65 100644
--- a/build/sdk-android-armeabi-v7a.atree
+++ b/build/sdk-android-armeabi-v7a.atree
@@ -15,7 +15,7 @@
#
# Copy the ARMv7 specific kernel image to .../kernel-qemu
-prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu-armv7 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
+prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu-armv7 system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
# version files for the SDK updater, from development.git
development/sdk/images_armeabi-v7a_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
diff --git a/build/sdk-android-armeabi.atree b/build/sdk-android-armeabi.atree
index a31eca6..2badd85 100644
--- a/build/sdk-android-armeabi.atree
+++ b/build/sdk-android-armeabi.atree
@@ -14,7 +14,7 @@
# limitations under the License.
#
-prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
+prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
# version files for the SDK updater, from development.git
development/sdk/images_armeabi_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
diff --git a/build/sdk-android-x86.atree b/build/sdk-android-x86.atree
index 748478a..8425600 100644
--- a/build/sdk-android-x86.atree
+++ b/build/sdk-android-x86.atree
@@ -14,7 +14,7 @@
# limitations under the License.
#
-prebuilt/android-${TARGET_ARCH}/kernel/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
+prebuilts/qemu-kernel/${TARGET_ARCH}/kernel-qemu system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/kernel-qemu
# version files for the SDK updater, from development.git
development/sdk/images_x86_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
diff --git a/build/sdk_only_whitelist.mk b/build/sdk_only_whitelist.mk
new file mode 100644
index 0000000..16bbe1b
--- /dev/null
+++ b/build/sdk_only_whitelist.mk
@@ -0,0 +1,70 @@
+# Whitelist of SDK projects that can be built for the SDK on Windows
+
+# The Windows SDK cannot build all the projects from the SDK tree, typically
+# due to obvious compiler/architectures differences. When building the Windows
+# SDK, we only care about a subset of projects (e.g. generally the SDK tools
+# and a few platform-specific binaries.)
+#
+# This file defines a whitelist of projects that can be built in the Windows
+# SDK case. Note that whitelisting a project directory will NOT actually build
+# it -- it will only allow one to reference it as a make dependency.
+#
+# This file is included by build/core/main.mk.
+
+# Note that there are 2 flavors of this file:
+#
+# - The other file: sdk/build/sdk_only_whitelist.mk
+# must list all projects that are that are NOT specific to a given platform.
+# These binaries are the ones typically found in the SDK/tools directory.
+#
+# - This file: development/build/sdk_only_whitelist.mk
+# must list all projects that are specific to a given platform. These
+# projects generate files that are generally locates in SDK/platform-tools,
+# or SDK/platforms/, etc.
+
+# -----
+# Whitelist of platform specific projects that do NOT need Java (e.g. C libraries)
+
+subdirs += \
+ prebuilt \
+ prebuilts \
+ build/libs/host \
+ build/tools/zipalign \
+ dalvik/dexdump \
+ dalvik/libdex \
+ dalvik/tools/dmtracedump \
+ dalvik/tools/hprof-conv \
+ development/host \
+ development/tools/etc1tool \
+ development/tools/line_endings \
+ development/tools/emulator/opengl \
+ external/clang \
+ external/easymock \
+ external/expat \
+ external/libpng \
+ external/llvm \
+ external/sqlite/dist \
+ external/zlib \
+ frameworks/base \
+ frameworks/compile \
+ system/core/adb \
+ system/core/fastboot \
+ system/core/libcutils \
+ system/core/liblog \
+ system/core/libzipfile
+
+# -----
+# Whitelist of platform specific projects that DO require Java
+
+ifneq (,$(shell which javac 2>/dev/null))
+subdirs += \
+ build/tools/signapk \
+ dalvik/dx \
+ libcore \
+ development/apps \
+ development/tools/mkstubs \
+ packages
+
+else
+$(warning SDK_ONLY: javac not available.)
+endif
diff --git a/ndk/platforms/android-3/arch-arm/include/asm/types.h b/ndk/platforms/android-3/arch-arm/include/asm/types.h
index ec60f10..80cea8d 100644
--- a/ndk/platforms/android-3/arch-arm/include/asm/types.h
+++ b/ndk/platforms/android-3/arch-arm/include/asm/types.h
@@ -25,7 +25,7 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#ifdef __GNUC__
typedef __signed__ long long __s64;
typedef unsigned long long __u64;
#endif
diff --git a/tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk b/tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk
index deb11b6..a73f6b8 100644
--- a/tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk
+++ b/tools/emulator/opengl/tests/translator_tests/GLES_CM/Android.mk
@@ -8,6 +8,15 @@
LOCAL_SDL_CFLAGS := $(shell $(LOCAL_SDL_CONFIG) --cflags)
LOCAL_SDL_LDLIBS := $(filter-out %.a %.lib,$(shell $(LOCAL_SDL_CONFIG) --static-libs))
+ifeq ($(HOST_OS),darwin)
+ DARWIN_VERSION := $(strip $(shell sw_vers -productVersion))
+ ifneq ($(filter 10.7 10.7.%,$(DARWIN_VERSION)),)
+ # Lion needs to be forced to link dylib to avoid problems
+ # with the dynamic function lookups in SDL 1.2
+ LOCAL_SDL_LDLIBS += /usr/lib/dylib1.o
+ endif
+endif
+
LOCAL_SRC_FILES:= \
triangleCM.cpp
diff --git a/tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk b/tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk
index ae0064f..efbe6bd 100644
--- a/tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk
+++ b/tools/emulator/opengl/tests/translator_tests/GLES_V2/Android.mk
@@ -17,6 +17,12 @@
LOCAL_STATIC_LIBRARIES += libSDL libSDLmain
ifeq ($(HOST_OS),darwin)
+DARWIN_VERSION := $(strip $(shell sw_vers -productVersion))
+ifneq ($(filter 10.7 10.7.%,$(DARWIN_VERSION)),)
+ # Lion needs to be forced to link dylib to avoid problems
+ # with the dynamic function lookups in SDL 1.2
+ LOCAL_LDLIBS += /usr/lib/dylib1.o
+endif
$(call emugl-import,libMac_view)
endif