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

Side by Side Diff: webrtc/modules/audio_device/android/build_info.h

Issue 2533573002: Move ADM specific Android files into modules/audio_device/android/ (Closed)
Patch Set: re-add dep Created 4 years 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 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_BUILD_INFO_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_BUILD_INFO_H_
12 #define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_BUILD_INFO_H_ 12 #define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_BUILD_INFO_H_
13 13
14 #include <jni.h> 14 #include <jni.h>
15 #include <memory> 15 #include <memory>
16 #include <string> 16 #include <string>
17 17
18 #include "webrtc/modules/utility/include/jvm_android.h" 18 #include "webrtc/modules/audio_device/android/jvm_android.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 21
22 // This enumeration maps to the values returned by BuildInfo::GetSdkVersion(), 22 // This enumeration maps to the values returned by BuildInfo::GetSdkVersion(),
23 // indicating the Android release associated with a given SDK version. 23 // indicating the Android release associated with a given SDK version.
24 // See https://developer.android.com/guide/topics/manifest/uses-sdk-element.html 24 // See https://developer.android.com/guide/topics/manifest/uses-sdk-element.html
25 // for details. 25 // for details.
26 enum SdkCode { 26 enum SdkCode {
27 SDK_CODE_JELLY_BEAN = 16, // Android 4.1 27 SDK_CODE_JELLY_BEAN = 16, // Android 4.1
28 SDK_CODE_JELLY_BEAN_MR1 = 17, // Android 4.2 28 SDK_CODE_JELLY_BEAN_MR1 = 17, // Android 4.2
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 std::unique_ptr<JNIEnvironment> j_environment_; 76 std::unique_ptr<JNIEnvironment> j_environment_;
77 77
78 // Holds the jclass object and provides access to CallStaticObjectMethod(). 78 // Holds the jclass object and provides access to CallStaticObjectMethod().
79 // Used by GetStringFromJava() during construction only. 79 // Used by GetStringFromJava() during construction only.
80 JavaClass j_build_info_; 80 JavaClass j_build_info_;
81 }; 81 };
82 82
83 } // namespace webrtc 83 } // namespace webrtc
84 84
85 #endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_BUILD_INFO_H_ 85 #endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_BUILD_INFO_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698