Revamped EngineInitializer
Also contains gyp changes to add a instrumentation test
target for Browser
Change-Id: I2ea26a4a57d9101c54f80f148c9333088016e141
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index cb1ffc7..984275b 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -31,12 +31,17 @@
"adb shell am instrument -w com.android.browser.tests/android.test.InstrumentationTestRunner"
-->
<instrumentation android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="com.android.browser"
+ android:targetPackage="org.codeaurora.swe.browser.beta"
android:label="Tests for Browser."/>
+ <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
+ <uses-permission android:name="android.permission.INJECT_EVENTS" />
+
+ <!--
<instrumentation android:name="com.android.browser.BrowserLaunchPerformance"
android:targetPackage="com.android.browser"
android:label="Browser Launch Performance">
</instrumentation>
+ -->
</manifest>