summaryrefslogtreecommitdiff
path: root/android/Bootstrap
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-03-09 18:16:49 +0900
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-03-16 09:37:58 +0100
commitbdd8a68c7b1bfd78915d222d113709fd468903ec (patch)
treeb72e1b7a66a4152c966f97229ee8fe8476b4fd14 /android/Bootstrap
parent80c90f518c2ef0e4a17af6727d9c22bcf20b3b09 (diff)
android: make & build appcompat-v7 library, up target to v21
Previously we included the android support library v4 for some GUI elements like GridView. This commit in addition adds the v7 appcompat library which is needed for the new Lollipop style Toolbar and many other new GUI elements. The appcompat v7 library is not distributed as only a jar file but needs to be build (as it includes additional resources) and included as a library project. So to do this the content is copied from SDK and build with the build system. The files also include the v4 so it doesn't need to be copied from SDK anymore. The target had to be raised to v21 (Lollipop), however the minimum SDK version remains unchanged. Change-Id: I4f1a6ce69e7f6c3f9df784a6835f376a01d4dfdb
Diffstat (limited to 'android/Bootstrap')
-rw-r--r--android/Bootstrap/Makefile.shared8
1 files changed, 8 insertions, 0 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index a215d44e423e..2a8b54500881 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -18,6 +18,8 @@ APP_DATA_PATH=/data/data/$(APP_PACKAGE)
SODEST=libs/$(ANDROID_APP_ABI)
OBJLOCAL=obj/local/$(ANDROID_APP_ABI)
+APPCOMPATDIR=$(BOOTSTRAPDIR)/../AppCompat-v7
+
define COPYSO
$(error COPYSO should not be used now with DISABLE_DYNLOADING)
endef
@@ -50,6 +52,11 @@ $(BOOTSTRAPDIR)/no-resource-compress.xml : $(ANDROID_SDK_HOME)/tools/ant/build.x
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)
+
properties:
echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties
@@ -70,6 +77,7 @@ clean: android_version_setup properties
$(ANT) $(if $(VERBOSE)$(verbose),,-quiet) -keep-going clean
rm -rf assets libs $(SODEST) $(OBJLOCAL) $(BOOTSTRAPDIR)/no-resource-compress.xml
rm -f native-code.cxx
+ rm -rf $(APPCOMPATDIR)
#
# Build / link the single .so for this app