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

Unified Diff: remoting/android/javatests/AndroidManifest.xml.jinja2

Issue 1573913010: GN: Fix remoting_test_apk compile when is_chrome_branded=true (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « remoting/android/javatests/AndroidManifest.xml ('k') | remoting/remoting_android.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/android/javatests/AndroidManifest.xml.jinja2
diff --git a/remoting/android/javatests/AndroidManifest.xml b/remoting/android/javatests/AndroidManifest.xml.jinja2
similarity index 85%
rename from remoting/android/javatests/AndroidManifest.xml
rename to remoting/android/javatests/AndroidManifest.xml.jinja2
index 85abf2ab409aeb196f4ffba4be22e54b14523bd4..0f660406a63f3d23ee3f64d53bfa89406813e3b2 100644
--- a/remoting/android/javatests/AndroidManifest.xml
+++ b/remoting/android/javatests/AndroidManifest.xml.jinja2
@@ -7,7 +7,7 @@
<!-- 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="{{ APK_PACKAGE_NAME }}.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. -->
@@ -17,6 +17,6 @@
<uses-library android:name="android.test.runner" />
</application>
<instrumentation android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="org.chromium.chromoting"
- android:label="Tests for org.chromium.chromoting"/>
+ android:targetPackage="{{ APK_PACKAGE_NAME }}"
+ android:label="Tests for {{ APK_PACKAGE_NAME }}"/>
</manifest>
« no previous file with comments | « remoting/android/javatests/AndroidManifest.xml ('k') | remoting/remoting_android.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698