ff761fba82
This changes the following module directories:
* webrtc/modules/audio_conference_mixer/interface
* webrtc/modules/interface
* webrtc/modules/media_file/interface
* webrtc/modules/rtp_rtcp/interface
* webrtc/modules/utility/interface
To avoid breaking downstream, I followed this recipe:
1. Copy the interface dir to a new sibling directory: include
2. Update the header guards in the include directory to match the style guide.
3. Update the header guards in the interface directory to match the ones in include. This is required to avoid getting redefinitions in the not-yet-updated downstream code.
4. Add a pragma warning in the header files in the interface dir. Example:
#pragma message("WARNING: webrtc/modules/interface is DEPRECATED; "
"use webrtc/modules/include")
5. Search for all source references to webrtc/modules/interface and update them to webrtc/modules/include (*.c*,*.h,*.mm,*.S)
6. Update all GYP+GN files. This required manual inspection since many subdirectories of webrtc/modules referenced the interface dir using ../interface etc(*.gyp*,*.gn*)
BUG=5095
TESTED=Passing compile-trybots with --clobber flag:
git cl try --clobber --bot=win_compile_rel --bot=linux_compile_rel --bot=android_compile_rel --bot=mac_compile_rel --bot=ios_rel -m tryserver.webrtc
R=stefan@webrtc.org, tommi@webrtc.org
Review URL: https://codereview.webrtc.org/1417683006 .
Cr-Commit-Position: refs/heads/master@{#10500}
68 lines
2.4 KiB
C++
68 lines
2.4 KiB
C++
/*
|
|
* Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_BUILD_INFO_H_
|
|
#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_BUILD_INFO_H_
|
|
|
|
#include <jni.h>
|
|
#include <string>
|
|
|
|
#include "webrtc/modules/utility/include/jvm_android.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Utility class used to query the Java class (org/webrtc/voiceengine/BuildInfo)
|
|
// for device and Android build information.
|
|
// The calling thread is attached to the JVM at construction if needed and a
|
|
// valid Java environment object is also created.
|
|
// All Get methods must be called on the creating thread. If not, the code will
|
|
// hit RTC_DCHECKs when calling JNIEnvironment::JavaToStdString().
|
|
class BuildInfo {
|
|
public:
|
|
BuildInfo();
|
|
~BuildInfo() {}
|
|
|
|
// End-user-visible name for the end product (e.g. "Nexus 6").
|
|
std::string GetDeviceModel();
|
|
// Consumer-visible brand (e.g. "google").
|
|
std::string GetBrand();
|
|
// Manufacturer of the product/hardware (e.g. "motorola").
|
|
std::string GetDeviceManufacturer();
|
|
// Android build ID (e.g. LMY47D).
|
|
std::string GetAndroidBuildId();
|
|
// The type of build (e.g. "user" or "eng").
|
|
std::string GetBuildType();
|
|
// The user-visible version string (e.g. "5.1").
|
|
std::string GetBuildRelease();
|
|
// The user-visible SDK version of the framework (e.g. 21).
|
|
std::string GetSdkVersion();
|
|
|
|
private:
|
|
// Helper method which calls a static getter method with |name| and returns
|
|
// a string from Java.
|
|
std::string GetStringFromJava(const char* name);
|
|
|
|
// Ensures that this class can access a valid JNI interface pointer even
|
|
// if the creating thread was not attached to the JVM.
|
|
AttachCurrentThreadIfNeeded attach_thread_if_needed_;
|
|
|
|
// Provides access to the JNIEnv interface pointer and the JavaToStdString()
|
|
// method which is used to translate Java strings to std strings.
|
|
rtc::scoped_ptr<JNIEnvironment> j_environment_;
|
|
|
|
// Holds the jclass object and provides access to CallStaticObjectMethod().
|
|
// Used by GetStringFromJava() during construction only.
|
|
JavaClass j_build_info_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_BUILD_INFO_H_
|