summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-09-25 16:46:28 +0200
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-10-15 10:28:26 +0200
commit2c2109dbbdc3be45f3a982280cff2b5be9905fea (patch)
tree95863e87f046ec49986760eb07c71fa33dffac23 /android
parent169d202a6959606faa8c7f81c8b2a60088c481a3 (diff)
revert back to android-21 target until tinderbox gets updated
Change-Id: Ief38ef9cc4f167caef8d991c9543161997682418 (cherry picked from commit 4e47ed7e5aad8bde548b4953baba13cf99b6fd9c)
Diffstat (limited to 'android')
-rw-r--r--android/Bootstrap/Makefile.shared2
-rw-r--r--android/Bootstrap/project.properties2
-rw-r--r--android/source/project.properties2
3 files changed, 3 insertions, 3 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index c7c33f8b999f..84c68814c15a 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-23 --path $(APPCOMPATDIR)
+ $(ANDROID_SDK_HOME)/tools/android update lib-project --target android-21 --path $(APPCOMPATDIR)
properties:
echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
diff --git a/android/Bootstrap/project.properties b/android/Bootstrap/project.properties
index cb55769c3b1f..ca8132402efd 100644
--- a/android/Bootstrap/project.properties
+++ b/android/Bootstrap/project.properties
@@ -9,4 +9,4 @@
android.library=true
# Project target.
-target=android-23
+target=android-21
diff --git a/android/source/project.properties b/android/source/project.properties
index 62a52d4b5252..3580b118d026 100644
--- a/android/source/project.properties
+++ b/android/source/project.properties
@@ -8,7 +8,7 @@
# project structure.
# Project target.
-target=android-23
+target=android-21
# Use the Bootstrap class
android.library.reference.1=../Bootstrap