1 # Local patches for libmojo. 2 3 --- a/base/android/jni_android.cc 4 +++ b/base/android/jni_android.cc 5 @@ -253,7 +253,11 @@ void CheckException(JNIEnv* env) { 6 } 7 8 // Now, feel good about it and die. 9 - LOG(FATAL) << "Please include Java exception stack in crash report"; 10 + // TODO(lhchavez): Remove this hack. See b/28814913 for details. 11 + if (java_throwable) 12 + LOG(FATAL) << GetJavaExceptionInfo(env, java_throwable); 13 + else 14 + LOG(FATAL) << "Unhandled exception"; 15 } 16 17 std::string GetJavaExceptionInfo(JNIEnv* env, jthrowable java_throwable) { 18 --- a/build/android/gyp/util/build_utils.py 19 +++ b/build/android/gyp/util/build_utils.py 20 @@ -25,8 +25,16 @@ import zipfile 21 # Some clients do not add //build/android/gyp to PYTHONPATH. 22 import md5_check # pylint: disable=relative-import 23 24 -sys.path.append(os.path.join(os.path.dirname(__file__), 25 - os.pardir, os.pardir, os.pardir)) 26 +# pylib conflicts with mojo/public/tools/bindings/pylib. Prioritize 27 +# build/android/pylib. 28 +# PYTHONPATH wouldn't help in this case, because soong put source files under 29 +# temp directory for each build, so the abspath is unknown until the 30 +# execution. 31 +#sys.path.append(os.path.join(os.path.dirname(__file__), 32 +# os.pardir, os.pardir, os.pardir)) 33 +sys.path.insert(0, os.path.join(os.path.dirname(__file__), 34 + os.pardir, os.pardir)) 35 + 36 import gn_helpers 37 38 # Definition copied from pylib/constants/__init__.py to avoid adding 39
