am ca60962c: Remove large draw_indirect.compute_interop tests
authorKalle Raita <kraita@google.com>
Thu, 24 Sep 2015 22:09:44 +0000 (22:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Sep 2015 22:09:44 +0000 (22:09 +0000)
* commit 'ca60962c06f071d7a40bade0771c5a60b8f18864':
  Remove large draw_indirect.compute_interop tests

Android.mk
framework/platform/android/tcuAndroidInternals.hpp

index 3a6e7a0..f436453 100644 (file)
@@ -735,11 +735,6 @@ 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
index 1d7d231..b52dd51 100644 (file)
@@ -63,7 +63,6 @@ enum
        ALREADY_EXISTS          = -EEXIST,
        DEAD_OBJECT                     = -EPIPE,
        FAILED_TRANSACTION      = (UNKNOWN_ERROR + 2),
-       JPARKS_BROKE_IT         = -EPIPE,
        BAD_INDEX                       = -E2BIG,
        NOT_ENOUGH_DATA         = (UNKNOWN_ERROR + 3),
        WOULD_BLOCK                     = (UNKNOWN_ERROR + 4),