Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TIMOB-13799: Change android min API level to 10 #4251

Merged
merged 1 commit into from
May 17, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/dependency.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"min_api_level": "8",
"min_api_level": "10",
"dependencies":
{
"accelerometer":[],
Expand Down
2 changes: 1 addition & 1 deletion android/modules/accelerometer/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/analytics/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/app/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/contacts/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/database/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/filesystem/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/geolocation/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/gesture/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/locale/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/map/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/media/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/network/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/platform/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/utils/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/xml/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion android/modules/yahoo/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@

android.library=true
# Project target.
target=Google Inc.:Google APIs:8
target=Google Inc.:Google APIs:10
2 changes: 1 addition & 1 deletion android/runtime/v8/Application.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions android/runtime/v8/ndk-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion android/runtime/v8/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
android.library=true
android.library.reference.1=../common
# Project target.
target=android-8
target=android-10
2 changes: 1 addition & 1 deletion support/android/androidsdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion support/android/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
]


MIN_API_LEVEL = 8
MIN_API_LEVEL = 10
HONEYCOMB_MR2_LEVEL = 13
KNOWN_ABIS = ("armeabi", "armeabi-v7a", "x86")

Expand Down
2 changes: 1 addition & 1 deletion support/module/android/generated/Application.mk
Original file line number Diff line number Diff line change
@@ -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