commit 7e8b1520d3b9f849be92ec3b2a7bb61b580a1027
author Sébastien Blin <sebastien.blin@savoirfairelinux.com> Mon Oct 25 14:02:32 2021 -0400
committer Sébastien Blin <sebastien.blin@savoirfairelinux.com> Thu Sep 07 09:01:44 2023 -0400
tree fe7a13fc2a3eac7ea079136b0cf40b3d576f34f8
parent 405e09ddf0f07196d3016aebadfabf86ddf580a7

0001 android

Change-Id: I30ec583f72dcb6dae981d65b12ba4a7734c12bd3

aconfigure

diff --git a/aconfigure b/aconfigure
index 66f88ef..21a59b4 100755
--- a/aconfigure
+++ b/aconfigure
@@ -6618,9 +6618,6 @@
 	esac
 	# UUID
 	case $target in
-	  *android*)
-	  	ac_os_objs="$ac_os_objs guid_android.o"
-	  	;;
 	  *darwin*)
 	  	ac_os_objs="$ac_os_objs guid_darwin.o"
 	  	;;

aconfigure.ac

diff --git a/aconfigure.ac b/aconfigure.ac
index 986a58a..2fefcc3 100644
--- a/aconfigure.ac
+++ b/aconfigure.ac
@@ -556,9 +556,6 @@
 	esac
 	# UUID
 	case $target in
-	  *android*)
-	  	ac_os_objs="$ac_os_objs guid_android.o"
-	  	;;
 	  *darwin*)
 	  	ac_os_objs="$ac_os_objs guid_darwin.o"
 	  	;;

pjlib/src/pj/os_timestamp_posix.c

diff --git a/pjlib/src/pj/os_timestamp_posix.c b/pjlib/src/pj/os_timestamp_posix.c
index 07ef682..0371aad 100644
--- a/pjlib/src/pj/os_timestamp_posix.c
+++ b/pjlib/src/pj/os_timestamp_posix.c
@@ -202,7 +202,7 @@
     return PJ_SUCCESS;
 }
 
-#elif defined(__ANDROID__)
+#elif defined(PJ_ANDROID) && PJ_ANDROID
 
 #include <errno.h>
 #include <time.h>