diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-06-29 10:47:34 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-06-30 14:48:04 +0200 |
| commit | f918192eceb5f0ea5582988a76d9ad9f6e1e6e43 (patch) | |
| tree | 13101a95575b801cc2c9869c06e43ab523186139 /android/Bootstrap | |
| parent | faeccde59c2589bd2da972e8ca93581a26555caf (diff) | |
android: Relink liblo-native-code.so when a library changes.
This is so that calls like 'make configmgr android' produce an .apk with
updated code changes from configmgr as expected.
Change-Id: I5f576b01269cf3f559a8a6389af298a3758e7309
Diffstat (limited to 'android/Bootstrap')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index a8b278f83875..e16de617ea1e 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -75,9 +75,11 @@ clean: android_version_setup properties # Build / link the single .so for this app # +ALL_STATIC_LIBS := $(shell $(SRCDIR)/bin/lo-all-static-libs) + LIBS = \ -Wl,--start-group \ - $(shell $(SRCDIR)/bin/lo-all-static-libs) \ + $(ALL_STATIC_LIBS) \ -Wl,--end-group WHOLELIBS = \ @@ -88,13 +90,14 @@ WHOLELIBS = \ -Wl,--no-whole-archive -$(OBJLOCAL)/liblo-native-code.so : native-code.cxx dummies.cxx +$(OBJLOCAL)/liblo-native-code.so : native-code.cxx dummies.cxx $(ALL_STATIC_LIBS) mkdir -p $(OBJLOCAL) $(CXX) -Wl,--gc-sections -Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx dummies.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lgnustl_static -lGLESv2 -landroid -ljnigraphics -llog -lz $(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so mkdir -p $(SODEST) $(STRIP) -o $(SODEST)/liblo-native-code.so $(OBJLOCAL)/liblo-native-code.so + #to keep some symbols, eg.: $(STRIP) -o $(SODEST)/liblo-native-code.so $(OBJLOCAL)/liblo-native-code.so -w -K 'Java*' # shrinkme $(STRIP) -o $(SODEST)/liblo-native-code.so $(OBJLOCAL)/liblo-native-code.so |