am 63f91325: am 652dd63a: Merge "Remove invalid atomic image compare swap tests from...

* commit '63f91325aef88dd7842a5065d6f8e5425c84dc2f':
  Remove invalid atomic image compare swap tests from mustpass.

diff --git a/Android.mk b/Android.mk
index 6e9028e..b047f74 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -548,6 +548,11 @@ LOCAL_NDK_STL_VARIANT := gnustl_static
 LOCAL_RTTI_FLAG := -frtti -fexceptions
 LOCAL_MULTILIB := both
 
+# b/18934246, failed to link libtestercore for clang mips.
+ifeq ($(TARGET_ARCH),mips)
+  LOCAL_CLANG := false
+endif
+
 include $(BUILD_SHARED_LIBRARY)
 
 include $(LOCAL_PATH)/android/package/Android.mk

diff --git a/modules/glshared/glsVertexArrayTests.cpp b/modules/glshared/glsVertexArrayTests.cpp
index 4c9c19b..919e702 100644 (file)
--- a/modules/glshared/glsVertexArrayTests.cpp
+++ b/modules/glshared/glsVertexArrayTests.cpp
@@ -460,7 +460,7 @@ inline GLValue::Double abs (GLValue::Double val)
 }
 
 template<class T>
-inline static void alignmentSafeAssignment (char* dst, T val)
+static inline void alignmentSafeAssignment (char* dst, T val)
 {
        std::memcpy(dst, &val, sizeof(T));
 }