diff --git a/sensors/Android.bp b/sensors/Android.bp
index 597870a..35b1476 100755
--- a/sensors/Android.bp
+++ b/sensors/Android.bp
@@ -1,71 +1,68 @@
-//cc_library_static {
-//    name: "multihal-samsung8974",
-//    vendor: true,
-//    srcs: [
-//        "multihal.cpp",
-//        "SensorEventQueue.cpp",
-//    ],
-//    header_libs: [
-//        "libhardware_headers",
-//    ],
-//    shared_libs: [
-//        "liblog",
-//        "libcutils",
-//        "libutils",
-//        "libdl",
-//    ],
-//    export_include_dirs: ["."],
-//    cflags: [
-//        "-Wall",
-//        "-Werror",
-//    ],
-//}
-//
-//cc_library_shared {
-//    name: "android.hardware.sensors@1.0-impl.samsung8974",
-//    defaults: ["hidl_defaults"],
-//    proprietary: true,
-//    relative_install_path: "hw",
-//    srcs: ["Sensors.cpp"],
-//    shared_libs: [
-//        "liblog",
-//        "libcutils",
-//        "libhardware",
-//        "libbase",
-//        "libutils",
-//        "libhidlbase",
-//        "libhidltransport",
-//        "android.hardware.sensors@1.0",
-//    ],
-//    static_libs: [
-//        "android.hardware.sensors@1.0-convert",
-//        "multihal-samsung8974",
-//    ],
-//    local_include_dirs: ["include/sensors"],
-//}
-//
-//cc_binary {
-//    name: "android.hardware.sensors@1.0-service.samsung8974",
-//    defaults: ["hidl_defaults"],
-//    relative_install_path: "hw",
-//    vendor: true,
-//    init_rc: ["android.hardware.sensors@1.0-service.samsung8974.rc"],
-//    srcs: ["service.cpp"],
-//
-//    shared_libs: [
-//        "liblog",
-//        "libcutils",
-//        "libdl",
-//        "libbase",
-//        "libutils",
-//        "libhidlbase",
-//        "libhidltransport",
-//        "libhwbinder",
-//        "android.hardware.sensors@1.0",
-//    ],
-//    arch: {
-//        arm: {
-//            cflags: ["-DARCH_ARM_32"],
-//        },
-//    },
-//}
+cc_library_static {
+    name: "multihal-samsung8974",
+    vendor: true,
+    srcs: [
+        "multihal.cpp",
+        "SensorEventQueue.cpp",
+    ],
+    header_libs: [
+        "libhardware_headers",
+    ],
+    shared_libs: [
+        "liblog",
+        "libcutils",
+        "libutils",
+        "libdl",
+    ],
+    export_include_dirs: ["."],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+}
+
+cc_library_shared {
+    name: "android.hardware.sensors@1.0-impl.samsung8974",
+    defaults: ["hidl_defaults"],
+    proprietary: true,
+    relative_install_path: "hw",
+    srcs: ["Sensors.cpp"],
+    shared_libs: [
+        "liblog",
+        "libcutils",
+        "libhardware",
+        "libbase",
+        "libutils",
+        "libhidlbase",
+        "android.hardware.sensors@1.0",
+    ],
+    static_libs: [
+        "android.hardware.sensors@1.0-convert",
+        "multihal-samsung8974",
+    ],
+    local_include_dirs: ["include/sensors"],
+}
+
+cc_binary {
+    name: "android.hardware.sensors@1.0-service.samsung8974",
+    defaults: ["hidl_defaults"],
+    relative_install_path: "hw",
+    vendor: true,
+    init_rc: ["android.hardware.sensors@1.0-service.samsung8974.rc"],
+    srcs: ["service.cpp"],
+
+    shared_libs: [
+        "liblog",
+        "libcutils",
+        "libdl",
+        "libbase",
+        "libutils",
+        "libhidlbase",
+        "android.hardware.sensors@1.0",
+    ],
+    arch: {
+        arm: {
+            cflags: ["-DARCH_ARM_32"],
+        },
+    },
+}