Roll base to 0032c8e1a72eb85d947d8df8de503caa62b4d0a8. TBR=jamesr@chromium.org Review URL: https://codereview.chromium.org/2057223002 .
diff --git a/DEPS b/DEPS index 9107191..dd1215c 100644 --- a/DEPS +++ b/DEPS
@@ -19,7 +19,7 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', - 'base_revision': 'ec59756cc1ad02cc835bcca10056a621c9eb346c', + 'base_revision': '0032c8e1a72eb85d947d8df8de503caa62b4d0a8', 'boringssl_revision': '2deb984187ce8f6c739c780e7fe95e859e93b3da', 'buildtools_revision': '222bd42ce39d1bd8f08fe089b066f49c469e1cdf', 'gurl_revision': '718eee97ed6a4df41d14726eb2eddc871d9eaaa3',
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni index 08fe1e5..1552bc2 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni
@@ -490,8 +490,8 @@ visibility = invoker.visibility } public_deps = [ - ":${target_name}__jar_toc", ":$_output_jar_target", + ":${target_name}__jar_toc", ] } } @@ -1084,9 +1084,7 @@ } _java_files = [] - if (defined(invoker.java_files)) { - _java_files = invoker.java_files - } else if (defined(invoker.DEPRECATED_java_in_dir)) { + if (defined(invoker.DEPRECATED_java_in_dir)) { _src_dir = invoker.DEPRECATED_java_in_dir + "/src" _src_dir_exists = exec_script("//build/dir_exists.py", [ rebase_path(_src_dir, root_build_dir) ], @@ -1095,16 +1093,20 @@ "In GN, java_in_dir should be the fully specified java directory " + "(i.e. including the trailing \"/src\")") - _java_files_build_rel = exec_script( - "//build/android/gyp/find.py", - [ - "--pattern", - "*.java", - rebase_path(invoker.DEPRECATED_java_in_dir, root_build_dir), - ], - "list lines") + _java_files_build_rel = + exec_script("//build/android/gyp/find.py", + [ + "--pattern", + "*.java", + rebase_path(invoker.DEPRECATED_java_in_dir, + root_build_dir), + ], + "list lines") _java_files = rebase_path(_java_files_build_rel, ".", root_build_dir) } + if (defined(invoker.java_files)) { + _java_files += invoker.java_files + } assert(_java_files != [] || _srcjar_deps != [] || _srcjars != []) _compile_java_target = "${_template_name}__compile_java"
diff --git a/net/android/gurl_utils.cc b/net/android/gurl_utils.cc index 8fcfe0d..5b2ff3f 100644 --- a/net/android/gurl_utils.cc +++ b/net/android/gurl_utils.cc
@@ -10,13 +10,17 @@ namespace net { -ScopedJavaLocalRef<jstring> GetOrigin(JNIEnv* env, jclass clazz, jstring url) { +ScopedJavaLocalRef<jstring> GetOrigin(JNIEnv* env, + const JavaParamRef<jclass>& clazz, + const JavaParamRef<jstring>& url) { GURL host(base::android::ConvertJavaStringToUTF16(env, url)); return base::android::ConvertUTF8ToJavaString(env, host.GetOrigin().spec()); } -ScopedJavaLocalRef<jstring> GetScheme(JNIEnv* env, jclass clazz, jstring url) { +ScopedJavaLocalRef<jstring> GetScheme(JNIEnv* env, + const JavaParamRef<jclass>& clazz, + const JavaParamRef<jstring>& url) { GURL host(base::android::ConvertJavaStringToUTF16(env, url)); return base::android::ConvertUTF8ToJavaString(env, host.scheme());
diff --git a/net/android/network_change_notifier_delegate_android.cc b/net/android/network_change_notifier_delegate_android.cc index 856acfe..ec8a729 100644 --- a/net/android/network_change_notifier_delegate_android.cc +++ b/net/android/network_change_notifier_delegate_android.cc
@@ -45,7 +45,7 @@ } // namespace jdouble GetMaxBandwidthForConnectionSubtype(JNIEnv* env, - jclass caller, + const JavaParamRef<jclass>& caller, jint subtype) { return NetworkChangeNotifierAndroid::GetMaxBandwidthForConnectionSubtype( ConvertConnectionSubtype(subtype));
diff --git a/net/cert/x509_util_android.cc b/net/cert/x509_util_android.cc index 9648ffb..2a91f4a 100644 --- a/net/cert/x509_util_android.cc +++ b/net/cert/x509_util_android.cc
@@ -12,12 +12,12 @@ namespace net { -void NotifyKeyChainChanged(JNIEnv* env, jclass clazz) { +void NotifyKeyChainChanged(JNIEnv* env, const JavaParamRef<jclass>& clazz) { CertDatabase::GetInstance()->OnAndroidKeyChainChanged(); } void RecordCertVerifyCapabilitiesHistogram(JNIEnv* env, - jclass clazz, + const JavaParamRef<jclass>& clazz, jboolean found_system_trust_roots) { // Only record the histogram for 4.2 and up. Before 4.2, the platform doesn't // return the certificate chain anyway. @@ -27,7 +27,9 @@ } } -ScopedJavaLocalRef<jobject> GetApplicationContext(JNIEnv* env, jclass clazz) { +ScopedJavaLocalRef<jobject> GetApplicationContext( + JNIEnv* env, + const JavaParamRef<jclass>& clazz) { ScopedJavaLocalRef<jobject> r; // Must use Reset to force creation of a new local ref, instead of trying to // adopt the global-ref'ed jobject as a local ref as the constructor would.
diff --git a/testing/android/native_test/native_test_launcher.cc b/testing/android/native_test/native_test_launcher.cc index 343f118..52b419d 100644 --- a/testing/android/native_test/native_test_launcher.cc +++ b/testing/android/native_test/native_test_launcher.cc
@@ -70,12 +70,12 @@ } // namespace static void RunTests(JNIEnv* env, - jobject obj, - jstring jcommand_line_flags, - jstring jcommand_line_file_path, - jstring jstdout_file_path, + const JavaParamRef<jobject>& obj, + const JavaParamRef<jstring>& jcommand_line_flags, + const JavaParamRef<jstring>& jcommand_line_file_path, + const JavaParamRef<jstring>& jstdout_file_path, jboolean jstdout_fifo, - jobject app_context) { + const JavaParamRef<jobject>& app_context) { // Command line initialized basically, will be fully initialized later. static const char* const kInitialArgv[] = { "ChromeTestActivity" }; base::CommandLine::Init(arraysize(kInitialArgv), kInitialArgv);