diff options
| author | Memphiz <memphis@machzwo.de> | 2013-06-04 13:59:00 +0200 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2013-06-04 19:05:57 +0200 |
| commit | 95d5f80ed1c5376190eceea3e2cc2aa8d1f0b69a (patch) | |
| tree | 08169e965b65dd369de8f46c78006fa464bc65ba /tools | |
| parent | b354f05c8952a81dff267eaf23915db7a55244d4 (diff) | |
[droid] - fix libshairplay and activate build for android
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/android/packaging/Makefile | 2 | ||||
| -rw-r--r-- | tools/depends/target/Makefile | 4 | ||||
| -rw-r--r-- | tools/depends/target/libshairplay/Makefile | 7 |
3 files changed, 8 insertions, 5 deletions
diff --git a/tools/android/packaging/Makefile b/tools/android/packaging/Makefile index 9c20f2b94f..f491c3c443 100644 --- a/tools/android/packaging/Makefile +++ b/tools/android/packaging/Makefile @@ -3,7 +3,7 @@ include ../../depends/Makefile.include OBJS = libcurl.so \ librtmp.so libmad.so \ libafpclient.so \ - libplist.so \ + libplist.so libshairplay.so \ libxbogg.so libxbvorbis.so libxbvorbisfile.so libxbFLAC.so libxbmpeg2.so \ libxbmpeg2convert.so libnfs.so libass.so diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index dcf01b945a..f1298f496a 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -33,10 +33,6 @@ ifeq ($(OS),osx) EXCLUDED_DEPENDS = libusb endif -ifeq ($(OS),android) - EXCLUDED_DEPENDS = libshairplay -endif - DEPENDS := $(filter-out $(EXCLUDED_DEPENDS),$(DEPENDS)) ZLIB= diff --git a/tools/depends/target/libshairplay/Makefile b/tools/depends/target/libshairplay/Makefile index 7665015564..991ec805dc 100644 --- a/tools/depends/target/libshairplay/Makefile +++ b/tools/depends/target/libshairplay/Makefile @@ -29,6 +29,13 @@ $(LIBDYLIB): $(PLATFORM) .installed-$(PLATFORM): $(LIBDYLIB) $(MAKE) -C $(PLATFORM) install +ifeq ($(OS),android) + rm -f $(PREFIX)/lib/libshairplaylibshairplay.la $(PREFIX)/lib/libshairplay.so $(PREFIX)/lib/libshairplay.so.0 + mv -f $(PREFIX)/lib/libshairplay.so.0.0.0 $(PREFIX)/lib/libshairplay.so + $(RPL) -e "libshairplay.so.0" "libshairplay.so\x00\x00" $(PREFIX)/lib/libshairplay.so + -$(READELF) --dynamic $(PREFIX)/lib/libshairplay.so | grep ibrary +endif + touch $@ clean: |