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

Side by Side Diff: base/android/build_info.cc

Issue 2828823002: Android: Add version suffix to extracted .pak files (Closed)
Patch Set: fix typo Created 3 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/android/build_info.h" 5 #include "base/android/build_info.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 android_build_fp_( 51 android_build_fp_(
52 StrDupJString(Java_BuildInfo_getAndroidBuildFingerprint(env))), 52 StrDupJString(Java_BuildInfo_getAndroidBuildFingerprint(env))),
53 gms_version_code_(StrDupJString(Java_BuildInfo_getGMSVersionCode(env))), 53 gms_version_code_(StrDupJString(Java_BuildInfo_getGMSVersionCode(env))),
54 package_version_code_( 54 package_version_code_(
55 StrDupJString(Java_BuildInfo_getPackageVersionCode(env))), 55 StrDupJString(Java_BuildInfo_getPackageVersionCode(env))),
56 package_version_name_( 56 package_version_name_(
57 StrDupJString(Java_BuildInfo_getPackageVersionName(env))), 57 StrDupJString(Java_BuildInfo_getPackageVersionName(env))),
58 package_label_(StrDupJString(Java_BuildInfo_getPackageLabel(env))), 58 package_label_(StrDupJString(Java_BuildInfo_getPackageLabel(env))),
59 package_name_(StrDupJString(Java_BuildInfo_getPackageName(env))), 59 package_name_(StrDupJString(Java_BuildInfo_getPackageName(env))),
60 build_type_(StrDupJString(Java_BuildInfo_getBuildType(env))), 60 build_type_(StrDupJString(Java_BuildInfo_getBuildType(env))),
61 extracted_file_suffix_(
62 ConvertJavaStringToUTF8(Java_BuildInfo_getExtractedFileSuffix(env))),
61 sdk_int_(Java_BuildInfo_getSdkInt(env)), 63 sdk_int_(Java_BuildInfo_getSdkInt(env)),
62 java_exception_info_(NULL) {} 64 java_exception_info_(NULL) {}
63 65
64 // static 66 // static
65 BuildInfo* BuildInfo::GetInstance() { 67 BuildInfo* BuildInfo::GetInstance() {
66 return Singleton<BuildInfo, BuildInfoSingletonTraits >::get(); 68 return Singleton<BuildInfo, BuildInfoSingletonTraits >::get();
67 } 69 }
68 70
69 void BuildInfo::SetJavaExceptionInfo(const std::string& info) { 71 void BuildInfo::SetJavaExceptionInfo(const std::string& info) {
70 DCHECK(!java_exception_info_) << "info should be set only once."; 72 DCHECK(!java_exception_info_) << "info should be set only once.";
71 java_exception_info_ = strndup(info.c_str(), 4096); 73 java_exception_info_ = strndup(info.c_str(), 4096);
72 } 74 }
73 75
74 void BuildInfo::ClearJavaExceptionInfo() { 76 void BuildInfo::ClearJavaExceptionInfo() {
75 delete java_exception_info_; 77 delete java_exception_info_;
76 java_exception_info_ = nullptr; 78 java_exception_info_ = nullptr;
77 } 79 }
78 80
79 } // namespace android 81 } // namespace android
80 } // namespace base 82 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698