diff options
| author | agrieve <agrieve@chromium.org> | 2016-01-14 17:27:27 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-15 01:28:50 +0000 |
| commit | 8d9760336fca653d8fbaa626a6d83142e87af726 (patch) | |
| tree | 9e997e5428d6cf795bf34242843e3f2fb6c801c5 /remoting/android | |
| parent | 0cdedd8bcb208f66b82b558583df624fd5cd583f (diff) | |
| download | chromium_src-8d9760336fca653d8fbaa626a6d83142e87af726.zip chromium_src-8d9760336fca653d8fbaa626a6d83142e87af726.tar.gz chromium_src-8d9760336fca653d8fbaa626a6d83142e87af726.tar.bz2 | |
GN: Fix remoting_test_apk compile when is_chrome_branded=true
Without this, we were getting:
Exception: Wrong instrumented package. Expected
com.google.chromeremotedesktop, got org.chromium.chromoting
BUG=577483
Review URL: https://codereview.chromium.org/1573913010
Cr-Commit-Position: refs/heads/master@{#369647}
Diffstat (limited to 'remoting/android')
| -rw-r--r-- | remoting/android/BUILD.gn | 12 | ||||
| -rw-r--r-- | remoting/android/javatests/AndroidManifest.xml.jinja2 (renamed from remoting/android/javatests/AndroidManifest.xml) | 6 |
2 files changed, 14 insertions, 4 deletions
diff --git a/remoting/android/BUILD.gn b/remoting/android/BUILD.gn index b14baf8..e4542d1 100644 --- a/remoting/android/BUILD.gn +++ b/remoting/android/BUILD.gn @@ -121,13 +121,23 @@ remoting_apk_tmpl("remoting_apk") { ] } +remoting_localize("remoting_test_apk_manifest") { + sources = [ + "javatests/AndroidManifest.xml.jinja2", + ] + locales = [ "en" ] + variables = [ branding_path ] + output = "$root_gen_dir/remoting/android_test/{{source_name_part}}" +} + instrumentation_test_apk("remoting_test_apk") { - android_manifest = "javatests/AndroidManifest.xml" + android_manifest = "$root_gen_dir/remoting/android_test/AndroidManifest.xml" apk_name = "ChromotingTest" apk_under_test = ":remoting_apk" DEPRECATED_java_in_dir = "javatests/src" deps = [ ":remoting_android_client_java", + ":remoting_test_apk_manifest", "//base:base_java", "//base:base_java_test_support", ] diff --git a/remoting/android/javatests/AndroidManifest.xml b/remoting/android/javatests/AndroidManifest.xml.jinja2 index 85abf2a..0f66040 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> |