Refactoring the TB_LOG flag for Android builds.

The TB_LOG flag on Android should not be defined with '-D'.
When using compilers for an arch type other than armeabi
or x86 (reproducable for sure on armeabi-v7a), the definition
for TB_LOG ended up being "-D-DTB_LOG".

This issue & solution was raised by an outside contributor
Anton Spaans <flyingdutchie@gmail.com>.

Change-Id: I9f8caeec37e241fb62772bc8d9f9628f87ff0eb0
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1152
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>

diff --git a/build_common/android/SConscript b/build_common/android/SConscript
index b90beb0..ca96af6 100644 (file)
--- a/build_common/android/SConscript
+++ b/build_common/android/SConscript
@@ -202,7 +202,7 @@ else:
        env.AppendUnique(CCFLAGS = ['-g'])
 
 if env.get('LOGGING'):
-        env.AppendUnique(CPPDEFINES = ['-DTB_LOG'])
+        env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
 
 env.AppendUnique(CPPDEFINES = ['WITH_POSIX', '__ANDROID__'])

diff --git a/resource/csdk/connectivity/build/android/SConscript b/resource/csdk/connectivity/build/android/SConscript
index 32880e7..1a50785 100644 (file)
--- a/resource/csdk/connectivity/build/android/SConscript
+++ b/resource/csdk/connectivity/build/android/SConscript
@@ -164,7 +164,7 @@ else:
        env.AppendUnique(CCFLAGS = ['-g'])
 
 if env.get('LOGGING'):
-        env.AppendUnique(CPPDEFINES = ['-DTB_LOG'])
+        env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
 env.AppendUnique(CPPDEFINES = ['WITH_POSIX', '__ANDROID__'])
 env.AppendUnique(CCFLAGS = ['-Wall', '-fPIC'])

diff --git a/service/notification-manager/SConscript b/service/notification-manager/SConscript
index 39c4eb5..7dc9128 100644 (file)
--- a/service/notification-manager/SConscript
+++ b/service/notification-manager/SConscript
@@ -31,7 +31,7 @@ else:
        env.AppendUnique(CCFLAGS = ['-g'])
 
 if env.get('LOGGING'):
-       env.AppendUnique(CPPDEFINES = ['-DTB_LOG'])
+       env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
 lib_env = env.Clone()
 SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')