FIX: [cmake] use specific Android profile (so versions)

7 files changed, 2 insertions, 38 deletions

diff --git a/tools/depends/target/Toolchain.cmake.in b/tools/depends/target/Toolchain.cmake.in
index 09a8a77018..7faf25883f 100644
--- a/tools/depends/target/Toolchain.cmake.in
+++ b/tools/depends/target/Toolchain.cmake.in
@@ -13,7 +13,7 @@ if(OS STREQUAL linux)
     set(CORE_SYSTEM_NAME rbpi)
   endif()
 elseif(OS STREQUAL android)
-  set(CMAKE_SYSTEM_NAME Linux)
+  set(CMAKE_SYSTEM_NAME Android)
   set(CORE_SYSTEM_NAME android)
 elseif(OS STREQUAL osx)
   set(CMAKE_SYSTEM_NAME Darwin)
diff --git a/tools/depends/target/Toolchain_binaddons.cmake.in b/tools/depends/target/Toolchain_binaddons.cmake.in
index 1c6a9609ac..69c9ac7486 100644
--- a/tools/depends/target/Toolchain_binaddons.cmake.in
+++ b/tools/depends/target/Toolchain_binaddons.cmake.in
@@ -12,7 +12,7 @@ if(OS STREQUAL linux)
     set(CORE_SYSTEM_NAME rbpi)
   endif()
 elseif(OS STREQUAL android)
-  set(CMAKE_SYSTEM_NAME Linux)
+  set(CMAKE_SYSTEM_NAME Android)
   set(CORE_SYSTEM_NAME android)
 elseif(OS STREQUAL osx)
   set(CMAKE_SYSTEM_NAME Darwin)
diff --git a/tools/depends/target/alsa-lib/Makefile b/tools/depends/target/alsa-lib/Makefile
index ac1c9c4f7b..c6ba8b9d2c 100644
--- a/tools/depends/target/alsa-lib/Makefile
+++ b/tools/depends/target/alsa-lib/Makefile
@@ -49,12 +49,6 @@ $(LIBDYLIB): $(PLATFORM)
 	$(MAKE) -C $(PLATFORM)/src install-libLTLIBRARIES
 	$(MAKE) -C $(PLATFORM)/include install
 	$(MAKE) -C $(PLATFORM)/utils install
-ifeq ($(OS),android)
-	rm -f $(PREFIX)/lib/libasound.la $(PREFIX)/lib/libasound.so $(PREFIX)/lib/libxbasound.so $(PREFIX)/lib/libasound.so.2
-	mv -f $(PREFIX)/lib/libasound.so.2.0.0 $(PREFIX)/lib/libasound.so
-	$(RPL) -e "libasound.so.2" "libasound.so\x00\x00" $(PREFIX)/lib/libasound.so
-	-$(READELF) --dynamic $(PREFIX)/lib/libasound.so | grep ibrary
-endif
 	touch $@
 
 clean:
diff --git a/tools/depends/target/boblight/Makefile b/tools/depends/target/boblight/Makefile
index bf207a6255..f461b86fb3 100644
--- a/tools/depends/target/boblight/Makefile
+++ b/tools/depends/target/boblight/Makefile
@@ -42,12 +42,6 @@ $(LIBDYLIB): $(PLATFORM)
 	$(MAKE) -C $(PLATFORM)
 
 .installed-$(PLATFORM): $(LIBDYLIB)
-ifeq ($(OS),android)
-	rm -f $(PLATFORM)/src/.libs/libboblight.la $(PLATFORM)/src/.libs/libboblight.so $(PLATFORM)/src/.libs/libboblight.so.0
-	mv -f $(PLATFORM)/src/.libs/libboblight.so.0.0.0 $(PLATFORM)/src/.libs/libboblight.so
-	$(RPL) -e "libboblight.so.0" "libboblight.so\x00\x00" $(PLATFORM)/src/.libs/libboblight.so
-	-$(READELF) --dynamic $(PLATFORM)/src/.libs/libboblight.so | grep ibrary
-endif
 ifeq ($(OS),ios)
 ifeq ($(TARGET_PLATFORM),appletvos)
 	#deploy into source tree for tvos - we distribute libboblight with the bundle...
