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

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

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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 #ifndef BASE_ANDROID_BUILD_INFO_H_ 5 #ifndef BASE_ANDROID_BUILD_INFO_H_
6 #define BASE_ANDROID_BUILD_INFO_H_ 6 #define BASE_ANDROID_BUILD_INFO_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include <string> 10 #include <string>
11 11
12 #include "base/base_export.h" 12 #include "base/base_export.h"
13 #include "base/memory/singleton.h" 13 #include "base/memory/singleton.h"
14 14
15 namespace base { 15 namespace base {
16 namespace android { 16 namespace android {
17 17
18 // This enumeration maps to the values returned by BuildInfo::sdk_int(), 18 // This enumeration maps to the values returned by BuildInfo::sdk_int(),
19 // indicating the Android release associated with a given SDK version. 19 // indicating the Android release associated with a given SDK version.
20 enum SdkVersion { 20 enum SdkVersion {
21 SDK_VERSION_ICE_CREAM_SANDWICH = 14,
22 SDK_VERSION_ICE_CREAM_SANDWICH_MR1 = 15,
23 SDK_VERSION_JELLY_BEAN = 16, 21 SDK_VERSION_JELLY_BEAN = 16,
24 SDK_VERSION_JELLY_BEAN_MR1 = 17, 22 SDK_VERSION_JELLY_BEAN_MR1 = 17,
25 SDK_VERSION_JELLY_BEAN_MR2 = 18, 23 SDK_VERSION_JELLY_BEAN_MR2 = 18,
26 SDK_VERSION_KITKAT = 19, 24 SDK_VERSION_KITKAT = 19,
27 SDK_VERSION_KITKAT_WEAR = 20, 25 SDK_VERSION_KITKAT_WEAR = 20,
28 SDK_VERSION_LOLLIPOP = 21 26 SDK_VERSION_LOLLIPOP = 21
29 }; 27 };
30 28
31 // BuildInfo is a singleton class that stores android build and device 29 // BuildInfo is a singleton class that stores android build and device
32 // information. It will be called from Android specific code and gets used 30 // information. It will be called from Android specific code and gets used
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 // This is set via set_java_exception_info, not at constructor time. 127 // This is set via set_java_exception_info, not at constructor time.
130 const char* java_exception_info_; 128 const char* java_exception_info_;
131 129
132 DISALLOW_COPY_AND_ASSIGN(BuildInfo); 130 DISALLOW_COPY_AND_ASSIGN(BuildInfo);
133 }; 131 };
134 132
135 } // namespace android 133 } // namespace android
136 } // namespace base 134 } // namespace base
137 135
138 #endif // BASE_ANDROID_BUILD_INFO_H_ 136 #endif // BASE_ANDROID_BUILD_INFO_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698