Merge "Declare that testViewport targets Froyo APIs"

opengl/tests/testViewport/Android.mk

@@ -17,6 +17,10 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_PACKAGE_NAME := TestViewport
 
+# Set a specific SDK version so we can run on Froyo.
+
+LOCAL_SDK_VERSION := 8
+
 include $(BUILD_PACKAGE)
 
 endif # TARGET_SIMULATOR

opengl/tests/testViewport/AndroidManifest.xml

@@ -20,6 +20,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.test">
+    <uses-sdk android:targetSdkVersion="8" android:minSdkVersion="8" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <application