commit d6f024d0e13b993ca1841f5518c4983f1402510e
author Chinh Tran <chinht@codeaurora.org> Mon Jan 10 15:14:57 2011 -0800
committer Chinh Tran <chinht@codeaurora.org> Thu Jan 13 15:38:09 2011 -0800
tree 3c1252b017e0ddf916f2d6fc6cd94089979226a5
parent 332ff663bbbe7a8cf6b4e1185868b02b16c9a408

external/connectivity: Enable CNE functionalities

Enable the CNE functionalities and merge to Gingerbread.

Change-Id: Id72f660358f9c6dc59f82290b9d05c8149bb37c6

cnd/inc/cnd.h

diff --git a/cnd/inc/cnd.h b/cnd/inc/cnd.h
old mode 100644
new mode 100755
index 5c5b60c..1d6bec3
--- a/cnd/inc/cnd.h
+++ b/cnd/inc/cnd.h
@@ -28,15 +28,15 @@
 #define CNE_LOGW(...) LOGW(__VA_ARGS__)
 #define CNE_LOGI(...) \
     ( (CONDITION(CNE_DEBUG_LOGGING)) \
-    ? LOG(LOG_INFO, LOCAL_TAG, __VA_ARGS__) \
+    ? (void)LOG(LOG_INFO, LOCAL_TAG, __VA_ARGS__) \
     : (void)0 )
 #define CNE_LOGD(...) \
     ( (CONDITION(CNE_DEBUG_LOGGING)) \
-    ? LOG(LOG_DEBUG, LOCAL_TAG, __VA_ARGS__) \
+    ? (void)LOG(LOG_DEBUG, LOCAL_TAG, __VA_ARGS__) \
     : (void)0 )
 #define CNE_LOGV(...) \
     ( (CONDITION(CNE_DEBUG_LOGGING)) \
-    ? LOG(LOG_VERBOSE, LOCAL_TAG, __VA_ARGS__) \
+    ? (void)LOG(LOG_VERBOSE, LOCAL_TAG, __VA_ARGS__) \
     : (void)0 )
 
 #ifdef __cplusplus

cnd/src/Android.mk

diff --git a/cnd/src/Android.mk b/cnd/src/Android.mk
old mode 100644
new mode 100755
index 9a6fbba..aa73d21
--- a/cnd/src/Android.mk
+++ b/cnd/src/Android.mk
@@ -1,6 +1,5 @@
 # For cnd binary
 # =======================
-ifneq ($(BUILD_ID), GINGERBREAD)
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -15,7 +14,9 @@
 
 LOCAL_SHARED_LIBRARIES := \
         libutils \
+        libbinder \
         libcutils \
+        libdl \
         libhardware_legacy \
 
 LOCAL_C_INCLUDES := \
@@ -25,5 +26,4 @@
 include external/connectivity/stlport/libstlport.mk
 
 include $(BUILD_EXECUTABLE)
-endif
 # vim: et