From d58cba9c4000099e096b5c0e9c1279d477ebde9e Mon Sep 17 00:00:00 2001 From: Sergey Sizonov Date: Thu, 8 Dec 2016 09:13:05 +0300 Subject: [PATCH] [toa] Revert "[toa] Add a support of building for the Android." This reverts commit 43e1bf7c266bfb8fdea03b7716e47f67a6993bbd. As we now build this package by gbs we reverted changes we've made to support Android build. Change-Id: I57581a1f8f0c4dc1f5815960c06990cb42bfd4a7 --- android/how_to_deploy.txt | 58 ----------------------------------------------- android/libtdm-1.3.0.spec | 38 ------------------------------- configure.ac | 10 -------- src/Makefile.am | 10 +------- src/tdm_thread.c | 13 ++--------- 5 files changed, 3 insertions(+), 126 deletions(-) delete mode 100755 android/how_to_deploy.txt delete mode 100644 android/libtdm-1.3.0.spec diff --git a/android/how_to_deploy.txt b/android/how_to_deploy.txt deleted file mode 100755 index 23e5b22..0000000 --- a/android/how_to_deploy.txt +++ /dev/null @@ -1,58 +0,0 @@ -This guide for the development under the Android. - -> - host promt -@ - chroot system promt -$ - target promt - -- All commans are executed on the host unless otherwise specified. -- Some files you may find on ownCloud -- Public/ToA . - -1. Create bootstrap: https://debian.pro/440 (Russian) - > cd - > sudo debootstrap trusty . http://mirror.yandex.ru/ubuntu - -2. Make some preparations to your new system: - - mount host's proc fs to your new system /proc - (you may make this mount permanently by adding an entry to /etc/fstab on the host) - -3. Login in created system: - > sudo chroot - - http://la2ha.ru/dev-seo-diy/unix/setting_locale_failed (Russian) - -4. Create an user you will use under the devopment (on your new system). -5. Fix the problem with sudoers file (on your new system) -- http://unixforum.org/index.php?showtopic=135020 . (Russian) -6. Install make, autoconf, libtool, texinfo and pkg-config packages (on your new system). -7. Install android-tools-adb packages(amd64) (on your new system) -- http://packages.ubuntu.com/ru/trusty/devel/android-tools-adb . -8. Download Android ndk -- https://developer.android.com/ndk/downloads/index.html . - -9. Extract a standalone android toolchain: -- https://developer.android.com/ndk/guides/standalone_toolchain.html - > cd - > build/tools/make-standalone-toolchain.sh --toolchain=arm-linux-androideabi-4.9 --platform=android-22 --install-dir= - -10. Add a path to the android toolchain to your system PATH env variable (on your new system): - @ echo "PATH=${HOME}/bin/android_toolchain/bin:${PATH}" >> ~/.bashrc - -11. Add a path to the ~/bin to your system PATH env variable (on your new system): - @ echo "PATH=${HOME}/bin/:${PATH}" >> ~/.bashrc - -12. Prepare rpm (on your new system): - @ sudo apt-get install rpm - @ mkdir -p ~/redhat/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} - @ echo "%_topdir /home/$USER/redhat" >> ~/.rpmmacros - -Now you have the prepared environment to build for the Android. - -What to do next is your choise... - -Suggested steps are: - - download a sources for a project you want to build for the Android. - - create .spec file: - - set a prefix variable to /usr/local, if your project use an autotools, - to avoid a cluttering your chroot's root [by default prefix is /usr/local]. - - run rpmbuild --target armv7l -bb <.spec file> . - - if you want to install the build results to a target add an option '--noclean' (you will be able - to copy the results to a target easy). - - install rpm packages to your chroot system: sudo rpm -ivh --nodeps --ignorearch <.rpm to install> . - - a next build will be able to use a resulst of the current build. - - copy the build results to a target: adb push ~/redhat/BUILDROOT/ . - - do not forget to remove an unnecessary files: *.la, *.h, *.pc and so on. diff --git a/android/libtdm-1.3.0.spec b/android/libtdm-1.3.0.spec deleted file mode 100644 index ad6dada..0000000 --- a/android/libtdm-1.3.0.spec +++ /dev/null @@ -1,38 +0,0 @@ -Name: libtdm -Version: 1.3.0 -Release: 0 -Summary: User Library of Tizen Display Manager -Group: Development/Libraries -License: MIT -Source0: %{name}-%{version}.tar.gz - -%description -Common user library of Tizen Display Manager : libtdm front-end library - -%prep -# our %{name}-%{version}.tar.gz archive hasn't top-level directory, -# so we create it -%setup -q -c %{name}-%{version} - -%build -PKG_CONFIG_PATH=/usr/local/lib/pkgconfig \ -./autogen.sh --build=x86_64-unknown-linux-gnu \ - --host=arm-linux-androideabi \ - --disable-static \ - --enable-android-support \ - CFLAGS="${CFLAGS} -Wall" \ - LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed" - -make %{?_smp_mflags} - -%install -rm -rf %{buildroot} - -%make_install - -%clean -rm -rf %{buildroot} - -%files -%defattr(-,root,root,-) -/usr/local/* diff --git a/configure.ac b/configure.ac index 95e229e..c2bb484 100644 --- a/configure.ac +++ b/configure.ac @@ -30,16 +30,6 @@ LT_INIT([disable-static]) # Enable quiet compiles on automake 1.11. m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AC_ARG_ENABLE([android-support], AS_HELP_STRING([--enable-android-support], [to build for the Android]),, - enable_android_support=no) - -AM_CONDITIONAL([ANDROID_SUPPORT], [test "x$enable_android_support" != "xno"]) - -if test "x$enable_android_support" != "xno"; then - AC_MSG_WARN("Library is being built under the Android.") - AC_DEFINE(HAVE_ANDROID_SUPPORT, 1, [If the library is being built under the Android.]) -fi - AC_PATH_PROG([wayland_scanner], [wayland-scanner]) if test x$wayland_scanner = x; then AC_MSG_ERROR([wayland-scanner is needed to compile]) diff --git a/src/Makefile.am b/src/Makefile.am index 3cae03b..2af9638 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,15 +1,7 @@ libtdm_la_LTLIBRARIES = libtdm.la libtdm_ladir = $(libdir) libtdm_la_LDFLAGS = -version-number 1:0:0 -no-undefined -libtdm_la_LIBADD = $(TDM_LIBS) -ldl ../common/libtdm-common.la - -# the Android's libc (bionic) has the built-in support for pthread -if ANDROID_SUPPORT -libtdm_la_LIBADD += -lm -else -libtdm_la_LIBADD += -lpthread -endif - +libtdm_la_LIBADD = $(TDM_LIBS) -ldl -lpthread ../common/libtdm-common.la libtdm_la_CFLAGS = \ $(CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/src/tdm_thread.c b/src/tdm_thread.c index 178d7f8..03ce03a 100644 --- a/src/tdm_thread.c +++ b/src/tdm_thread.c @@ -179,18 +179,9 @@ tdm_thread_deinit(tdm_private_loop *private_loop) if (!private_loop->private_thread) return; - - /* TODO: the Android's libc (bionic) doesn't implement full POSIX threads - * functionality, in particular pthread_cancel, so we have to figure out - * how to stop this thread by the another means or to implement pthread_cancel by self. - * Now this function is called ONLY before a program termination, so we don't care - * about anything :-) */ -#ifndef HAVE_ANDROID_SUPPORT + pthread_cancel(private_loop->private_thread->event_thread); -#else - return; -#endif - + private_display = private_loop->dpy; /* before falling into the block of pthread_join, we have to unlock the mutex -- 2.7.4