Merge pull request #4251 from ayeung/timob-13799

TIMOB-13799: Change android min API level to 10
tidev · May 17, 2013 · 9f8ff91 · 9f8ff91
2 parents 631d5a5 + 0c5d45f
commit 9f8ff91
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 24 deletions.
diff --git a/android/dependency.json b/android/dependency.json
@@ -1,5 +1,5 @@
 {
-	"min_api_level": "8",
+	"min_api_level": "10",
 	"dependencies":
 	{
 		"accelerometer":[],

diff --git a/android/modules/accelerometer/project.properties b/android/modules/accelerometer/project.properties
@@ -9,6 +9,6 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:10
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
diff --git a/android/modules/analytics/project.properties b/android/modules/analytics/project.properties
@@ -9,6 +9,6 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:10
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
diff --git a/android/modules/app/project.properties b/android/modules/app/project.properties
@@ -9,6 +9,6 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:10
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
diff --git a/android/modules/contacts/project.properties b/android/modules/contacts/project.properties
@@ -9,6 +9,6 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:10
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
diff --git a/android/modules/database/project.properties b/android/modules/database/project.properties
@@ -9,6 +9,6 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:10
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
diff --git a/android/modules/filesystem/project.properties b/android/modules/filesystem/project.properties
@@ -9,6 +9,6 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:10
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
diff --git a/android/modules/geolocation/project.properties b/android/modules/geolocation/project.properties
@@ -9,6 +9,6 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:10
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
diff --git a/android/modules/gesture/project.properties b/android/modules/gesture/project.properties
@@ -9,6 +9,6 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:10
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
diff --git a/android/modules/locale/project.properties b/android/modules/locale/project.properties
@@ -9,6 +9,6 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:10
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
diff --git a/android/modules/map/project.properties b/android/modules/map/project.properties
@@ -9,6 +9,6 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:10
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
diff --git a/android/modules/media/project.properties b/android/modules/media/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:10
 android.library.reference.1=../../runtime/common
 android.library.reference.3=../filesystem
 android.library.reference.2=../../titanium
diff --git a/android/modules/network/project.properties b/android/modules/network/project.properties
@@ -9,7 +9,7 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:10
 android.library.reference.1=../../runtime/common
 android.library.reference.3=../xml
 android.library.reference.2=../../titanium
diff --git a/android/modules/platform/project.properties b/android/modules/platform/project.properties
@@ -9,6 +9,6 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:10
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
diff --git a/android/modules/utils/project.properties b/android/modules/utils/project.properties
@@ -9,6 +9,6 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:10
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
diff --git a/android/modules/xml/project.properties b/android/modules/xml/project.properties
@@ -9,6 +9,6 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:10
 android.library.reference.1=../../runtime/common
 android.library.reference.2=../../titanium
diff --git a/android/modules/yahoo/project.properties b/android/modules/yahoo/project.properties
@@ -9,4 +9,4 @@
 
 android.library=true
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:10
diff --git a/android/runtime/v8/Application.mk b/android/runtime/v8/Application.mk
@@ -7,7 +7,7 @@
 # Entry point Makefile for ndk-build
 
 APP_BUILD_SCRIPT = src/native/Android.mk
-TARGET_PLATFORM = android-8
+TARGET_PLATFORM = android-10
 APP_STL := stlport_shared
 ifeq ($(BUILD_X86), 1)
 	APP_ABI := armeabi armeabi-v7a x86

diff --git a/android/runtime/v8/ndk-build.sh b/android/runtime/v8/ndk-build.sh
@@ -23,11 +23,11 @@ if [ "$ANDROID_PLATFORM" = "" ]; then
 		fi
 
 		if [ "$ANDROID_SDK" = "" ]; then
-			echo "Error: The path to the Android SDK platform must be set in the ANDROID_PLATFORM environment variable (e.g. /opt/android-sdk-macosx/platforms/android-8)"
+			echo "Error: The path to the Android SDK platform must be set in the ANDROID_PLATFORM environment variable (e.g. /opt/android-sdk-macosx/platforms/android-10)"
 			exit 1
 		fi
 	fi
-	export ANDROID_PLATFORM="$(cd "$ANDROID_SDK"; pwd)/platforms/android-8"
+	export ANDROID_PLATFORM="$(cd "$ANDROID_SDK"; pwd)/platforms/android-10"
 fi
 
 THIS_DIR=$(cd "$(dirname "$0")"; pwd)

diff --git a/android/runtime/v8/project.properties b/android/runtime/v8/project.properties
@@ -10,4 +10,4 @@
 android.library=true
 android.library.reference.1=../common
 # Project target.
-target=android-8
+target=android-10
diff --git a/support/android/androidsdk.py b/support/android/androidsdk.py
@@ -5,7 +5,7 @@
 
 import os, sys, platform, glob, subprocess, types, re
 
-DEFAULT_API_LEVEL = 8
+DEFAULT_API_LEVEL = 10
 
 android_api_levels = {
 	3: 'android-1.5',

diff --git a/support/android/builder.py b/support/android/builder.py
@@ -69,7 +69,7 @@
 ]
 
 
-MIN_API_LEVEL = 8
+MIN_API_LEVEL = 10
 HONEYCOMB_MR2_LEVEL = 13
 KNOWN_ABIS = ("armeabi", "armeabi-v7a", "x86")
 

diff --git a/support/module/android/generated/Application.mk b/support/module/android/generated/Application.mk
@@ -1,6 +1,6 @@
 # Main NDK build script for @MODULE_ID@
 
 APP_BUILD_SCRIPT := jni/Android.mk
-TARGET_PLATFORM := android-8
+TARGET_PLATFORM := android-10
 APP_STL := stlport_shared
 APP_ABI := armeabi armeabi-v7a x86