summaryrefslogtreecommitdiff
path: root/android/Bootstrap/Makefile.shared
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-12-15 18:13:11 +0000
committerTor Lillqvist <tml@iki.fi>2013-02-21 22:54:36 +0200
commit4d258787559426e1e2a0279888eb669622889899 (patch)
tree7e9e3f31684865e750b9e28d2a40f7aa545a123e /android/Bootstrap/Makefile.shared
parent52a8744afee2cd589813f0377d93f821fce7aedd (diff)
android: finally starting and rendering at least something again.
Only renders on very-first-start after install (oddly). We initialize vcl in it's own thread to avoid problems. Thanks to tml for fixing a linking issue. Change-Id: I960d11c6098681356fea0634970545aa9af9bacb
Diffstat (limited to 'android/Bootstrap/Makefile.shared')
-rw-r--r--android/Bootstrap/Makefile.shared6
1 files changed, 4 insertions, 2 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 3eb28a7117a4..1f1301367a97 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -88,11 +88,13 @@ WHOLELIBS = \
$(OBJLOCAL)/liblo-native-code.so : $(wildcard $(OUTDIR)/lib/lib*.a) native-code.cxx
mkdir -p $(OBJLOCAL)
- $(CXX) -Wl,-Map,liblo-native-code.map -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$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz
+ $(CXX) -Wl,-Map,liblo-native-code.map -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$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -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
+ cp -a $(OBJLOCAL)/liblo-native-code.so $(SODEST)/liblo-native-code.so
+
+# shrinkme $(STRIP) -o $(SODEST)/liblo-native-code.so $(OBJLOCAL)/liblo-native-code.so
link-so: $(SODEST)/liblo-native-code.so