64cf731ce4
This CL also includes a fix in: webrtc/test/android/AndroidManifest.xml. Change log:2c98648a24..37c4da4be1Full diff:2c98648a24..37c4da4be1Changed dependencies: * src/base:ed313e8c6c..6afa983e37* src/build:b734510a01..1e64514e9a* src/ios:d48cc0d3d6..1f2dde49c3* src/testing:7e6cab0619..b4bd3e1fde* src/third_party:bcdd2c72a7..d5ab621035* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/6a7c1ed24c..3994526859 * src/tools:22c4d769bf..0f9e34ac82DEPS diff:2c98648a24..37c4da4be1/DEPS No update to Clang. TBR=buildbot@webrtc.org,phoglund@webrtc.org BUG=None CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal Forward fixing the Chromium Roll. Change-Id: If36b97067fa43dc13f43e85fca706d0b5526c3d6 Reviewed-on: https://webrtc-review.googlesource.com/56640 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22148}
47 lines
2.2 KiB
XML
47 lines
2.2 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
Copyright 2017 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.
|
|
-->
|
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
package="org.webrtc.native_test"
|
|
android:versionCode="1"
|
|
android:versionName="1.0">
|
|
|
|
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
|
<uses-permission android:name="android.permission.BLUETOOTH"/>
|
|
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
|
|
<uses-permission android:name="android.permission.CAMERA" />
|
|
<uses-permission android:name="android.permission.INTERNET"/>
|
|
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
|
|
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
|
|
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
|
|
|
<application android:label="NativeTests"
|
|
android:name="org.chromium.native_test.NativeTestApplication">
|
|
<uses-library android:name="android.test.runner"/>
|
|
<activity android:name=".RTCNativeUnitTestActivity"
|
|
android:label="NativeTest"
|
|
android:configChanges="orientation|keyboardHidden"
|
|
android:process=":test_process">
|
|
<intent-filter>
|
|
<action android:name="android.intent.action.MAIN" />
|
|
<category android:name="android.intent.category.LAUNCHER" />
|
|
</intent-filter>
|
|
</activity>
|
|
</application>
|
|
|
|
<instrumentation android:name="org.chromium.native_test.NativeTestInstrumentationTestRunner"
|
|
android:targetPackage="org.webrtc.native_test"
|
|
android:label="Instrumentation entry point for org.webrtc.native_test"/>
|
|
|
|
</manifest>
|