dEQP: change sdk version to test_current

The current dEQP tests running with cts-tradefed will pop up a window
saying 'was built for an older version of Android'. This change fixes
that issue.

Bug: 120244829
Test: CtsDeqpTestCases
Change-Id: I3ccc64f2784a071d49bfe2d7b60350d518980e68

diff --git a/android/package/Android.mk b/android/package/Android.mk
index 5049b90..97a977e 100644 (file)
--- a/android/package/Android.mk
+++ b/android/package/Android.mk
@@ -38,6 +38,6 @@ LOCAL_PACKAGE_NAME := com.drawelements.deqp
 LOCAL_MULTILIB := both
 
 # We could go down all the way to API-13 for 32bit. 22 is required for 64bit ARM.
-LOCAL_SDK_VERSION := 22
+LOCAL_SDK_VERSION := test_current
 
 include $(BUILD_PACKAGE)

diff --git a/android/package/AndroidManifest.xml b/android/package/AndroidManifest.xml
index 5d52274..7923392 100644 (file)
--- a/android/package/AndroidManifest.xml
+++ b/android/package/AndroidManifest.xml
@@ -34,7 +34,6 @@
                </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" />