From 4e0cf955dd890944a035e52f6ae4eda7e7bd2ec2 Mon Sep 17 00:00:00 2001
From: Robert Tray <rtray@gpartner-nvidia.com>
Date: Fri, 14 Sep 2018 16:32:57 -0600
Subject: [PATCH] Add screenLayout to AndroidManifest configChanges

Specify that dEQP will handle screenLayout config changes in the
manifest so the Android framework doesn't try to stop and restart dEQP.
dEQP can't handle a restart and just exits.

Update the minSdkVersion and targetSdkVersion to match what is
used for Khronos Vulkan dEQP manifest.  Android P will launch the
DeprecatedTargetSdkVersionDialog if the sdk version is not recent
enough.

Test: deqp

Cherry-pick from https://android-review.googlesource.com/c/platform/external/deqp/+/757202
VK-GL-CTS Issue: 1357
Affects: OpenGL/OpenGL ES Android build

Change-Id: Ia9befb1d65752ece3ea5778ba1301a134559334a
---
 android/openglcts/AndroidManifest.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/openglcts/AndroidManifest.xml b/android/openglcts/AndroidManifest.xml
index 8dc5bdd..e68f737 100644
--- a/android/openglcts/AndroidManifest.xml
+++ b/android/openglcts/AndroidManifest.xml
@@ -9,7 +9,7 @@
 		<activity android:name="android.app.NativeActivity"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:label="OpenGL CTS"
-				  android:configChanges="orientation|keyboardHidden"
+				  android:configChanges="orientation|keyboardHidden|screenLayout"
 				  android:exported="true"
 				  android:process=":testercore">
 			<meta-data android:name="android.app.lib_name"
@@ -22,7 +22,7 @@
 		<activity android:name="org.khronos.cts.ES2Activity"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:label="ES2 CTS"
-				  android:configChanges="orientation|keyboardHidden"
+				  android:configChanges="orientation|keyboardHidden|screenLayout"
 				  android:launchMode="singleTask"
 				  android:exported="true">
 			<meta-data android:name="android.app.lib_name"
@@ -37,7 +37,7 @@
 		<activity android:name="org.khronos.cts.ES3Activity"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:label="ES3 CTS"
-				  android:configChanges="orientation|keyboardHidden"
+				  android:configChanges="orientation|keyboardHidden|screenLayout"
 				  android:launchMode="singleTask"
 				  android:exported="true">
 			<meta-data android:name="android.app.lib_name"
@@ -52,7 +52,7 @@
 		<activity android:name="org.khronos.cts.ES31Activity"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:label="ES3.1 CTS"
-				  android:configChanges="orientation|keyboardHidden"
+				  android:configChanges="orientation|keyboardHidden|screenLayout"
 				  android:launchMode="singleTask"
 				  android:exported="true">
 			<meta-data android:name="android.app.lib_name"
@@ -67,7 +67,7 @@
 		<activity android:name="org.khronos.cts.ES32Activity"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:label="ES3.2 CTS"
-				  android:configChanges="orientation|keyboardHidden"
+				  android:configChanges="orientation|keyboardHidden|screenLayout"
 				  android:launchMode="singleTask"
 				  android:exported="true">
 			<meta-data android:name="android.app.lib_name"
@@ -82,7 +82,7 @@
 		<activity android:name="org.khronos.cts.GL45Activity"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:label="GL4.5 CTS"
-				  android:configChanges="orientation|keyboardHidden"
+				  android:configChanges="orientation|keyboardHidden|screenLayout"
 				  android:launchMode="singleTask"
 				  android:exported="true">
 			<meta-data android:name="android.app.lib_name"
@@ -97,7 +97,7 @@
 		<activity android:name="org.khronos.cts.GL46Activity"
 					android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 					android:label="GL4.6 CTS"
-					android:configChanges="orientation|keyboardHidden"
+					android:configChanges="orientation|keyboardHidden|screenLayout"
 					android:launchMode="singleTask"
 					android:exported="true">
 			<meta-data android:name="android.app.lib_name"
@@ -111,7 +111,7 @@
 		</activity>
     </application>
 
-    <uses-sdk android:minSdkVersion="9"/>
+    <uses-sdk android:minSdkVersion="13" android:targetSdkVersion="19"/>
     <uses-feature android:glEsVersion="0x00030001"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>
-- 
2.7.4