From 571ca6eee0e627c90f00b500d0871c05f7f4fe7d Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Mon, 6 Mar 2017 10:13:39 +0000
Subject: [PATCH] Disable 115-native-bridge in Makefile.

bug:35984597
Change-Id: I26fc9db839ae5229c7f2d82603e1172bddd07470
---
 test/Android.run-test.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index bfb04a4fb..e86340e91 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -222,6 +222,7 @@ define name-to-var
 $(shell echo $(1) | tr '[:lower:]' '[:upper:]' | tr '-' '_')
 endef  # name-to-var
 
+# Disable 115-native-bridge, it fails when run through make b/35984597.
 # Disable 153-reference-stress temporarily until a fix arrives. b/33389022.
 # Disable 080-oom-fragmentation due to flakes. b/33795328
 # Disable 497-inlining-and-class-loader and 542-unresolved-access-check until
@@ -229,6 +230,7 @@ endef  # name-to-var
 #     register a dex file that's already registered with a different loader.
 #     b/34193123
 ART_TEST_RUN_TEST_SKIP += \
+  115-native-bridge \
   153-reference-stress \
   080-oom-fragmentation \
   497-inlining-and-class-loader \
-- 
2.11.0