Bug 1377970 - add -llog for Android in moz.build; r=chmanchester

Adding -llog in this way is cleaner and is just a little bit less m4.
dothq · Jul 5, 2017 · 3b6501d · 3b6501d
1 parent 79777e9
commit 3b6501d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4
@@ -23,8 +23,6 @@ case "$target" in
     dnl undefined symbol (present on the hardware, just not in the
     dnl NDK.)
     LDFLAGS="-L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform -Wl,--allow-shlib-undefined $LDFLAGS"
-    dnl Add -llog by default, since we use it all over the place.
-    LIBS="-llog $LIBS"
     ANDROID_PLATFORM="${android_platform}"
 
     AC_DEFINE(ANDROID)

diff --git a/build/templates.mozbuild b/build/templates.mozbuild
@@ -21,6 +21,10 @@ def Binary():
     if CONFIG['STLPORT_LIBS']:
         OS_LIBS += [CONFIG['STLPORT_LIBS']]
 
+    # Add -llog by default, since we use it all over the place.
+    if CONFIG['OS_TARGET'] == 'Android':
+        OS_LIBS += ['log']
+
 
 @template
 def Program(name):