resolved conflicts for merge of b7415560 to jb-mr1-devandroid-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2_pre3android-4.2_pre2.2android-4.2_pre2.1android-4.2_pre2android-4.2_pre1.1android-4.2_pre1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1-releasejb-mr1-factory-releasejb-mr1-dev

Change-Id: I74a2c85a5d00e9e18a1b41753be92b1c4eef39c6

2 files changed, 55 insertions, 65 deletions

diff --git a/main/Android.mk b/main/Android.mk
index c54f39b74..70ed5ec60 100644
--- a/main/Android.mk
+++ b/main/Android.mk
@@ -14,22 +14,17 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-ifeq ($(TARGET_ARCH),arm)
-	arch := arm
-else ifeq ($(TARGET_ARCH),x86)
-	arch := x86
-endif
-ifdef arch
+ifneq ($(filter arm x86,$(TARGET_ARCH)),)
 
 common_cflags := \
 	-Wall -Wmissing-prototypes -Wshadow -Wpointer-arith -Wmissing-declarations \
 	-Wno-pointer-sign -Wno-sign-compare -Wno-unused-parameter -Wno-shadow \
 	-fno-strict-aliasing -fno-stack-protector \
-	-DVGA_$(arch)=1 \
+	-DVGA_$(TARGET_ARCH)=1 \
 	-DVGO_linux=1 \
-	-DVGP_$(arch)_linux=1 \
-	-DVGPV_$(arch)_linux_android=1 \
-	-DVG_PLATFORM=\"$(arch)-linux\" \
+	-DVGP_$(TARGET_ARCH)_linux=1 \
+	-DVGPV_$(TARGET_ARCH)_linux_android=1 \
+	-DVG_PLATFORM=\"$(TARGET_ARCH)-linux\" \
 	-DVG_LIBDIR=\"/system/lib/valgrind\" \
 	-DANDROID_SYMBOLS_DIR=\"/data/local/symbols\" \
 	-DANDROID_HARDWARE_nexus_s
@@ -54,10 +49,10 @@ ifeq ($(TARGET_ARCH),arm)
   preload_ldflags += -Wl,--icf=none
 endif
 
-# Build libvex-($arch)-linux.a
+# Build libvex-($TARGET_ARCH)-linux.a
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libvex-$(arch)-linux
+LOCAL_MODULE := libvex-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_ARM_MODE := arm
 
@@ -107,10 +102,10 @@ LOCAL_CFLAGS := $(common_cflags) \
 
 include $(BUILD_STATIC_LIBRARY)
 
-# Build libcoregrind-$(arch)-linux.a
+# Build libcoregrind-$(TARGET_ARCH)-linux.a
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libcoregrind-$(arch)-linux
+LOCAL_MODULE := libcoregrind-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_ARM_MODE := arm
 
@@ -250,10 +245,10 @@ LOCAL_CFLAGS := $(common_cflags)
 
 include $(BUILD_STATIC_LIBRARY)
 
-# Build libreplacemalloc_toolpreload-$(arch)-linux.a
+# Build libreplacemalloc_toolpreload-$(TARGET_ARCH)-linux.a
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libreplacemalloc_toolpreload-$(arch)-linux
+LOCAL_MODULE := libreplacemalloc_toolpreload-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_ARM_MODE := arm
 
@@ -268,10 +263,10 @@ LOCAL_CFLAGS := $(common_cflags)
 
 include $(BUILD_STATIC_LIBRARY)
 
-# Build vgpreload_core-$(arch)-linux.so
+# Build vgpreload_core-$(TARGET_ARCH)-linux.so
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := vgpreload_core-$(arch)-linux
+LOCAL_MODULE := vgpreload_core-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/valgrind
@@ -291,10 +286,10 @@ LOCAL_CFLAGS := $(common_cflags)
 
 include $(BUILD_SHARED_LIBRARY)
 
-# Build memcheck-$(arch)-linux
+# Build memcheck-$(TARGET_ARCH)-linux
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := memcheck-$(arch)-linux
+LOCAL_MODULE := memcheck-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/valgrind
@@ -317,14 +312,14 @@ LOCAL_LDFLAGS := $(tool_ldflags)
 
 LOCAL_CFLAGS := $(common_cflags)
 
-LOCAL_STATIC_LIBRARIES := libcoregrind-$(arch)-linux libvex-$(arch)-linux
+LOCAL_STATIC_LIBRARIES := libcoregrind-$(TARGET_ARCH)-linux libvex-$(TARGET_ARCH)-linux
 
 include $(BUILD_EXECUTABLE)
 
-# Build vgpreload_memcheck-$(arch)-linux.so
+# Build vgpreload_memcheck-$(TARGET_ARCH)-linux.so
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := vgpreload_memcheck-$(arch)-linux
+LOCAL_MODULE := vgpreload_memcheck-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/valgrind
@@ -342,14 +337,14 @@ LOCAL_LDFLAGS := $(preload_ldflags)
 
 LOCAL_CFLAGS := $(common_cflags)
 
