tee: Clean up blueprint files

Lots of weird formatting and commented lines

Change-Id: I1b4df444f8ac78b9c4e59f6738c5655905b8f4ae

37 files changed, 161 insertions, 154 deletions

diff --git a/tee/TlcKeymint/Android.bp b/tee/TlcKeymint/Android.bp
index 6442389..a28b893 100644
--- a/tee/TlcKeymint/Android.bp
+++ b/tee/TlcKeymint/Android.bp
@@ -31,7 +31,7 @@ soong_namespace {
     imports: [
         "hardware/samsung_slsi-linaro/exynos/tee/kinibi520",
         "hardware/samsung_slsi-linaro/exynos/tee/kinibi510",
-        "hardware/samsung_slsi-linaro/exynos/tee/kinibi500"
+        "hardware/samsung_slsi-linaro/exynos/tee/kinibi500",
     ],
 }
 
@@ -53,7 +53,7 @@ cc_defaults {
         "src/tlcKeymint_if.cpp",
         "src/TrustonicKeymintDeviceImpl.cpp",
         //ExySp
-        "src/exynos_ssp_hwctl.cpp"
+        "src/exynos_ssp_hwctl.cpp",
     ],
     shared_libs: [
         "libhidlbase",
@@ -74,15 +74,16 @@ cc_defaults {
         "trustonic-api-headers",
     ],
     local_include_dirs: [
-     "include",
+        "include",
     ],
 }
 
 cc_binary {
     name: "android.hardware.security.keymint@1.0_tee-service",
     relative_install_path: "hw",
-    defaults: ["hidl_defaults",
-	"libkeymint.trustonic.default",
+    defaults: [
+        "hidl_defaults",
+        "libkeymint.trustonic.default",
     ],
     init_rc: ["android.hardware.security.keymint@1.0_tee-service.rc"],
 
@@ -108,6 +109,6 @@ cc_binary {
         "trustonic-api-headers",
     ],
     required: [
-	"android.hardware.hardware_keystore.xml",
+        "android.hardware.hardware_keystore.xml",
     ],
 }
diff --git a/tee/TlcTeeGatekeeper/Android.bp b/tee/TlcTeeGatekeeper/Android.bp
index cf692ec..6e4ed06 100644
--- a/tee/TlcTeeGatekeeper/Android.bp
+++ b/tee/TlcTeeGatekeeper/Android.bp
@@ -29,8 +29,8 @@ gatekeeper_cc_library_shared {
     proprietary: true,
 
     srcs: [
-      "src/*.cpp",
-      "src/*.c"
+        "src/*.cpp",
+        "src/*.c",
     ],
 
     cflags: [
@@ -38,22 +38,22 @@ gatekeeper_cc_library_shared {
         "-Werror",
         "-Wmissing-field-initializers",
         "-Wunused-parameter",
-        "-DUSE_VENDOR_PARTITION"
     ],
-    cppflags: ["-std=c++11"] + [
+    cpp_std: "c++11",
+    cppflags: [
         "-fpermissive",
         "-Wall",
         "-Werror",
         "-D__STDC_LIMIT_MACROS",
-        "-D__FAILURE_RECORD_STORAGE_IN_SECURE_OBJECT__"
+        "-D__FAILURE_RECORD_STORAGE_IN_SECURE_OBJECT__",
     ],
 
     local_include_dirs: ["include"],
 
     include_dirs: [
-      "hardware/libhardware/include/",
-      "system/core/libsystem/include/",
-      "system/core/libcutils/include_outside_system/"
+        "hardware/libhardware/include/",
+        "system/core/libsystem/include/",
+        "system/core/libcutils/include_outside_system/",
     ],
 
     shared_libs: [
@@ -62,10 +62,10 @@ gatekeeper_cc_library_shared {
         "libutils",
         "libdl",
         "libgatekeeper",
-        "libMcClient"
+        "libMcClient",
     ],
 
-  soong_config_variables: {
+    soong_config_variables: {
         target_board_platform: {
             name: "gatekeeper.%s",
             conditions_default: {
diff --git a/tee/TlcTeeKeymaster4/Android.bp b/tee/TlcTeeKeymaster4/Android.bp
index c2cac8c..a14eba5 100644
--- a/tee/TlcTeeKeymaster4/Android.bp
+++ b/tee/TlcTeeKeymaster4/Android.bp
@@ -28,21 +28,21 @@ cc_defaults {
     relative_install_path: "hw",
     vendor: true,
     srcs: [
-            "src/service.cpp",
-            "src/authlist.cpp",
-            "src/cust_tee_keymaster_impl.cpp",
-            "src/cust_tee_keymaster_utils.cpp",
-            "src/km_encodings.cpp",
-            "src/km_shared_util.cpp",
-            "src/serialization.cpp",
-            "src/tlcTeeKeymaster_if.cpp",
-            "src/TrustonicKeymaster4DeviceImpl.cpp",
-            "src/TrustonicKeymaster4Device.cpp",
-            //ExySp
-            "src/exynos_ssp_hwctl.cpp"
+        "src/service.cpp",
+        "src/authlist.cpp",
+        "src/cust_tee_keymaster_impl.cpp",
+        "src/cust_tee_keymaster_utils.cpp",
+        "src/km_encodings.cpp",
+        "src/km_shared_util.cpp",
+        "src/serialization.cpp",
+        "src/tlcTeeKeymaster_if.cpp",
+        "src/TrustonicKeymaster4DeviceImpl.cpp",
+        "src/TrustonicKeymaster4Device.cpp",
+        //ExySp
+        "src/exynos_ssp_hwctl.cpp",
     ],
     local_include_dirs: [
-         "include"
+        "include",
     ],
     shared_libs: [
         "libbase",
@@ -53,7 +53,7 @@ cc_defaults {
         "liblog",
         "libutils",
         "libMcClient",
-        "libcrypto"
+        "libcrypto",
     ],
 }
 
diff --git a/tee/kinibi410/system/TeeClient/Android.bp b/tee/kinibi410/system/TeeClient/Android.bp
index d418d5f..ad380b6 100644
--- a/tee/kinibi410/system/TeeClient/Android.bp
+++ b/tee/kinibi410/system/TeeClient/Android.bp
@@ -6,11 +6,13 @@ cc_library_shared {
         "jni/*.cpp",
     ],
 
-    cflags: ["-fvisibility=hidden"] + ["-DTBASE_API_LEVEL=9"] + [
+    cpp_std: "c++11",
+    cflags: [
+        "-fvisibility=hidden",
+        "-DTBASE_API_LEVEL=9",
         "-Wall",
         "-Wextra",
         "-Werror",
-    ] + ["-std=c++11"] + [
         "-DLOG_ANDROID",
         "-DDYNAMIC_LOG",
     ],
@@ -21,10 +23,6 @@ cc_library_shared {
         "jni",
     ],
 
-    // ANDROIDMK TRANSLATION ERROR: unsupported non-const variable name
-    // LOCAL_SRC_FILES := $(FILE_LIST:$(LOCAL_PATH)/%=%)
-
-    //host_ldlibs: ["-llog"],
     shared_libs: [
         "liblog",
         "libnativehelper",
@@ -45,7 +43,6 @@ java_library {
     },
     srcs: ["java/**/*.java"],
 
-    //certificate: "platform",
     dex_preopt: {
         enabled: false,
     },
diff --git a/tee/kinibi410/system/TeeService/Android.bp b/tee/kinibi410/system/TeeService/Android.bp
index a4f3df2..b341f9b 100644
--- a/tee/kinibi410/system/TeeService/Android.bp
+++ b/tee/kinibi410/system/TeeService/Android.bp
@@ -45,7 +45,7 @@ cc_library_static {
         "-Wall",
         "-Wextra",
         "-Werror",
-        "-DTBASE_API_LEVEL=5"
+        "-DTBASE_API_LEVEL=5",
     ],
 
     include_dirs: [
@@ -79,7 +79,7 @@ cc_library_shared {
         "-Wall",
         "-Wextra",
         "-Werror",
-        "-DTBASE_API_LEVEL=5"
+        "-DTBASE_API_LEVEL=5",
     ],
 
     include_dirs: [
diff --git a/tee/kinibi410/system/TeeServiceJava/Android.bp b/tee/kinibi410/system/TeeServiceJava/Android.bp
index b789d7d..debc0a7 100644
--- a/tee/kinibi410/system/TeeServiceJava/Android.bp
+++ b/tee/kinibi410/system/TeeServiceJava/Android.bp
@@ -1,7 +1,6 @@
 cc_library_shared {
 
     name: "libTeeServiceJni",
-    //certificate: "platform",
 
     srcs: [
         "cpp/native-lib-jni.cpp",
@@ -12,8 +11,10 @@ cc_library_shared {
         "hardware/samsung_slsi-linaro/exynos/tee/kinibi410/vendor/hardware/interfaces/tee/1.0/default",
     ],
 
-    // Undefine NDEBUG to enable LOG_D in log
-    cflags: ["-UNDEBUG"] + ["-DLOG_ANDROID"], // Enable logging to logcat per default
+    cflags: [
+        "-UNDEBUG", // Undefine NDEBUG to enable LOG_D in log
+        "-DLOG_ANDROID", // Enable logging to logcat per default
+    ],
 
     shared_libs: [
         "liblog",
@@ -44,8 +45,10 @@ android_app {
     },
     srcs: ["java/**/*.java"],
     jni_libs: ["libTeeServiceJni"],
-    static_libs: ["android.hidl.base-V1.0-java"] + ["vendor.trustonic.tee.tui-V1.0-java"],
-    // Add your source files here (relative paths)
+    static_libs: [
+        "android.hidl.base-V1.0-java",
+        "vendor.trustonic.tee.tui-V1.0-java",
+    ],
     privileged: true,
     certificate: "platform",
     dex_preopt: {
diff --git a/tee/kinibi410/vendor/CAKeyInjection/Android.bp b/tee/kinibi410/vendor/CAKeyInjection/Android.bp
index 9ae889e..09083ca 100644
--- a/tee/kinibi410/vendor/CAKeyInjection/Android.bp
+++ b/tee/kinibi410/vendor/CAKeyInjection/Android.bp
@@ -16,8 +16,14 @@ cc_binary {
         "-Wall",
         "-Wextra",
         "-Werror",
-    ] + ["-DTBASE_API_LEVEL=11"] + ["-DLOG_ANDROID"] + ["-DLOG_TAG=\"caKeyInjectionTool\""], // Enable logging to logcat by default
+        "-DTBASE_API_LEVEL=11",
+        "-DLOG_ANDROID", // Enable logging to logcat by default
+        "-DLOG_TAG=\"caKeyInjectionTool\"",
+    ],
 
-    shared_libs: ["libMcClient"] + ["liblog"],
+    shared_libs: [
+        "libMcClient",
+        "liblog",
+    ],
 
-}
\ No newline at end of file
+}
diff --git a/tee/kinibi410/vendor/ClientLib/Android.bp b/tee/kinibi410/vendor/ClientLib/Android.bp
index cc0d701..1232839 100644
--- a/tee/kinibi410/vendor/ClientLib/Android.bp
+++ b/tee/kinibi410/vendor/ClientLib/Android.bp
@@ -21,13 +21,13 @@ cc_library_shared {
     ],
 
     local_include_dirs: [
-         "include",
-         "include/GP",
+        "include",
+        "include/GP",
     ],
 
     export_include_dirs: [
-         "include",
-         "include/GP",
+        "include",
+        "include/GP",
     ],
 }
 
@@ -54,12 +54,12 @@ cc_library_static {
     ],
 
     local_include_dirs: [
-         "include",
-         "include/GP",
+        "include",
+        "include/GP",
     ],
 
     export_include_dirs: [
-         "include",
-         "include/GP",
+        "include",
+        "include/GP",
     ],
 }
diff --git a/tee/kinibi410/vendor/Daemon/Android.bp b/tee/kinibi410/vendor/Daemon/Android.bp
index 04aadfe..20d63e3 100644
--- a/tee/kinibi410/vendor/Daemon/Android.bp
+++ b/tee/kinibi410/vendor/Daemon/Android.bp
@@ -1,27 +1,27 @@
 cc_library_shared {
-	name: "libMcRegistry",
-	proprietary: true,
+    name: "libMcRegistry",
+    proprietary: true,
 
-	cflags: [
+    cflags: [
         "-Wall",
         "-Wextra",
         "-Werror",
     ],
 
-	local_include_dirs: ["include"],
-	shared_libs: [
-		"liblog",
-		"libMcClient",
-	],
+    local_include_dirs: ["include"],
+    shared_libs: [
+        "liblog",
+        "libMcClient",
+    ],
 
-	srcs: [
+    srcs: [
         "src/registry_log.cpp",
         "src/Connection.cpp",
         "src/Registry.cpp",
     ],
 
-	export_include_dirs: [
-         "include",
+    export_include_dirs: [
+        "include",
     ],
 }
 
@@ -29,25 +29,29 @@ cc_binary {
     name: "mcDriverDaemon",
     proprietary: true,
 
-    cflags: ["-DTBASE_API_LEVEL=5"] + [
+    cflags: [
+        "-DTBASE_API_LEVEL=5",
         "-Wall",
         "-Wextra",
         "-Werror",
-		"-Wno-type-limits",
-    ] + ["-std=c++11"] + [
+        "-Wno-type-limits",
+        "-std=c++11",
         "-DLOG_ANDROID",
         "-DDYNAMIC_LOG",
     ],
 
-	init_rc: ["mobicore.rc"],
+    init_rc: ["mobicore.rc"],
 
     local_include_dirs: ["include"],
-    static_libs: ["libc++_static", "libMcClient_static"],
+    static_libs: [
+        "libc++_static",
+        "libMcClient_static",
+    ],
 
     shared_libs: [
-		"liblog",
-		"libcutils",
-	],
+        "liblog",
+        "libcutils",
+    ],
 
     srcs: [
         "src/daemon_log.cpp",
@@ -61,4 +65,4 @@ cc_binary {
         "src/RegistryServer.cpp",
         "src/TuiStarter.cpp",
     ],
-}
\ No newline at end of file
+}
diff --git a/tee/kinibi410/vendor/hardware/interfaces/tee/1.0/Android.bp b/tee/kinibi410/vendor/hardware/interfaces/tee/1.0/Android.bp
index e3a9b75..b8cc5ed 100644
--- a/tee/kinibi410/vendor/hardware/interfaces/tee/1.0/Android.bp
+++ b/tee/kinibi410/vendor/hardware/interfaces/tee/1.0/Android.bp
@@ -11,4 +11,3 @@ hidl_interface {
     ],
     gen_java: false,
 }
-
diff --git a/tee/kinibi410/vendor/hardware/interfaces/tee/1.0/default/Android.bp b/tee/kinibi410/vendor/hardware/interfaces/tee/1.0/default/Android.bp
index 0b37557..41c6a4c 100644
--- a/tee/kinibi410/vendor/hardware/interfaces/tee/1.0/default/Android.bp
+++ b/tee/kinibi410/vendor/hardware/interfaces/tee/1.0/default/Android.bp
@@ -29,7 +29,7 @@ cc_library_static {
         "-Wall",
         "-Wextra",
         "-Werror",
-        "-DTBASE_API_LEVEL=5"
+        "-DTBASE_API_LEVEL=5",
     ],
 }
 
diff --git a/tee/kinibi410/vendor/hardware/interfaces/tee/1.1/Android.bp b/tee/kinibi410/vendor/hardware/interfaces/tee/1.1/Android.bp
index 9d23e83..897b2aa 100644
--- a/tee/kinibi410/vendor/hardware/interfaces/tee/1.1/Android.bp
+++ b/tee/kinibi410/vendor/hardware/interfaces/tee/1.1/Android.bp
@@ -13,4 +13,3 @@ hidl_interface {
     ],
     gen_java: false,
 }
-
diff --git a/tee/kinibi410/vendor/hardware/interfaces/tee/tui/1.0/Android.bp b/tee/kinibi410/vendor/hardware/interfaces/tee/tui/1.0/Android.bp
index 0c91f29..1929ca2 100644
--- a/tee/kinibi410/vendor/hardware/interfaces/tee/tui/1.0/Android.bp
+++ b/tee/kinibi410/vendor/hardware/interfaces/tee/tui/1.0/Android.bp
@@ -12,4 +12,3 @@ hidl_interface {
     ],
     gen_java: true,
 }
-
diff --git a/tee/kinibi500/system/TeeClient/Android.bp b/tee/kinibi500/system/TeeClient/Android.bp
index aa85487..2782c06 100644
--- a/tee/kinibi500/system/TeeClient/Android.bp
+++ b/tee/kinibi500/system/TeeClient/Android.bp
@@ -6,11 +6,13 @@ cc_library_shared {
         "jni/*.cpp",
     ],
 
-    cflags: ["-fvisibility=hidden"] + ["-DTBASE_API_LEVEL=11"] + [
+    cpp_std: "c++11",
+    cflags: [
+        "-fvisibility=hidden",
+        "-DTBASE_API_LEVEL=11",
         "-Wall",
         "-Wextra",
         "-Werror",
-    ] + ["-std=c++11"] + [
         "-DLOG_ANDROID",
         "-DDYNAMIC_LOG",
     ],
@@ -21,10 +23,6 @@ cc_library_shared {
         "jni",
     ],
 
-    // ANDROIDMK TRANSLATION ERROR: unsupported non-const variable name
-    // LOCAL_SRC_FILES := $(FILE_LIST:$(LOCAL_PATH)/%=%)
-
-    //host_ldlibs: ["-llog"],
     shared_libs: [
         "liblog",
         "libnativehelper",
@@ -45,7 +43,6 @@ java_library {
     },
     srcs: ["java/**/*.java"],
 
-    //certificate: "platform",
     dex_preopt: {
         enabled: false,
     },
diff --git a/tee/kinibi500/system/TeeService/Android.bp b/tee/kinibi500/system/TeeService/Android.bp
index 0396fa5..e76a0f8 100644
--- a/tee/kinibi500/system/TeeService/Android.bp
+++ b/tee/kinibi500/system/TeeService/Android.bp
@@ -45,7 +45,7 @@ cc_library_static {
         "-Wall",
         "-Wextra",
         "-Werror",
-        "-DTBASE_API_LEVEL=11"
+        "-DTBASE_API_LEVEL=11",
     ],
 
     include_dirs: [
@@ -79,7 +79,7 @@ cc_library_shared {
         "-Wall",
         "-Wextra",
         "-Werror",
-        "-DTBASE_API_LEVEL=11"
+        "-DTBASE_API_LEVEL=11",
     ],
 
     include_dirs: [
diff --git a/tee/kinibi500/system/TeeServiceJava/Android.bp b/tee/kinibi500/system/TeeServiceJava/Android.bp
index 4e79540..a7970a8 100644
--- a/tee/kinibi500/system/TeeServiceJava/Android.bp
+++ b/tee/kinibi500/system/TeeServiceJava/Android.bp
@@ -1,7 +1,6 @@
 cc_library_shared {
 
     name: "libTeeServiceJni",
-    //certificate: "platform",
 
     srcs: [
         "jni/native-lib-jni.cpp",
@@ -13,8 +12,10 @@ cc_library_shared {
         "hardware/samsung_slsi-linaro/exynos/tee/kinibi500/vendor/hardware/interfaces/tee/1.1/default",
     ],
 
-    // Undefine NDEBUG to enable LOG_D in log
-    cflags: ["-UNDEBUG"] + ["-DLOG_ANDROID"], // Enable logging to logcat per default
+    cflags: [
+        "-UNDEBUG", // Undefine NDEBUG to enable LOG_D in log
+        "-DLOG_ANDROID", // Enable logging to logcat per default
+    ],
 
     shared_libs: [
         "liblog",
@@ -45,8 +46,10 @@ android_app {
     },
     srcs: ["java/**/*.java"],
     jni_libs: ["libTeeServiceJni"],
-    static_libs: ["android.hidl.base-V1.0-java"] + ["vendor.trustonic.tee.tui-V1.0-java"],
-    // Add your source files here (relative paths)
+    static_libs: [
+        "android.hidl.base-V1.0-java",
+        "vendor.trustonic.tee.tui-V1.0-java",
+    ],
     privileged: true,
     certificate: "platform",
     dex_preopt: {
diff --git a/tee/kinibi500/vendor/CAKeyInjection/Android.bp b/tee/kinibi500/vendor/CAKeyInjection/Android.bp
index 9ae889e..9f2b2c5 100644
--- a/tee/kinibi500/vendor/CAKeyInjection/Android.bp
+++ b/tee/kinibi500/vendor/CAKeyInjection/Android.bp
@@ -16,8 +16,14 @@ cc_binary {
         "-Wall",
         "-Wextra",
         "-Werror",
-    ] + ["-DTBASE_API_LEVEL=11"] + ["-DLOG_ANDROID"] + ["-DLOG_TAG=\"caKeyInjectionTool\""], // Enable logging to logcat by default
+        "-DTBASE_API_LEVEL=11",
+        "-DLOG_ANDROID",
+        "-DLOG_TAG=\"caKeyInjectionTool\"",
+    ],
 
-    shared_libs: ["libMcClient"] + ["liblog"],
+    shared_libs: [
+        "libMcClient",
+        "liblog",
+    ],
 
-}
\ No newline at end of file
+}
diff --git a/tee/kinibi500/vendor/ClientLib/Android.bp b/tee/kinibi500/vendor/ClientLib/Android.bp
index 0e2961b..2d42d76 100644
--- a/tee/kinibi500/vendor/ClientLib/Android.bp
+++ b/tee/kinibi500/vendor/ClientLib/Android.bp
@@ -21,13 +21,13 @@ cc_library_shared {
     ],
 
     local_include_dirs: [
-         "include",
-         "include/GP",
+        "include",
+        "include/GP",
     ],
 
     export_include_dirs: [
-         "include",
-         "include/GP",
+        "include",
+        "include/GP",
     ],
 }
 
@@ -54,12 +54,12 @@ cc_library_static {
     ],
 
     local_include_dirs: [
-         "include",
-         "include/GP",
+        "include",
+        "include/GP",
     ],
 
     export_include_dirs: [
-         "include",
-         "include/GP",
+        "include",
+        "include/GP",
     ],
 }
diff --git a/tee/kinibi500/vendor/Daemon/Android.bp b/tee/kinibi500/vendor/Daemon/Android.bp
index 252c4bf..875fa91 100644
--- a/tee/kinibi500/vendor/Daemon/Android.bp
+++ b/tee/kinibi500/vendor/Daemon/Android.bp
@@ -1,27 +1,27 @@
 cc_library_shared {
-	name: "libMcRegistry",
-	proprietary: true,
+    name: "libMcRegistry",
+    proprietary: true,
 
-	cflags: [
+    cflags: [
         "-Wall",
         "-Wextra",
         "-Werror",
     ],
 
-	local_include_dirs: ["include"],
-	shared_libs: [
-		"liblog",
-		"libMcClient",
-	],
+    local_include_dirs: ["include"],
+    shared_libs: [
+        "liblog",
+        "libMcClient",
+    ],
 
-	srcs: [
+    srcs: [
         "src/registry_log.cpp",
         "src/Connection.cpp",
         "src/Registry.cpp",
     ],
 
-	export_include_dirs: [
-         "include",
+    export_include_dirs: [
+        "include",
     ],
 }
 
@@ -29,25 +29,29 @@ cc_binary {
     name: "mcDriverDaemon",
     proprietary: true,
 
-    cflags: ["-DTBASE_API_LEVEL=11"] + [
+    cpp_std: "c++11",
+    cflags: [
+        "-DTBASE_API_LEVEL=11",
         "-Wall",
         "-Wextra",
         "-Werror",
-		"-Wno-type-limits",
-    ] + ["-std=c++11"] + [
+        "-Wno-type-limits",
         "-DLOG_ANDROID",
         "-DDYNAMIC_LOG",
     ],
 
-	init_rc: ["mobicore.rc"],
+    init_rc: ["mobicore.rc"],
 
     local_include_dirs: ["include"],
-    static_libs: ["libc++_static", "libMcClient_static"],
+    static_libs: [
+        "libc++_static",
+        "libMcClient_static",
+    ],
 
     shared_libs: [
-		"liblog",
-		"libcutils",
-	],
+        "liblog",
+        "libcutils",
+    ],
 
     srcs: [
         "src/daemon_log.cpp",
@@ -61,4 +65,4 @@ cc_binary {
         "src/RegistryServer.cpp",
         "src/TuiStarter.cpp",
     ],
-}
\ No newline at end of file
+}
diff --git a/tee/kinibi500/vendor/hardware/interfaces/tee/1.0/Android.bp b/tee/kinibi500/vendor/hardware/interfaces/tee/1.0/Android.bp
index e3a9b75..b8cc5ed 100644
--- a/tee/kinibi500/vendor/hardware/interfaces/tee/1.0/Android.bp
+++ b/tee/kinibi500/vendor/hardware/interfaces/tee/1.0/Android.bp
@@ -11,4 +11,3 @@ hidl_interface {
     ],
     gen_java: false,
 }
-
diff --git a/tee/kinibi500/vendor/hardware/interfaces/tee/1.1/Android.bp b/tee/kinibi500/vendor/hardware/interfaces/tee/1.1/Android.bp
index 9d23e83..897b2aa 100644
--- a/tee/kinibi500/vendor/hardware/interfaces/tee/1.1/Android.bp
+++ b/tee/kinibi500/vendor/hardware/interfaces/tee/1.1/Android.bp
@@ -13,4 +13,3 @@ hidl_interface {
     ],
     gen_java: false,
 }
-
diff --git a/tee/kinibi500/vendor/hardware/interfaces/tee/tui/1.0/Android.bp b/tee/kinibi500/vendor/hardware/interfaces/tee/tui/1.0/Android.bp
index 0c91f29..1929ca2 100644
--- a/tee/kinibi500/vendor/hardware/interfaces/tee/tui/1.0/Android.bp
+++ b/tee/kinibi500/vendor/hardware/interfaces/tee/tui/1.0/Android.bp
@@ -12,4 +12,3 @@ hidl_interface {
     ],
     gen_java: true,
 }
-
diff --git a/tee/kinibi510/system/TeeService/Android.bp b/tee/kinibi510/system/TeeService/Android.bp
index d3fb2fc..993b57c 100644
--- a/tee/kinibi510/system/TeeService/Android.bp
+++ b/tee/kinibi510/system/TeeService/Android.bp
@@ -45,7 +45,7 @@ cc_library_static {
         "-Wall",
         "-Wextra",
         "-Werror",
-        "-DTBASE_API_LEVEL=11"
+        "-DTBASE_API_LEVEL=11",
     ],
 
     header_libs: [
@@ -83,7 +83,7 @@ cc_library_shared {
         "-Wall",
         "-Wextra",
         "-Werror",
-        "-DTBASE_API_LEVEL=11"
+        "-DTBASE_API_LEVEL=11",
     ],
 
     header_libs: [
diff --git a/tee/kinibi510/system/TeeServiceJava/Android.bp b/tee/kinibi510/system/TeeServiceJava/Android.bp
index 16201c4..7a8af72 100644
--- a/tee/kinibi510/system/TeeServiceJava/Android.bp
+++ b/tee/kinibi510/system/TeeServiceJava/Android.bp
@@ -24,7 +24,6 @@ cc_library_shared {
         "libselinux",
         "libhidlbase",
         "libhidlmemory",
-
         "android.hidl.allocator@1.0",
         "android.hidl.memory@1.0",
         "vendor.trustonic.tee@1.1",
@@ -50,7 +49,7 @@ android_app {
     ],
 
     jni_libs: [
-        "libTeeServiceJni"
+        "libTeeServiceJni",
     ],
 
     static_libs: [
diff --git a/tee/kinibi510/vendor/CAKeyInjection/Android.bp b/tee/kinibi510/vendor/CAKeyInjection/Android.bp
index 6d502b4..abd4c77 100644
--- a/tee/kinibi510/vendor/CAKeyInjection/Android.bp
+++ b/tee/kinibi510/vendor/CAKeyInjection/Android.bp
@@ -4,16 +4,16 @@ cc_binary {
 
     srcs: [
         "src/*.c",
-        "src/*.cpp"
+        "src/*.cpp",
     ],
 
     local_include_dirs: [
-        "src"
+        "src",
     ],
 
     shared_libs: [
         "liblog",
-        "libMcClient"
+        "libMcClient",
     ],
 
     cflags: [
@@ -22,6 +22,6 @@ cc_binary {
         "-Wextra",
         "-DLOG_ANDROID",
         "-DTBASE_API_LEVEL=11",
-        "-DLOG_TAG=\"caKeyInjectionTool\""
-    ]
+        "-DLOG_TAG=\"caKeyInjectionTool\"",
+    ],
 }
diff --git a/tee/kinibi510/vendor/ClientLib/Android.bp b/tee/kinibi510/vendor/ClientLib/Android.bp
index 45c25c3..56916d0 100644
--- a/tee/kinibi510/vendor/ClientLib/Android.bp
+++ b/tee/kinibi510/vendor/ClientLib/Android.bp
@@ -25,7 +25,7 @@ cc_library_shared {
 
     export_header_lib_headers: [
         "trustonic-api-headers",
-    ]
+    ],
 }
 
 cc_library_static {
@@ -56,5 +56,5 @@ cc_library_static {
 
     export_header_lib_headers: [
         "trustonic-api-headers",
-    ]
+    ],
 }
diff --git a/tee/kinibi510/vendor/Daemon/Android.bp b/tee/kinibi510/vendor/Daemon/Android.bp
index a5e88f7..939f75d 100644
--- a/tee/kinibi510/vendor/Daemon/Android.bp
+++ b/tee/kinibi510/vendor/Daemon/Android.bp
@@ -17,7 +17,7 @@ cc_binary {
     ],
 
     local_include_dirs: [
-        "include"
+        "include",
     ],
 
     shared_libs: [
@@ -73,5 +73,5 @@ cc_library_shared {
 
     export_header_lib_headers: [
         "trustonic-api-headers",
-    ]
+    ],
 }
diff --git a/tee/kinibi510/vendor/hardware/interfaces/tee/1.0/Android.bp b/tee/kinibi510/vendor/hardware/interfaces/tee/1.0/Android.bp
index e3a9b75..b8cc5ed 100644
--- a/tee/kinibi510/vendor/hardware/interfaces/tee/1.0/Android.bp
+++ b/tee/kinibi510/vendor/hardware/interfaces/tee/1.0/Android.bp
@@ -11,4 +11,3 @@ hidl_interface {
     ],
     gen_java: false,
 }
-
diff --git a/tee/kinibi510/vendor/hardware/interfaces/tee/1.1/Android.bp b/tee/kinibi510/vendor/hardware/interfaces/tee/1.1/Android.bp
index 9d23e83..897b2aa 100644
--- a/tee/kinibi510/vendor/hardware/interfaces/tee/1.1/Android.bp
+++ b/tee/kinibi510/vendor/hardware/interfaces/tee/1.1/Android.bp
@@ -13,4 +13,3 @@ hidl_interface {
     ],
     gen_java: false,
 }
-
diff --git a/tee/kinibi510/vendor/hardware/interfaces/tee/tui/1.0/Android.bp b/tee/kinibi510/vendor/hardware/interfaces/tee/tui/1.0/Android.bp
index 0c91f29..1929ca2 100644
--- a/tee/kinibi510/vendor/hardware/interfaces/tee/tui/1.0/Android.bp
+++ b/tee/kinibi510/vendor/hardware/interfaces/tee/tui/1.0/Android.bp
@@ -12,4 +12,3 @@ hidl_interface {
     ],
     gen_java: true,
 }
-
diff --git a/tee/kinibi520/system/TeeService/Android.bp b/tee/kinibi520/system/TeeService/Android.bp
index d3fb2fc..993b57c 100644
--- a/tee/kinibi520/system/TeeService/Android.bp
+++ b/tee/kinibi520/system/TeeService/Android.bp
@@ -45,7 +45,7 @@ cc_library_static {
         "-Wall",
         "-Wextra",
         "-Werror",
-        "-DTBASE_API_LEVEL=11"
+        "-DTBASE_API_LEVEL=11",
     ],
 
     header_libs: [
@@ -83,7 +83,7 @@ cc_library_shared {
         "-Wall",
         "-Wextra",
         "-Werror",
-        "-DTBASE_API_LEVEL=11"
+        "-DTBASE_API_LEVEL=11",
     ],
 
     header_libs: [
diff --git a/tee/kinibi520/system/TeeServiceJava/Android.bp b/tee/kinibi520/system/TeeServiceJava/Android.bp
index f58b19f..5e4e0db 100644
--- a/tee/kinibi520/system/TeeServiceJava/Android.bp
+++ b/tee/kinibi520/system/TeeServiceJava/Android.bp
@@ -24,7 +24,6 @@ cc_library_shared {
         "libselinux",
         "libhidlbase",
         "libhidlmemory",
-
         "android.hidl.allocator@1.0",
         "android.hidl.memory@1.0",
         "vendor.trustonic.tee@1.1",
@@ -54,7 +53,7 @@ android_app {
     ],
 
     jni_libs: [
-        "libTeeServiceJni"
+        "libTeeServiceJni",
     ],
 
     static_libs: [
diff --git a/tee/kinibi520/vendor/ClientLib/Android.bp b/tee/kinibi520/vendor/ClientLib/Android.bp
index 45c25c3..56916d0 100644
--- a/tee/kinibi520/vendor/ClientLib/Android.bp
+++ b/tee/kinibi520/vendor/ClientLib/Android.bp
@@ -25,7 +25,7 @@ cc_library_shared {
 
     export_header_lib_headers: [
         "trustonic-api-headers",
-    ]
+    ],
 }
 
 cc_library_static {
@@ -56,5 +56,5 @@ cc_library_static {
 
     export_header_lib_headers: [
         "trustonic-api-headers",
-    ]
+    ],
 }
diff --git a/tee/kinibi520/vendor/Daemon/Android.bp b/tee/kinibi520/vendor/Daemon/Android.bp
index a5e88f7..939f75d 100644
--- a/tee/kinibi520/vendor/Daemon/Android.bp
+++ b/tee/kinibi520/vendor/Daemon/Android.bp
@@ -17,7 +17,7 @@ cc_binary {
     ],
 
     local_include_dirs: [
-        "include"
+        "include",
     ],
 
     shared_libs: [
@@ -73,5 +73,5 @@ cc_library_shared {
 
     export_header_lib_headers: [
         "trustonic-api-headers",
-    ]
+    ],
 }
diff --git a/tee/kinibi520/vendor/hardware/interfaces/tee/1.0/Android.bp b/tee/kinibi520/vendor/hardware/interfaces/tee/1.0/Android.bp
index e3a9b75..b8cc5ed 100644
--- a/tee/kinibi520/vendor/hardware/interfaces/tee/1.0/Android.bp
+++ b/tee/kinibi520/vendor/hardware/interfaces/tee/1.0/Android.bp
@@ -11,4 +11,3 @@ hidl_interface {
     ],
     gen_java: false,
 }
-
diff --git a/tee/kinibi520/vendor/hardware/interfaces/tee/1.1/Android.bp b/tee/kinibi520/vendor/hardware/interfaces/tee/1.1/Android.bp
index 9d23e83..897b2aa 100644
--- a/tee/kinibi520/vendor/hardware/interfaces/tee/1.1/Android.bp
+++ b/tee/kinibi520/vendor/hardware/interfaces/tee/1.1/Android.bp
@@ -13,4 +13,3 @@ hidl_interface {
     ],
     gen_java: false,
 }
-
diff --git a/tee/kinibi520/vendor/hardware/interfaces/tee/tui/1.0/Android.bp b/tee/kinibi520/vendor/hardware/interfaces/tee/tui/1.0/Android.bp
index 0c91f29..1929ca2 100644
--- a/tee/kinibi520/vendor/hardware/interfaces/tee/tui/1.0/Android.bp
+++ b/tee/kinibi520/vendor/hardware/interfaces/tee/tui/1.0/Android.bp
@@ -12,4 +12,3 @@ hidl_interface {
     ],
     gen_java: true,
 }
-