Bug 1134110 - other-license/android is unnecessary if Android minimum version is 11 or later. f=esawin, r=sworkman
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Thu, 14 May 2015 15:38:18 +0900
changeset 243883 5017c72ac8aa928a83a9934b5bb4d0a8621715fa
parent 243882 66a72727e1b3247834e8828b3727d8926dfd2c73
child 243884 1229539b527cbcfe5e07afb11878e28ef6a09868
push id12951
push userkwierso@gmail.com
push dateThu, 14 May 2015 22:42:21 +0000
treeherderfx-team@98d3f93bb94a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssworkman
bugs1134110
milestone41.0a1
Bug 1134110 - other-license/android is unnecessary if Android minimum version is 11 or later. f=esawin, r=sworkman
configure.in
moz.build
--- a/configure.in
+++ b/configure.in
@@ -7273,17 +7273,17 @@ fi
 
 dnl We need to wrap dlopen and related functions on Android because we use
 dnl our own linker.
 if test "$OS_TARGET" = Android; then
     MOZ_GLUE_WRAP_LDFLAGS="${MOZ_GLUE_WRAP_LDFLAGS} -Wl,--wrap=PR_GetEnv,--wrap=PR_SetEnv"
     if test "$MOZ_WIDGET_TOOLKIT" = gonk -a -n "$MOZ_NUWA_PROCESS"; then
         MOZ_GLUE_WRAP_LDFLAGS="${MOZ_GLUE_WRAP_LDFLAGS} -Wl,--wrap=pthread_create,--wrap=epoll_wait,--wrap=poll,--wrap=pthread_cond_timedwait,--wrap=pthread_cond_wait,--wrap=epoll_create,--wrap=epoll_ctl,--wrap=close,--wrap=pthread_key_create,--wrap=pthread_key_delete,--wrap=socketpair,--wrap=pthread_self,--wrap=pthread_mutex_lock,--wrap=pthread_mutex_trylock,--wrap=pthread_join,--wrap=pipe,--wrap=pipe2"
     fi
-    if test "$MOZ_WIDGET_TOOLKIT" = android; then
+    if test "$MOZ_WIDGET_TOOLKIT" = android -a "$MOZ_ANDROID_MIN_SDK_VERSION" -lt 11; then
         MOZ_GLUE_WRAP_LDFLAGS="${MOZ_GLUE_WRAP_LDFLAGS} -Wl,--wrap=getaddrinfo,--wrap=freeaddrinfo,--wrap=gai_strerror"
     fi
 fi
 
 AC_SUBST_LIST(MOZ_GLUE_WRAP_LDFLAGS)
 export MOZ_GLUE_WRAP_LDFLAGS
 
 dnl ========================================================
--- a/moz.build
+++ b/moz.build
@@ -35,17 +35,17 @@ if not CONFIG['JS_STANDALONE']:
 if not CONFIG['LIBXUL_SDK']:
     DIRS += [
         'config/external/zlib',
         'memory',
         'mfbt',
         'mozglue',
     ]
 
-    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android' and int(CONFIG['MOZ_ANDROID_MIN_SDK_VERSION']) < 11:
         DIRS += ['other-licenses/android']
 
 if not CONFIG['JS_STANDALONE']:
     DIRS += ['xpcom/xpidl']
 
 if CONFIG['COMPILE_ENVIRONMENT'] and not CONFIG['LIBXUL_SDK']:
     DIRS += ['config/external/nspr']