Fix the memory leak in app battery info

[platform/core/connectivity/bluetooth-frwk.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec41c20..548eeec 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,14 +2,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 ADD_SUBDIRECTORY(bt-api)
 
-IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_TEST_EMUL")
-ADD_SUBDIRECTORY(bt-service-emul)
-ELSE()
-ADD_SUBDIRECTORY(bt-service)
-ENDIF()
+ADD_SUBDIRECTORY(bt-oal)
+ADD_SUBDIRECTORY(bt-service-adaptation)
 
-ADD_SUBDIRECTORY(bt-httpproxy)
+IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_FEATURE_BT_HTTP_PROXY")
+#ADD_SUBDIRECTORY(bt-httpproxy)
+ENDIF()
 
+# TODO_40 : 4.0 merge
 ADD_SUBDIRECTORY(bt-otp)
 
 ADD_SUBDIRECTORY(bt-core)