Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-09 22:00:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

move to sdk-22 breaks jni on x86, so revert to -19 for now.

Browse source
This commit is contained in:
Eric House 2016-03-06 09:59:22 -08:00
parent 0b7dca2222
commit cd93bdb03e
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4-dbg/AndroidManifest.xml
View file

@ -13,7 +13,7 @@
<!-- BE SURE TO MODIFY project.properties AND the variable TARGET in
../scripts/setup_local_props.sh if targetSdkVersion changes!!!
-->
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="22" />
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19" />
<supports-screens android:resizeable="true"
android:smallScreens="true"

2
xwords4/android/XWords4/AndroidManifest.xml
View file

@ -29,7 +29,7 @@
<!-- BE SURE TO MODIFY project.project AND the variable TARGET in
../scripts/setup_local_props.sh if targetSdkVersion changes!!!
-->
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="22" />
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19" />
<supports-screens android:resizeable="true"
android:smallScreens="true"

2
xwords4/android/XWords4/build.gradle
View file

@ -26,7 +26,7 @@ subprojects {
afterEvaluate {project ->
if (project.hasProperty("android")) {
android {
compileSdkVersion 22
compileSdkVersion 19
buildToolsVersion '22.0.1'
}
}

2
xwords4/android/XWords4/project.properties
View file

@ -11,4 +11,4 @@
# proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-22
target=android-19

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/DbgUtils.java
View file

@ -66,7 +66,7 @@ public class DbgUtils {
if ( s_doLog ) {
String time = "";
// No need for timestamp on marshmallow, as the OS provides it
if ( Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1 ) {
if ( true /*Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1*/ ) {
s_time.setToNow();
time = s_time.format("[%H:%M:%S]-");
}

2
xwords4/android/scripts/setup_local_props.sh
View file

@ -2,7 +2,7 @@
set -u -e
TARGET="android-22"
TARGET="android-19"
usage() {
echo "usage: $0 [--target TARGET]"