Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

base/android/build_info.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/android/build_info.h"
 
 #include <string>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 30 matching lines @@
   static const bool kAllowedToAccessOnNonjoinableThread = true;
 #endif
 };
 
 BuildInfo::BuildInfo(JNIEnv* env)
     : device_(StrDupJString(Java_BuildInfo_getDevice(env))),
       manufacturer_(StrDupJString(Java_BuildInfo_getDeviceManufacturer(env))),
       model_(StrDupJString(Java_BuildInfo_getDeviceModel(env))),
       brand_(StrDupJString(Java_BuildInfo_getBrand(env))),
       android_build_id_(StrDupJString(Java_BuildInfo_getAndroidBuildId(env))),
-      android_build_fp_(StrDupJString(
-          Java_BuildInfo_getAndroidBuildFingerprint(env))),
-      package_version_code_(StrDupJString(Java_BuildInfo_getPackageVersionCode(
-          env, GetApplicationContext()))),
-      package_version_name_(StrDupJString(Java_BuildInfo_getPackageVersionName(
-          env, GetApplicationContext()))),
-      package_label_(StrDupJString(Java_BuildInfo_getPackageLabel(
-          env, GetApplicationContext()))),
-      package_name_(StrDupJString(Java_BuildInfo_getPackageName(
-          env, GetApplicationContext()))),
+      android_build_fp_(
+          StrDupJString(Java_BuildInfo_getAndroidBuildFingerprint(env))),
+      package_version_code_(StrDupJString(
+          Java_BuildInfo_getPackageVersionCode(env, GetApplicationContext()))),
+      package_version_name_(StrDupJString(
+          Java_BuildInfo_getPackageVersionName(env, GetApplicationContext()))),
+      package_label_(StrDupJString(
+          Java_BuildInfo_getPackageLabel(env, GetApplicationContext()))),
+      package_name_(StrDupJString(
+          Java_BuildInfo_getPackageName(env, GetApplicationContext()))),
       build_type_(StrDupJString(Java_BuildInfo_getBuildType(env))),
       sdk_int_(Java_BuildInfo_getSdkInt(env)),
-      java_exception_info_(NULL) {
-}
+      has_language_apk_splits_(
+          Java_BuildInfo_hasLanguageApkSplits(env, GetApplicationContext())),
+      java_exception_info_(NULL) {}
 
 // static
 BuildInfo* BuildInfo::GetInstance() {
   return Singleton<BuildInfo, BuildInfoSingletonTraits >::get();
 }
 
 void BuildInfo::SetJavaExceptionInfo(const std::string& info) {
   DCHECK(!java_exception_info_) << "info should be set only once.";
   java_exception_info_ = strndup(info.c_str(), 4096);
 }
 
 void BuildInfo::ClearJavaExceptionInfo() {
   delete java_exception_info_;
   java_exception_info_ = nullptr;
 }
 
 // static
 bool BuildInfo::RegisterBindings(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace base