[Libreoffice-commits] core.git: android/Bootstrap android/source

[Tor Lillqvist]

 android/Bootstrap/Makefile.shared    |    2 +-
 android/Bootstrap/project.properties |    2 +-
 android/source/project.properties    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 827e78fcb254bb1535a9af5b2767d6baea45372f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Sep 28 14:45:09 2015 +0300

    Revert "revert back to android-21 target until tinderbox gets updated"
    
    Now it has been updated.
    
    This reverts commit 4e47ed7e5aad8bde548b4953baba13cf99b6fd9c.

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index aaf50ce..a2aa45c 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 ca81324..cb55769 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
diff --git a/android/source/project.properties b/android/source/project.properties
index 3580b11..62a52d4 100644
--- a/android/source/project.properties
+++ b/android/source/project.properties
@@ -8,7 +8,7 @@
 # project structure.
 
 # Project target.
-target=android-21
+target=android-23
 
 # Use the Bootstrap class
 android.library.reference.1=../Bootstrap