Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(778)

Unified Diff: base/android/build_info.cc

Issue 1641513004: Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/android/build_info.h ('k') | base/android/cxa_demangle_stub.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/build_info.cc
diff --git a/base/android/build_info.cc b/base/android/build_info.cc
index 4d3cd559edeb59c4cf63f1c3e86829bd988c9809..93667ef2ba0325274473c77b09e319366a0d4b55 100644
--- a/base/android/build_info.cc
+++ b/base/android/build_info.cc
@@ -48,20 +48,21 @@ BuildInfo::BuildInfo(JNIEnv* 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() {
« no previous file with comments | « base/android/build_info.h ('k') | base/android/cxa_demangle_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698