diff options
| author | jdonnelly <jdonnelly@chromium.org> | 2015-04-24 15:53:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-24 22:53:46 +0000 |
| commit | 47b4c2f01324a903410ae9530156c2469601e91b (patch) | |
| tree | 23ab071ba802384fba43f3b8932cdb8339ebb129 /android_webview | |
| parent | a4f783321e7f49a6e39d47470f002c65925569b6 (diff) | |
| download | chromium_src-47b4c2f01324a903410ae9530156c2469601e91b.zip chromium_src-47b4c2f01324a903410ae9530156c2469601e91b.tar.gz chromium_src-47b4c2f01324a903410ae9530156c2469601e91b.tar.bz2 | |
Revert of [Android] Add an out-of-app instrumentation driver APK. (patchset #15 id:280001 of https://codereview.chromium.org/1034053002/)
Reason for revert:
Broke the "Android" bot:
http://build.chromium.org/p/chromium/builders/Android/builds/38661
Original issue's description:
> [Android] Add an out-of-app instrumentation driver APK.
>
> BUG=444049
>
> Committed: https://crrev.com/79d22ed2b74d0ff1082f6febfd3fd93c0574d130
> Cr-Commit-Position: refs/heads/master@{#326900}
TBR=tedchoc@chromium.org,klundberg@chromium.org,yfriedman@chromium.org,thestig@chromium.org,cjhopman@chromium.org,torne@chromium.org,jbudorick@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=444049
Review URL: https://codereview.chromium.org/1094903008
Cr-Commit-Position: refs/heads/master@{#326914}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/android_webview_tests.gypi | 2 | ||||
| -rw-r--r-- | android_webview/javatests/AndroidManifest.xml | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi index 9e4c3d0..577cab4 100644 --- a/android_webview/android_webview_tests.gypi +++ b/android_webview/android_webview_tests.gypi @@ -94,8 +94,6 @@ '../base/base.gyp:base_java_test_support', '../content/content_shell_and_tests.gyp:content_java_test_support', '../net/net.gyp:net_java_test_support', - '../testing/android/on_device_instrumentation.gyp:broker_java', - '../testing/android/on_device_instrumentation.gyp:require_driver_apk', 'android_webview_apk_java', ], 'variables': { diff --git a/android_webview/javatests/AndroidManifest.xml b/android_webview/javatests/AndroidManifest.xml index 32cc216..63e5e0b 100644 --- a/android_webview/javatests/AndroidManifest.xml +++ b/android_webview/javatests/AndroidManifest.xml @@ -7,7 +7,7 @@ <!-- TODO(boliu): Change minSdkVersion to 19 when bots no longer try to install webview apks on < K devices. crbug.com/474374 --> <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" /> - <instrumentation android:name="org.chromium.base.test.BaseInstrumentationTestRunner" + <instrumentation android:name="android.test.InstrumentationTestRunner" android:targetPackage="org.chromium.android_webview.shell" android:label="Tests for org.chromium.android_webview"/> <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" /> @@ -19,7 +19,5 @@ needed when building test cases. --> <application android:hardwareAccelerated="false"> <uses-library android:name="android.test.runner" /> - <activity android:name="org.chromium.test.broker.OnDeviceInstrumentationBroker" - android:exported="true"/> </application> </manifest> |