commit 962ba888939282ab1731952422725d9eeccf7f52
author Rajulu Ponnada <rajulu@codeaurora.org> Wed Aug 01 18:18:18 2012 -0700
committer Rajulu Ponnada <rajulu@codeaurora.org> Wed Aug 15 00:51:14 2012 -0700
tree 05d93b831490a30896f02a9e002e9d5c2e2bf718
parent b8490a22ccd6976d7fd90e4b175c3678261c2a99

testframework: support for w/o usb logging for testframework

1)support scripting
2)support for command line args which helps in logging w/o usb

Change-Id: I59de8b11fb75dbc254d89106717ffbc68fb43cd3

Android.mk

diff --git a/Android.mk b/Android.mk
index a648c58..c82d8bd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,17 +9,23 @@
         src/TestFrameworkApi.cpp \
         src/TestFrameworkCommon.cpp \
         src/TestFrameworkHash.cpp \
-        src/TestFramework.cpp \
         src/TestFrameworkService.cpp
 
 LOCAL_CFLAGS := -DCUSTOM_EVENTS_TESTFRAMEWORK
 
 LOCAL_C_INCLUDES := $(TOP)/vendor/qcom/opensource/testframework
 
-LOCAL_SHARED_LIBRARIES += \
-        libutils \
-        libcutils \
-        libbinder
+LOCAL_SHARED_LIBRARIES += libutils libcutils
+
+ifeq ($(TF_FEATURE_USES_BINDER),true)
+LOCAL_CFLAGS += -DTF_FEATURE_USE_BINDER
+LOCAL_SRC_FILES += src/TestFramework.cpp
+LOCAL_SHARED_LIBRARIES += libbinder
+endif
+
+ifeq ($(call is-android-codename,JELLY_BEAN),true)
+LOCAL_CFLAGS += -DJB
+endif
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE:= libtestframework
@@ -34,9 +40,19 @@
 
 LOCAL_C_INCLUDES := vendor/qcom/opensource/testframework
 
-LOCAL_SHARED_LIBRARIES := libtestframework libcutils libutils libbinder
+LOCAL_SHARED_LIBRARIES := libtestframework libcutils libutils
 
 LOCAL_CFLAGS := -DCUSTOM_EVENTS_TESTFRAMEWORK
+
+ifeq ($(TF_FEATURE_USES_BINDER),true)
+LOCAL_CFLAGS += -DTF_FEATURE_USE_BINDER
+LOCAL_SHARED_LIBRARIES += libbinder
+endif
+
+ifeq ($(call is-android-codename,JELLY_BEAN),true)
+LOCAL_CFLAGS += -DJB
+endif
+
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE:= testframeworkservice