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

Christian Lohmaier lohmaier+LibreOffice at googlemail.com
Fri Sep 25 07:49:19 PDT 2015


 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 4e47ed7e5aad8bde548b4953baba13cf99b6fd9c
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Sep 25 16:46:28 2015 +0200

    revert back to android-21 target until tinderbox gets updated
    
    Change-Id: Ief38ef9cc4f167caef8d991c9543161997682418

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index a2aa45c..aaf50ce 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 cb55769..ca81324 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 62a52d4..3580b11 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


More information about the Libreoffice-commits mailing list