summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorhusky@chromium.org <husky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-30 13:40:38 +0000
committerhusky@chromium.org <husky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-30 13:40:38 +0000
commitd31afe7d7857c68d4ea8d9bccb2a70688a4f2edd (patch)
tree429d6235f45f48cfb486970b2d0c917a0829e75b /build
parentcd1177991859a25f39dc70502ad68dae82e9ec8e (diff)
downloadchromium_src-d31afe7d7857c68d4ea8d9bccb2a70688a4f2edd.zip
chromium_src-d31afe7d7857c68d4ea8d9bccb2a70688a4f2edd.tar.gz
chromium_src-d31afe7d7857c68d4ea8d9bccb2a70688a4f2edd.tar.bz2
Fix segfault in JNIEnv function hooks for test
On newer JB builds, the JNINativeInterface struct appears to be held in read-only memory so attempting to repoint individual function pointers in it causes segfault. So instead we repoint the top-level struct pointer to refer to our own copy held in read/write memory. BUG=137348 TEST=JNIAndroidTest Review URL: https://chromiumcodereview.appspot.com/10828050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148943 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/android/gtest_filter/base_unittests_disabled5
1 files changed, 1 insertions, 4 deletions
diff --git a/build/android/gtest_filter/base_unittests_disabled b/build/android/gtest_filter/base_unittests_disabled
index ddbebad..72530cb 100644
--- a/build/android/gtest_filter/base_unittests_disabled
+++ b/build/android/gtest_filter/base_unittests_disabled
@@ -24,9 +24,6 @@ FileUtilProxyTest.Touch
ProcessUtilTest.FDRemapping
# Flaky?
ScopedJavaRefTest.RefCounts
-# http://crbug.com/137348
-JNIAndroidTest.GetMethodIDFromClassNameCaching
-ScopedJavaRefTest.Conversions
-
# Death tests are not supported with apks.
*DeathTest*
+