diff options
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; } |