diff options
| author | Martin Stjernholm <mast@google.com> | 2019-10-17 21:29:01 +0100 |
|---|---|---|
| committer | Treehugger Robot <treehugger-gerrit@google.com> | 2019-10-21 14:34:02 +0000 |
| commit | 3bb009ac148d6e1978d9233b0131a027585752f7 (patch) | |
| tree | f5177cffa33c1e6479a04d438cce937306ad8dfe /libnativebridge | |
| parent | e41eec3b193d594577cbe8afc7c3dc6608c2f201 (diff) | |
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
Diffstat (limited to 'libnativebridge')
| -rw-r--r-- | libnativebridge/Android.bp | 8 | ||||
| -rw-r--r-- | libnativebridge/native_bridge.cc | 4 |
2 files changed, 4 insertions, 8 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; } |