LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 7ea377d2: am ac1d40cf: Merge "Fixed inconsistent minSdkVersion and target= in NDK samples"

Browse Source 
* commit '7ea377d2a7f8557545259698e6d8e4536ceadc2a':
  Fixed inconsistent minSdkVersion and target= in NDK samples
This commit is contained in:
Andrew Hsieh
2012-04-02 00:43:55 -07:00
committed by Android Git Automerger
parent 4ab5bd9deb 7ea377d2a7
commit 3e5127efe4
8 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndk/platforms/android-8/samples/bitmap-plasma/default.properties
View File

@@ -8,4 +8,4 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-9 target=android-8

2
ndk/platforms/android-9/samples/native-activity/default.properties
View File

@@ -8,4 +8,4 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-7 target=android-9

2
ndk/platforms/android-9/samples/native-plasma/AndroidManifest.xml
View File

@@ -3,7 +3,7 @@
package="com.example.native_plasma" package="com.example.native_plasma"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">
<uses-sdk android:minSdkVersion="8" /> <uses-sdk android:minSdkVersion="9" />
<application android:label="@string/app_name" <application android:label="@string/app_name"
android:hasCode="false" android:debuggable="true"> android:hasCode="false" android:debuggable="true">
<activity android:name="android.app.NativeActivity" <activity android:name="android.app.NativeActivity"

2
ndk/platforms/android-9/samples/native-plasma/default.properties
View File

@@ -8,4 +8,4 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-7 target=android-9

4
ndk/platforms/android-9/samples/native-plasma/src/Dummy.java
View File

@@ -1,4 +0,0 @@
// Temporary until the NDK build system can deal with there being no Java source.
class Dummy {
}

2
ndk/samples/hello-jni/default.properties
View File

@@ -8,4 +8,4 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-8 target=android-3

1
ndk/samples/hello-neon/AndroidManifest.xml
View File

@@ -3,6 +3,7 @@
package="com.example.neon" package="com.example.neon"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">
<uses-sdk android:minSdkVersion="4" />
<application android:label="@string/app_name"> <application android:label="@string/app_name">
<activity android:name=".HelloNeon" <activity android:name=".HelloNeon"
android:label="@string/app_name"> android:label="@string/app_name">

2
ndk/samples/hello-neon/default.properties
View File

@@ -8,4 +8,4 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-3 target=android-4