Remove temporary CPPLINT.cfg files

Temporary CPPLINT.cfg files were introduced when move libnativeloader
and libnativebridge under art/.

Bug: 141749154
Test: mm cpplint-art-all
Change-Id: I85e75180138a512aef025f1e5275e20d8d1d14b0

4 files changed, 8 insertions, 27 deletions

diff --git a/libnativebridge/CPPLINT.cfg b/libnativebridge/CPPLINT.cfg
deleted file mode 100644
index 578047ba10..0000000000
--- a/libnativebridge/CPPLINT.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2019 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-filter=-build/header_guard
-filter=-whitespace/comments
-filter=-whitespace/parens
diff --git a/libnativebridge/include/nativebridge/native_bridge.h b/libnativebridge/include/nativebridge/native_bridge.h
index e9c9500252..22c128ba1f 100644
--- a/libnativebridge/include/nativebridge/native_bridge.h
+++ b/libnativebridge/include/nativebridge/native_bridge.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef NATIVE_BRIDGE_H_
-#define NATIVE_BRIDGE_H_
+#ifndef ART_LIBNATIVEBRIDGE_INCLUDE_NATIVEBRIDGE_NATIVE_BRIDGE_H_
+#define ART_LIBNATIVEBRIDGE_INCLUDE_NATIVEBRIDGE_NATIVE_BRIDGE_H_
 
 #include <signal.h>
 #include <stdbool.h>
@@ -415,4 +415,4 @@ struct NativeBridgeRuntimeCallbacks {
 }  // namespace android
 #endif  // __cplusplus
 
-#endif  // NATIVE_BRIDGE_H_
+#endif  // ART_LIBNATIVEBRIDGE_INCLUDE_NATIVEBRIDGE_NATIVE_BRIDGE_H_
diff --git a/libnativebridge/native_bridge.cc b/libnativebridge/native_bridge.cc
index 9adba9a50e..82dd5629a0 100644
--- a/libnativebridge/native_bridge.cc
+++ b/libnativebridge/native_bridge.cc
@@ -276,7 +276,7 @@ bool PreInitializeNativeBridge(const char* app_data_dir_in, const char* instruct
 
   // Create the path to the application code cache directory.
   // The memory will be release after Initialization or when the native bridge is closed.
-  const size_t len = strlen(app_data_dir_in) + strlen(kCodeCacheDir) + 2; // '\0' + '/'
+  const size_t len = strlen(app_data_dir_in) + strlen(kCodeCacheDir) + 2;  // '\0' + '/'
   app_code_cache_dir = new char[len];
   snprintf(app_code_cache_dir, len, "%s/%s", app_data_dir_in, kCodeCacheDir);
 
@@ -455,7 +455,7 @@ void UnloadNativeBridge() {
   // We expect only one place that calls UnloadNativeBridge: Runtime::DidForkFromZygote. At that
   // point we are not multi-threaded, so we do not need locking here.
 
-  switch(state) {
+  switch (state) {
     case NativeBridgeState::kOpened:
     case NativeBridgeState::kPreInitialized:
     case NativeBridgeState::kInitialized:
diff --git a/libnativebridge/tests/NativeBridgeTest.h b/libnativebridge/tests/NativeBridgeTest.h
index 0f99816c9f..cc7990742e 100644
--- a/libnativebridge/tests/NativeBridgeTest.h
+++ b/libnativebridge/tests/NativeBridgeTest.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef NATIVE_BRIDGE_TEST_H_
-#define NATIVE_BRIDGE_TEST_H_
+#ifndef ART_LIBNATIVEBRIDGE_TESTS_NATIVEBRIDGETEST_H_
+#define ART_LIBNATIVEBRIDGE_TESTS_NATIVEBRIDGETEST_H_
 
 #define LOG_TAG "NativeBridge_test"
 
@@ -35,5 +35,5 @@ class NativeBridgeTest : public testing::Test {
 
 };  // namespace android
 
-#endif  // NATIVE_BRIDGE_H_
+#endif  // ART_LIBNATIVEBRIDGE_TESTS_NATIVEBRIDGETEST_H_