diff --git a/tools/depends/target/libcec/Makefile b/tools/depends/target/libcec/Makefile
index 20111ba898..27b0bdb016 100644
--- a/tools/depends/target/libcec/Makefile
+++ b/tools/depends/target/libcec/Makefile
@@ -28,12 +28,6 @@ $(LIBDYLIB): $(PLATFORM)
 
 .installed-$(PLATFORM): $(LIBDYLIB)
 	$(MAKE) -C $(PLATFORM)/build install
-ifeq ($(OS),android)
-	rm -f $(PREFIX)/lib/$(LIBNAME).la $(PREFIX)/lib/$(LIBNAME).so $(PREFIX)/lib/$(LIBNAME).so.$(VERSION_MAJOR) $(PREFIX)/lib/$(LIBNAME).so.$(VERSION_MAJOR).$(VERSION_MINOR)
-	mv -f $(PREFIX)/lib/$(LIBNAME).so.$(VERSION) $(PREFIX)/lib/$(LIBNAME).so
-	$(RPL) -e "$(LIBNAME).so.$(VERSION_MAJOR)" "$(LIBNAME).so\x00\x00" $(PREFIX)/lib/$(LIBNAME).so
-	-$(READELF) --dynamic $(PREFIX)/lib/$(LIBNAME).so | grep ibrary
-endif
 	touch $@
 
 clean:
diff --git a/tools/depends/target/libplist/Makefile b/tools/depends/target/libplist/Makefile
index 1159d3e800..b51f56b6ce 100644
--- a/tools/depends/target/libplist/Makefile
+++ b/tools/depends/target/libplist/Makefile
@@ -33,18 +33,6 @@ $(LIBDYLIB): $(PLATFORM)
 
 .installed-$(PLATFORM): $(LIBDYLIB)
 	$(MAKE) -C $(PLATFORM)/build install
-ifeq ($(OS),android)
-	rm -f $(PREFIX)/lib/libplist.la $(PREFIX)/lib/libplist.so $(PREFIX)/lib/libplist.so.1
-	mv -f $(PREFIX)/lib/libplist.so.1.1.6 $(PREFIX)/lib/libplist.so
-	$(RPL) -e "libplist.so.1" "libplist.so\x00\x00" $(PREFIX)/lib/libplist.so
-	-$(READELF) --dynamic $(PREFIX)/lib/libplist.so | grep ibrary
-
-	rm -f $(PREFIX)/lib/libplist++.la $(PREFIX)/lib/libplist++.so $(PREFIX)/lib/libplist++.so.1
-	mv -f $(PREFIX)/lib/libplist++.so.1.1.6 $(PREFIX)/lib/libplist++.so
-	$(RPL) -e "libplist++.so.1" "libplist++.so\x00\x00" $(PREFIX)/lib/libplist++.so
-	$(RPL) -e "libplist.so.1" "libplist.so\x00\x00" $(PREFIX)/lib/libplist++.so
-	-$(READELF) --dynamic $(PREFIX)/lib/libplist++.so | grep ibrary
-endif
 	touch $@
 
 clean:
diff --git a/tools/depends/target/samba-gplv3/Makefile b/tools/depends/target/samba-gplv3/Makefile
index e15987d9c4..9c54147e1a 100644
--- a/tools/depends/target/samba-gplv3/Makefile
+++ b/tools/depends/target/samba-gplv3/Makefile
@@ -69,12 +69,6 @@ ifeq (darwin, $(findstring darwin, $(HOST)))
 	mv $(PREFIX)/lib/libsmbclient.dylib.0 $(PREFIX)/lib/libsmbclient.dylib
 	install_name_tool -id $(PREFIX)/lib/libsmbclient.dylib $(PREFIX)/lib/libsmbclient.dylib
 endif
-ifeq ($(OS),android)
-	rm -f $(PREFIX)/lib/libsmbclient.so 
-	mv -f $(PREFIX)/lib/libsmbclient.so.0 $(PREFIX)/lib/libsmbclient.so
-	$(RPL) -e "libsmbclient.so.0" "libsmbclient.so\x00\x00" $(PREFIX)/lib/libsmbclient.so
-	-$(READELF) --dynamic $(PREFIX)/lib/libsmbclient.so | grep ibrary
-endif
 	touch $@
 
 clean: