summaryrefslogtreecommitdiffstats
path: root/android/Bootstrap
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-09-24 22:47:59 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-09-24 22:47:59 +0200
commit45c27ffcfd58aee86c92421af82525d873e54654 (patch)
tree2654db4f833e6b1955e2e3c3283bb37f35424d2c /android/Bootstrap
parentsync splash-progressbar position for installets with instdir (diff)
downloadcore-45c27ffcfd58aee86c92421af82525d873e54654.tar.gz
core-45c27ffcfd58aee86c92421af82525d873e54654.zip
android.util.FloatMath is deprecated/was removed in ver 23
replace with corresponding Math functions and bump android sdk target to 23 to be able to use current appcompat-v7 pre-JIT FloatMath was faster, but since then was wrapper to Math anyway http://developer.android.com/reference/android/util/FloatMath.html Change-Id: I19e316fb7d32e616162a70fca8c565fa320a8c1a
Diffstat (limited to 'android/Bootstrap')
-rw-r--r--android/Bootstrap/Makefile.shared2
-rw-r--r--android/Bootstrap/project.properties2
2 files changed, 2 insertions, 2 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index aaf50cea9f22..a2aa45c8dbca 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -55,7 +55,7 @@ android_version_setup : $(BOOTSTRAPDIR)/no-resource-compress.xml
prepare-appcompat:
mkdir $(APPCOMPATDIR) 2>/dev/null; true
cp -rf $(ANDROID_SDK_HOME)/extras/android/support/v7/appcompat/* $(APPCOMPATDIR)
- $(ANDROID_SDK_HOME)/tools/android update lib-project --target android-21 --path $(APPCOMPATDIR)
+ $(ANDROID_SDK_HOME)/tools/android update lib-project --target android-23 --path $(APPCOMPATDIR)
properties:
echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
diff --git a/android/Bootstrap/project.properties b/android/Bootstrap/project.properties
index ca8132402efd..cb55769c3b1f 100644
--- a/android/Bootstrap/project.properties
+++ b/android/Bootstrap/project.properties
@@ -9,4 +9,4 @@
android.library=true
# Project target.
-target=android-21
+target=android-23