Changeset 5574

Timestamp:

Mar 29, 2017 5:07:47 AM (8 years ago)

Author:

riza

Message:

Fix #2006: Fix android build failed using NDK r14 caused by by the removal of android_alarm.h.

Location:

pjproject/trunk

Files:

• aconfigure (modified) (6 diffs)
• aconfigure.ac (modified) (1 diff)
• pjlib/src/pj/os_timestamp_posix.c (modified) (4 diffs)

pjproject/trunk/aconfigure

@@ -756 +756 @@
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
@@ -878 +879 @@
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
@@ -1130 +1132 @@
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
@@ -1267 +1278 @@
                 datadir sysconfdir sharedstatedir localstatedir includedir \
                 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-                libdir localedir mandir
+                libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
@@ -1420 +1431 @@
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
@@ -5416 +5428 @@
 
 
+case $target in
+  *android*)
+        ac_fn_c_check_header_mongrel "$LINENO" "linux/android_alarm.h" "ac_cv_header_linux_android_alarm_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_android_alarm_h" = xyes; then :
+  $as_echo "#define PJ_HAS_ANDROID_ALARM_H 1" >>confdefs.h
+
+fi
+
+
+        ;;
+esac
+
 ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r"
 if test "x$ac_cv_func_localtime_r" = xyes; then :

pjproject/trunk/aconfigure.ac

@@ -266 +266 @@
                   #endif
                  ])
+
+case $target in
+  *android*)
+        AC_CHECK_HEADER(linux/android_alarm.h,[AC_DEFINE(PJ_HAS_ANDROID_ALARM_H,1)])
+        ;;
+esac
 
 AC_CHECK_FUNC(localtime_r,[AC_DEFINE(PJ_HAS_LOCALTIME_R,1)])

pjproject/trunk/pjlib/src/pj/os_timestamp_posix.c

@@ -164 +164 @@
 
 #include <errno.h>
-#include <linux/android_alarm.h>
-#include <fcntl.h>
 #include <time.h>
 
+#if defined(PJ_HAS_ANDROID_ALARM_H) && PJ_HAS_ANDROID_ALARM_H != 0
+#  include <linux/android_alarm.h>
+#  include <fcntl.h>
+#endif
+
 #define NSEC_PER_SEC    1000000000
 
+#if defined(ANDROID_ALARM_GET_TIME)
 static int s_alarm_fd = -1;
 
@@ -178 +182 @@
     s_alarm_fd = -1;
 }
+#endif
 
 PJ_DEF(pj_status_t) pj_get_timestamp(pj_timestamp *ts)
@@ -184 +189 @@
     int err = -1;
 
+#if defined(ANDROID_ALARM_GET_TIME)
     if (s_alarm_fd == -1) {
         int fd = open("/dev/alarm", O_RDONLY);
@@ -196 +202 @@
               ANDROID_ALARM_GET_TIME(ANDROID_ALARM_ELAPSED_REALTIME), &tp);
     }
+#elif defined(CLOCK_BOOTTIME)
+    err = clock_gettime(CLOCK_BOOTTIME, &tp);
+#endif
     
     if (err != 0) {
         /* Fallback to CLOCK_MONOTONIC if /dev/alarm is not found, or
-         * getting ANDROID_ALARM_ELAPSED_REALTIME fails.
+         * getting ANDROID_ALARM_ELAPSED_REALTIME fails, or 
+         * CLOCK_BOOTTIME fails.
          */
         err = clock_gettime(CLOCK_MONOTONIC, &tp);