Skip to content

Commit

Permalink
fix all projects to use API level 14 (v4.0 and up)
Browse files Browse the repository at this point in the history
  • Loading branch information
eddiecohen committed Oct 23, 2013
1 parent 6a8c476 commit dafd195
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Application.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
# *** Note: This module file is only in use when building via NDK! ***
# ***

# Android should be >= v2.3
APP_PLATFORM := android-9
# Android should be >= v4.0
APP_PLATFORM := android-14

# Use ARM v7a instruction set
APP_ABI := armeabi-v7a
Expand Down
4 changes: 2 additions & 2 deletions Samples/SimpleRead.Android/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
android:versionName="2.3" >

<uses-sdk
android:minSdkVersion="12"
android:targetSdkVersion="17" />
android:minSdkVersion="14"
android:targetSdkVersion="18" />

<application
android:allowBackup="true"
Expand Down
2 changes: 1 addition & 1 deletion Samples/SimpleRead.Android/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-12
target=android-14
android.library.reference.1=../../Wrappers/java
4 changes: 2 additions & 2 deletions Samples/SimpleViewer.Android/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
android:versionName="2.3" >

<uses-sdk
android:minSdkVersion="12"
android:targetSdkVersion="17" />
android:minSdkVersion="14"
android:targetSdkVersion="18" />

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

Expand Down
2 changes: 1 addition & 1 deletion Samples/SimpleViewer.Android/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-12
target=android-14
android.library.reference.1=../../Wrappers/java
3 changes: 2 additions & 1 deletion Wrappers/java/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
package="org.openni.android"
android:versionCode="203000010"
android:versionName="2.3">
<uses-sdk android:minSdkVersion="12"/>

<uses-sdk android:minSdkVersion="14"/>
</manifest>
4 changes: 2 additions & 2 deletions Wrappers/java/jni/Application.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
# *** Note: This module file is only in use when building via NDK! ***
# ***

# Android should be >= v2.3
APP_PLATFORM := android-9
# Android should be >= v4.0
APP_PLATFORM := android-14

# Use ARM v7a instruction set
APP_ABI := armeabi-v7a
Expand Down

0 comments on commit dafd195

Please sign in to comment.