-LOCAL_WHOLE_STATIC_LIBRARIES := libreplacemalloc_toolpreload-$(arch)-linux
+LOCAL_WHOLE_STATIC_LIBRARIES := libreplacemalloc_toolpreload-$(TARGET_ARCH)-linux
 
 include $(BUILD_SHARED_LIBRARY)
 
-# Build cachegrind-$(arch)-linux
+# Build cachegrind-$(TARGET_ARCH)-linux
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := cachegrind-$(arch)-linux
+LOCAL_MODULE := cachegrind-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/valgrind
@@ -373,14 +368,14 @@ LOCAL_LDFLAGS := $(tool_ldflags)
 
 LOCAL_CFLAGS := $(common_cflags)
 
-LOCAL_STATIC_LIBRARIES := libcoregrind-$(arch)-linux libvex-$(arch)-linux
+LOCAL_STATIC_LIBRARIES := libcoregrind-$(TARGET_ARCH)-linux libvex-$(TARGET_ARCH)-linux
 
 include $(BUILD_EXECUTABLE)
 
-# Build callgrind-$(arch)-linux
+# Build callgrind-$(TARGET_ARCH)-linux
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := callgrind-$(arch)-linux
+LOCAL_MODULE := callgrind-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/valgrind
@@ -419,14 +414,14 @@ LOCAL_LDFLAGS := $(tool_ldflags)
 
 LOCAL_CFLAGS := $(common_cflags)
 
-LOCAL_STATIC_LIBRARIES := libcoregrind-$(arch)-linux libvex-$(arch)-linux
+LOCAL_STATIC_LIBRARIES := libcoregrind-$(TARGET_ARCH)-linux libvex-$(TARGET_ARCH)-linux
 
 include $(BUILD_EXECUTABLE)
 
-# Build helgrind-$(arch)-linux
+# Build helgrind-$(TARGET_ARCH)-linux
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := helgrind-$(arch)-linux
+LOCAL_MODULE := helgrind-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/valgrind
@@ -449,14 +444,14 @@ LOCAL_LDFLAGS := $(tool_ldflags)
 
 LOCAL_CFLAGS := $(common_cflags)
 
-LOCAL_STATIC_LIBRARIES := libcoregrind-$(arch)-linux libvex-$(arch)-linux
+LOCAL_STATIC_LIBRARIES := libcoregrind-$(TARGET_ARCH)-linux libvex-$(TARGET_ARCH)-linux
 
 include $(BUILD_EXECUTABLE)
 
-# Build vgpreload_helgrind-$(arch)-linux.so
+# Build vgpreload_helgrind-$(TARGET_ARCH)-linux.so
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := vgpreload_helgrind-$(arch)-linux
+LOCAL_MODULE := vgpreload_helgrind-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/valgrind
@@ -474,14 +469,14 @@ LOCAL_LDFLAGS := $(preload_ldflags)
 
 LOCAL_CFLAGS := $(common_cflags)
 
-LOCAL_WHOLE_STATIC_LIBRARIES := libreplacemalloc_toolpreload-$(arch)-linux
+LOCAL_WHOLE_STATIC_LIBRARIES := libreplacemalloc_toolpreload-$(TARGET_ARCH)-linux
 
 include $(BUILD_SHARED_LIBRARY)
 
-# Build drd-$(arch)-linux
+# Build drd-$(TARGET_ARCH)-linux
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := drd-$(arch)-linux
+LOCAL_MODULE := drd-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/valgrind
@@ -513,14 +508,14 @@ LOCAL_LDFLAGS := $(tool_ldflags)
 
 LOCAL_CFLAGS := $(common_cflags)
 
-LOCAL_STATIC_LIBRARIES := libcoregrind-$(arch)-linux libvex-$(arch)-linux
+LOCAL_STATIC_LIBRARIES := libcoregrind-$(TARGET_ARCH)-linux libvex-$(TARGET_ARCH)-linux
 
 include $(BUILD_EXECUTABLE)
 
-# Build vgpreload_drd-$(arch)-linux.so
+# Build vgpreload_drd-$(TARGET_ARCH)-linux.so
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := vgpreload_drd-$(arch)-linux
+LOCAL_MODULE := vgpreload_drd-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/valgrind
@@ -540,14 +535,14 @@ LOCAL_LDFLAGS := $(preload_ldflags)
 
 LOCAL_CFLAGS := $(common_cflags)
 
-LOCAL_WHOLE_STATIC_LIBRARIES := libreplacemalloc_toolpreload-$(arch)-linux
+LOCAL_WHOLE_STATIC_LIBRARIES := libreplacemalloc_toolpreload-$(TARGET_ARCH)-linux
 
 include $(BUILD_SHARED_LIBRARY)
 
