Device class implementation
diff --git a/btcore/Android.mk b/btcore/Android.mk
index 3375d02..ec5fe6a 100644
--- a/btcore/Android.mk
+++ b/btcore/Android.mk
@@ -28,6 +28,7 @@
 LOCAL_SRC_FILES := \
     src/bdaddr.c \
     src/counter.c \
+    src/device_class.c \
     src/module.c \
     src/property.c \
     src/uuid.c
@@ -51,11 +52,13 @@
 LOCAL_SRC_FILES := \
     ./test/bdaddr_test.cpp \
     ./test/counter_test.cpp \
+    ./test/device_class_test.cpp \
     ./test/uuid_test.cpp \
     ../osi/test/AllocationTestHarness.cpp
 
 LOCAL_CFLAGS := -Wall -Werror -Werror=unused-variable
 LOCAL_MODULE := net_test_btcore
+
 LOCAL_MODULE_TAGS := tests
 LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_STATIC_LIBRARIES := libbtcore libosi