Merge "Split shared_presentable_image tests into more dimensions to avoid timeout" into qt-dev
diff --git a/Android.bp b/Android.bp
index db49b56..b093380 100644
--- a/Android.bp
+++ b/Android.bp
@@ -83,7 +83,7 @@
srcs: ["android/package/src/**/*.java"],
resource_dirs: ["android/package/res"],
- manifest: "android/package/AndroidManifest.xml",
+ manifest: "android/package/AndroidManifest-integration.xml",
asset_dirs: [
"data",
diff --git a/android/package/AndroidManifest-integration.xml b/android/package/AndroidManifest-integration.xml
new file mode 100644
index 0000000..35920f3
--- /dev/null
+++ b/android/package/AndroidManifest-integration.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.drawelements.deqp"
+ android:versionCode="1"
+ android:versionName="1.0">
+ <application android:label="dEQP Tests"
+ android:icon="@drawable/deqp_app"
+ android:requestLegacyExternalStorage="true">
+ <activity android:name="com.drawelements.deqp.execserver.ExecServerActivity"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+ android:label="dEQP ExecServer"
+ android:launchMode="singleTask"
+ android:process=":execserverui"
+ android:exported="true" />
+ <activity android:name="com.drawelements.deqp.execserver.ServiceStarter"
+ android:theme="@android:style/Theme.NoDisplay"
+ android:label="dEQP ExecServer Launcher"
+ android:launchMode="singleTask"
+ android:process=":execserverstarter"
+ android:exported="true" />
+ <service android:name="com.drawelements.deqp.execserver.ExecService"
+ android:label="dEQP ExecServer Service"
+ android:exported="true"
+ android:process=":execserver" />
+ <activity android:name="android.app.NativeActivity"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+ android:label="dEQP Test Process"
+ android:configChanges="keyboardHidden|orientation|screenSize|screenLayout"
+ android:exported="true"
+ android:process=":testercore">
+ <meta-data android:name="android.app.lib_name"
+ android:value="deqp" />
+ <meta-data android:name="android.app.func_name"
+ android:value="createTestActivity" />
+ </activity>
+ </application>
+
+ <uses-feature android:glEsVersion="0x00020000"/>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.GET_TASKS" />
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
+
+ <instrumentation android:label="dEQP-Instrumentation"
+ android:name="com.drawelements.deqp.testercore.DeqpInstrumentation"
+ android:targetPackage="com.drawelements.deqp" />
+ <instrumentation android:label="dEQP-PlatformCapabilityQueryInstrumentation"
+ android:name="com.drawelements.deqp.platformutil.DeqpPlatformCapabilityQueryInstrumentation"
+ android:targetPackage="com.drawelements.deqp" />
+</manifest>
diff --git a/android/package/AndroidManifest.xml b/android/package/AndroidManifest.xml
index 35920f3..79c49f0 100644
--- a/android/package/AndroidManifest.xml
+++ b/android/package/AndroidManifest.xml
@@ -4,8 +4,7 @@
android:versionCode="1"
android:versionName="1.0">
<application android:label="dEQP Tests"
- android:icon="@drawable/deqp_app"
- android:requestLegacyExternalStorage="true">
+ android:icon="@drawable/deqp_app">
<activity android:name="com.drawelements.deqp.execserver.ExecServerActivity"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:label="dEQP ExecServer"
@@ -35,6 +34,7 @@
</activity>
</application>
+ <uses-sdk android:minSdkVersion="13" android:targetSdkVersion="19"/>
<uses-feature android:glEsVersion="0x00020000"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.GET_TASKS" />
