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

Unified Diff: net/cronet/android/sample/javatests/AndroidManifest.xml

Issue 145213003: Initial upload of cronet for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed copyright year on sample code back to 2012 Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: net/cronet/android/sample/javatests/AndroidManifest.xml
diff --git a/remoting/android/javatests/AndroidManifest.xml b/net/cronet/android/sample/javatests/AndroidManifest.xml
similarity index 71%
copy from remoting/android/javatests/AndroidManifest.xml
copy to net/cronet/android/sample/javatests/AndroidManifest.xml
index b57228c05badb7144aa114ce101f91b602d7fb82..fd3ac5e2dbdb9f35f825ecac5e5ff854c15e7d8f 100644
--- a/remoting/android/javatests/AndroidManifest.xml
+++ b/net/cronet/android/sample/javatests/AndroidManifest.xml
@@ -1,22 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
- <!-- Copyright 2013 The Chromium Authors. All rights reserved.
+ <!-- Copyright 2014 The Chromium Authors. All rights reserved.
+
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
- -->
-
+ -->
<!-- package name must be unique so suffix with "tests" so package loader
doesn't ignore this. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.chromium.chromoting.tests">
+ package="org.chromium.cronet_sample_apk.tests">
<!-- We add an application tag here just so that we can indicate that this
package needs to link against the android.test library, which is
needed when building test cases. -->
<application>
<uses-library android:name="android.test.runner" />
</application>
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" />
+ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" />
<instrumentation android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="org.chromium.chromoting"
- android:label="Tests for org.chromium.chromoting"/>
+ android:targetPackage="org.chromium.cronet_sample_apk"
+ android:label="Tests for org.chromium.cronet_sample_apk"/>
<uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
+ <uses-permission android:name="android.permission.INJECT_EVENTS" />
</manifest>

Powered by Google App Engine
This is Rietveld 408576698