diff options
| author | Sven Gothel <[email protected]> | 2012-05-04 07:04:32 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-05-04 07:04:32 +0200 |
| commit | 6021217f158965ca480c848eb69bec2169b357cb (patch) | |
| tree | c45b4f39cabb9bb93b273ff03daad4bab775a94d /make | |
| parent | 863cf5789cdba67928d27f69f4476f570c764558 (diff) | |
Android: Cleanup Manifest, don't require touch .., Bump version.code: 4
Diffstat (limited to 'make')
| -rw-r--r-- | make/resources/android/AndroidManifest-jogl.xml | 6 | ||||
| -rw-r--r-- | make/resources/android/AndroidManifest-test.xml | 7 | ||||
| -rw-r--r-- | make/versions.xml | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/make/resources/android/AndroidManifest-jogl.xml b/make/resources/android/AndroidManifest-jogl.xml index f69b5dea6..1c08cc484 100644 --- a/make/resources/android/AndroidManifest-jogl.xml +++ b/make/resources/android/AndroidManifest-jogl.xml @@ -3,9 +3,13 @@ sharedUserId="com.jogamp.Community" package="javax.media.opengl"> - <uses-sdk android:minSdkVersion="9" /> + <uses-feature android:name="android.hardware.touchscreen" android:required="false" /> + <!-- uses-feature android:name="android.hardware.camera" android:required="false" / --> <!-- not yet --> + <uses-library android:name="com.jogamp.common" android:required="true" /> + <uses-sdk android:minSdkVersion="9" /> + <application android:icon="@drawable/icon" android:label="@string/app_name" android:description="@string/app_descr" diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-test.xml index 4e6a5a2ba..3c2046df1 100644 --- a/make/resources/android/AndroidManifest-test.xml +++ b/make/resources/android/AndroidManifest-test.xml @@ -3,9 +3,14 @@ sharedUserId="com.jogamp.Community" package="com.jogamp.opengl.test"> - <uses-sdk android:minSdkVersion="9" /> + <uses-feature android:name="android.hardware.touchscreen" android:required="false" /> + <!-- uses-feature android:name="android.hardware.camera" android:required="false" / --> <!-- not yet --> + <uses-library android:name="com.jogamp.common" android:required="true" /> <uses-library android:name="javax.media.opengl" android:required="true" /> + <uses-library android:name="jogamp.android.launcher" android:required="true" /> + + <uses-sdk android:minSdkVersion="9" /> <application android:icon="@drawable/icon" android:label="@string/app_name" diff --git a/make/versions.xml b/make/versions.xml index 6cb59b978..f679895f1 100644 --- a/make/versions.xml +++ b/make/versions.xml @@ -12,7 +12,7 @@ betas before release candidates to give the Community time to react.--> <property name="jogl_base_version" value="2.0" /> - <property name="jogl_int_version" value="2" /> + <property name="jogl_int_version" value="4" /> <!-- Uncomment this property in order to produce a JOGL release build without running the "RI" (Reference Implementation) |