diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-09-28 14:45:09 +0300 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-10-15 10:28:26 +0200 |
| commit | 0fb5a696905e09efb63a47c7f5073578e6b62105 (patch) | |
| tree | da67bc169e2faf9f2fa72c4e7833f841528ff9a3 /android | |
| parent | 2c2109dbbdc3be45f3a982280cff2b5be9905fea (diff) | |
Revert "revert back to android-21 target until tinderbox gets updated"
Now it has been updated.
This reverts commit 4e47ed7e5aad8bde548b4953baba13cf99b6fd9c.
(cherry picked from commit 827e78fcb254bb1535a9af5b2767d6baea45372f)
Diffstat (limited to 'android')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 2 | ||||
| -rw-r--r-- | android/Bootstrap/project.properties | 2 | ||||
| -rw-r--r-- | android/source/project.properties | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 84c68814c15a..c7c33f8b999f 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 diff --git a/android/source/project.properties b/android/source/project.properties index 3580b118d026..62a52d4b5252 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 |