Use art_defaults in libnative*, for consistency.

Also change to //art:__submodules__ for consistent internal visibility, and
some TODO comment corrections.

Test: m WITH_TIDY=1
Test: build & boot
Test: atest art/libnativeloader/test (no new errors, but existing ones on arm64 - b/142896688)
Test: (atest art/libnativebridge/tests doesn't work at all, but that's not new - b/142897320)
Bug: 137364733
Bug: 133140750
Change-Id: If9ddb5a597eea3606342c3625dcdb3bcf5d19041

4 files changed, 10 insertions, 19 deletions

diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp
index 2dd92d117e..f2db117b50 100644
--- a/libnativebridge/Android.bp
+++ b/libnativebridge/Android.bp
@@ -1,9 +1,6 @@
 cc_defaults {
     name: "libnativebridge-defaults",
-    cflags: [
-        "-Werror",
-        "-Wall",
-    ],
+    defaults: ["art_defaults"],
     cppflags: [
         "-fvisibility=protected",
     ],
@@ -22,9 +19,8 @@ cc_library {
     name: "libnativebridge",
     defaults: ["libnativebridge-defaults"],
     visibility: [
-        "//art:__subpackages__",
-        // TODO(b/133140750): Clean this up.
         "//frameworks/base/cmds/app_process",
+        // TODO(b/133140750): Clean this up.
         "//frameworks/base/native/webview/loader/libwebviewchromium_loader",
     ],
 
diff --git a/libnativebridge/native_bridge.cc b/libnativebridge/native_bridge.cc
index 82dd5629a0..6790a189d7 100644
--- a/libnativebridge/native_bridge.cc
+++ b/libnativebridge/native_bridge.cc
@@ -350,7 +350,7 @@ static void SetCpuAbi(JNIEnv* env, jclass build_class, const char* field, const
 }
 
 // Set up the environment for the bridged app.
-static void SetupEnvironment(const NativeBridgeCallbacks* callbacks, JNIEnv* env, const char* isa) {
+static void SetupEnvironment(const NativeBridgeCallbacks* cbs, JNIEnv* env, const char* isa) {
   // Need a JNIEnv* to do anything.
   if (env == nullptr) {
     ALOGW("No JNIEnv* to set up app environment.");
@@ -358,7 +358,7 @@ static void SetupEnvironment(const NativeBridgeCallbacks* callbacks, JNIEnv* env
   }
 
   // Query the bridge for environment values.
-  const struct NativeBridgeRuntimeValues* env_values = callbacks->getAppEnv(isa);
+  const struct NativeBridgeRuntimeValues* env_values = cbs->getAppEnv(isa);
   if (env_values == nullptr) {
     return;
   }
diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index f73becc41e..beb2c8c042 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -2,10 +2,7 @@
 // ========================================================
 cc_defaults {
     name: "libnativeloader-defaults",
-    cflags: [
-        "-Werror",
-        "-Wall",
-    ],
+    defaults: ["art_defaults"],
     cppflags: [
         "-fvisibility=hidden",
     ],
@@ -17,9 +14,8 @@ cc_library {
     name: "libnativeloader",
     defaults: ["libnativeloader-defaults"],
     visibility: [
-        "//art:__subpackages__",
-        // TODO(b/133140750): Clean this up.
         "//frameworks/base/cmds/app_process",
+        // TODO(b/133140750): Clean this up.
         "//frameworks/base/native/webview/loader",
     ],
     host_supported: true,
@@ -71,7 +67,8 @@ cc_library {
 cc_library_headers {
     name: "libnativeloader-headers",
     visibility: [
-        "//art/libnativeloader/test",
+        "//art:__subpackages__",
+        // TODO(b/133140750): Clean this up.
         "//frameworks/av/media/libstagefright",
         "//frameworks/native/libs/graphicsenv",
         "//frameworks/native/vulkan/libvulkan",
diff --git a/libnativeloader/library_namespaces.cpp b/libnativeloader/library_namespaces.cpp
index 7246b97642..ef979591c0 100644
--- a/libnativeloader/library_namespaces.cpp
+++ b/libnativeloader/library_namespaces.cpp
@@ -33,8 +33,6 @@
 #include "public_libraries.h"
 #include "utils.h"
 
-using android::base::Error;
-
 namespace android::nativeloader {
 
 namespace {
@@ -71,11 +69,11 @@ const std::regex kVendorDexPathRegex("(^|:)/vendor/");
 const std::regex kProductDexPathRegex("(^|:)(/system)?/product/");
 
 // Define origin of APK if it is from vendor partition or product partition
-typedef enum {
+using ApkOrigin = enum {
   APK_ORIGIN_DEFAULT = 0,
   APK_ORIGIN_VENDOR = 1,
   APK_ORIGIN_PRODUCT = 2,
-} ApkOrigin;
+};
 
 jobject GetParentClassLoader(JNIEnv* env, jobject class_loader) {
   jclass class_loader_class = env->FindClass("java/lang/ClassLoader");