diff options
| author | Madan Mohan Koyyalamudi <mkoyya@codeaurora.org> | 2013-11-15 15:57:40 -0800 |
|---|---|---|
| committer | Madan Mohan Koyyalamudi <mkoyya@codeaurora.org> | 2013-11-15 15:57:40 -0800 |
| commit | e81981aa12a5824d211f5e262acfcc0b8b9692be (patch) | |
| tree | 96d99f6512b8372e0cb6ece6c71312def19fdd5b /tools | |
| parent | afa425f1d64b28581c8980afeed253d092e4b9f9 (diff) | |
| parent | abd4e4531dec7165cb94de4a8def1b11b5074f57 (diff) | |
Merge remote-tracking branch 'origin/caf/caf-wlan/master'
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/athdiag/Android.mk | 1 | ||||
| -rw-r--r-- | tools/athdiag/athdiag.c | 4 | ||||
| -rw-r--r-- | tools/fwdebuglog/Android.mk | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/tools/athdiag/Android.mk b/tools/athdiag/Android.mk index a1744e0ad868..9cda732d17d1 100644 --- a/tools/athdiag/Android.mk +++ b/tools/athdiag/Android.mk @@ -5,5 +5,4 @@ LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../CORE/SERVICES/COMMON LOCAL_SHARED_LIBRARIES := libc libcutils LOCAL_SRC_FILES := athdiag.c -LOCAL_CFLAGS := $(CFLAGS) include $(BUILD_EXECUTABLE) diff --git a/tools/athdiag/athdiag.c b/tools/athdiag/athdiag.c index 12616b6c38d3..9f91dac9f304 100644 --- a/tools/athdiag/athdiag.c +++ b/tools/athdiag/athdiag.c @@ -614,7 +614,7 @@ main (int argc, char **argv) { case 'D': snprintf(devicename, sizeof(devicename), "%s%s", optarg, - "/athdiag"); + "/athdiagpfs"); flag |= DEVICE_FLAG; break; @@ -639,7 +639,7 @@ main (int argc, char **argv) { * line, try to figure it out. Typically there's only a * single device anyway. */ - find_dev = popen("busybox find /proc -name athdiagpfs | busybox head -1", "r"); + find_dev = popen("echo /proc/cld/athdiagpfs", "r"); if (find_dev) { nbytes=fread(devicename, 1, sizeof(devicename), find_dev); pclose(find_dev); diff --git a/tools/fwdebuglog/Android.mk b/tools/fwdebuglog/Android.mk index 17ce0871be2c..1fd90a13e36e 100644 --- a/tools/fwdebuglog/Android.mk +++ b/tools/fwdebuglog/Android.mk @@ -5,7 +5,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../CORE/SERVICES/COMMON LOCAL_SHARED_LIBRARIES := libc libcutils LOCAL_SRC_FILES := cld-fwlog-record.c -LOCAL_CFLAGS := $(CFLAGS) include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) @@ -14,7 +13,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../CORE/SERVICES/COMMON LOCAL_SHARED_LIBRARIES := libc libcutils LOCAL_SRC_FILES := cld-fwlog-netlink.c parser.c -LOCAL_CFLAGS := $(CFLAGS) LOCAL_CFLAGS += -DCONFIG_ANDROID_LOG LOCAL_LDLIBS += -llog LOCAL_LDLIBS := -landroid @@ -26,5 +24,4 @@ LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../CORE/SERVICES/COMMON LOCAL_SHARED_LIBRARIES := libc libcutils LOCAL_SRC_FILES := cld-fwlog-parser.c -LOCAL_CFLAGS := $(CFLAGS) include $(BUILD_EXECUTABLE) |