-# Build massif-$(arch)-linux
+# Build massif-$(TARGET_ARCH)-linux
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := massif-$(arch)-linux
+LOCAL_MODULE := massif-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/valgrind
@@ -565,14 +560,14 @@ LOCAL_LDFLAGS := $(tool_ldflags)
 
 LOCAL_CFLAGS := $(common_cflags)
 
-LOCAL_STATIC_LIBRARIES := libcoregrind-$(arch)-linux libvex-$(arch)-linux
+LOCAL_STATIC_LIBRARIES := libcoregrind-$(TARGET_ARCH)-linux libvex-$(TARGET_ARCH)-linux
 
 include $(BUILD_EXECUTABLE)
 
-# Build vgpreload_massif-$(arch)-linux.so
+# Build vgpreload_massif-$(TARGET_ARCH)-linux.so
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := vgpreload_massif-$(arch)-linux
+LOCAL_MODULE := vgpreload_massif-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/valgrind
@@ -589,14 +584,14 @@ LOCAL_LDFLAGS := $(preload_ldflags)
 
 LOCAL_CFLAGS := $(common_cflags)
 
-LOCAL_WHOLE_STATIC_LIBRARIES := libreplacemalloc_toolpreload-$(arch)-linux
+LOCAL_WHOLE_STATIC_LIBRARIES := libreplacemalloc_toolpreload-$(TARGET_ARCH)-linux
 
 include $(BUILD_SHARED_LIBRARY)
 
-# Build none-$(arch)-linux
+# Build none-$(TARGET_ARCH)-linux
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := none-$(arch)-linux
+LOCAL_MODULE := none-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/valgrind
@@ -614,7 +609,7 @@ LOCAL_LDFLAGS := $(tool_ldflags)
 
 LOCAL_CFLAGS := $(common_cflags)
 
-LOCAL_STATIC_LIBRARIES := libcoregrind-$(arch)-linux libvex-$(arch)-linux
+LOCAL_STATIC_LIBRARIES := libcoregrind-$(TARGET_ARCH)-linux libvex-$(TARGET_ARCH)-linux
 
 include $(BUILD_EXECUTABLE)
 
diff --git a/tsan/Android.mk b/tsan/Android.mk
index 3cdf60eba..7716bce44 100644
--- a/tsan/Android.mk
+++ b/tsan/Android.mk
@@ -14,21 +14,16 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-ifeq ($(TARGET_ARCH),arm)
-	arch := arm
-else ifeq ($(TARGET_ARCH),x86)
-	arch := x86
-endif
-ifdef arch
+ifneq ($(filter arm x86,$(TARGET_ARCH)),)
 
 common_cflags := \
 	-Wall -Wno-deprecated -fno-exceptions -fno-stack-protector \
 	-DTS_VALGRIND=1 \
 	-DTS_VERSION=\"exported\" \
-	-DVGA_$(arch)=1 \
+	-DVGA_$(TARGET_ARCH)=1 \
 	-DVGO_linux=1 \
-	-DVGP_$(arch)_linux=1 \
-	-DVG_PLATFORM=\"$(arch)-linux\" \
+	-DVGP_$(TARGET_ARCH)_linux=1 \
+	-DVG_PLATFORM=\"$(TARGET_ARCH)-linux\" \
 	-D_STLP_NO_IOSTREAMS=1 \
 	-U_FORTIFY_SOURCE
 
@@ -52,10 +47,10 @@ endif
 
 # TODO(eugenis): Add ts_event_names.h generation step
 
-# Build tsan-$(arch)-linux
+# Build tsan-$(TARGET_ARCH)-linux
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := tsan-$(arch)-linux
+LOCAL_MODULE := tsan-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/valgrind
@@ -81,15 +76,15 @@ LOCAL_LDFLAGS := $(tool_ldflags)
 LOCAL_CFLAGS := $(common_cflags)
 LOCAL_CXXFLAGS := $(common_cxxflags)
 LOCAL_RTTI_FLAG := -fno-rtti
-LOCAL_STATIC_LIBRARIES := libcoregrind-$(arch)-linux libvex-$(arch)-linux
+LOCAL_STATIC_LIBRARIES := libcoregrind-$(TARGET_ARCH)-linux libvex-$(TARGET_ARCH)-linux
 
 include $(BUILD_EXECUTABLE)
 
 
-# Build vgpreload_tsan-$(arch)-linux.so
+# Build vgpreload_tsan-$(TARGET_ARCH)-linux.so
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := vgpreload_tsan-$(arch)-linux
+LOCAL_MODULE := vgpreload_tsan-$(TARGET_ARCH)-linux
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/valgrind