Commit cafe822d authored by Robbie McElrath's avatar Robbie McElrath Committed by Commit Bot

[AW] Create //aw/lib/BUILD.gn

This creates the lib build file, adds any missing dependencies, and
moves a crashpad dependency that that was incorrectly placed in the old
lib rule.

Test: gn check out/aw 'android_webview/*'
Bug: 934152
Change-Id: Ic9a03e5a8f105364f9c61e08b35a5889cabfea3f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1880070Reviewed-by: default avatarNate Fischer <ntfschr@chromium.org>
Reviewed-by: default avatarRichard Coles <torne@chromium.org>
Reviewed-by: default avatarEric Stevenson <estevenson@chromium.org>
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710053}
parent 4baa0eb8
......@@ -12,7 +12,6 @@ import("//build/config/locales.gni")
import("//chrome/android/chrome_common_shared_library.gni")
import("//chrome/android/chrome_public_apk_tmpl.gni")
import("//chrome/android/trichrome.gni")
import("//components/gwp_asan/buildflags/buildflags.gni")
import("//components/spellcheck/spellcheck_build_features.gni")
import("//tools/grit/repack.gni")
import("//tools/resources/generate_resource_whitelist.gni")
......@@ -411,20 +410,9 @@ grit("generate_components_strings") {
}
}
source_set("webview_entry_point") {
deps = [
":common",
"//base",
"//weblayer:weblayer_lib",
]
sources = [
"lib/webview_entry_point.cc",
]
}
shared_library("libwebviewchromium") {
deps = [
":webview_entry_point",
"//android_webview/lib:webview_entry_point",
"//components/about_ui:about_ui_android",
]
configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
......@@ -457,7 +445,7 @@ template("webview_library") {
chrome_common_shared_library(target_name) {
forward_variables_from(invoker, "*")
deps = [
":webview_entry_point",
"//android_webview/lib:webview_entry_point",
]
is_webview = true
}
......@@ -496,46 +484,6 @@ if (enable_resource_whitelist_generation) {
}
}
source_set("common") {
sources = [
"lib/aw_main_delegate.cc",
"lib/aw_main_delegate.h",
"lib/webview_jni_onload.cc",
"lib/webview_jni_onload.h",
]
deps = [
":browser_jni_headers",
"//android_webview/apk",
"//android_webview/browser",
"//android_webview/browser/gfx",
"//android_webview/common",
"//android_webview/gpu",
"//android_webview/renderer",
"//components/autofill/core/common",
"//components/crash/android:crashpad_main",
"//components/gwp_asan/buildflags",
"//components/safe_browsing/android:safe_browsing_api_handler",
"//components/services/heap_profiling/public/cpp",
"//components/spellcheck:buildflags",
"//components/spellcheck/common",
"//components/version_info",
"//components/version_info/android:channel_getter",
"//content/public/app:both",
"//content/public/browser",
"//content/public/common:content_descriptor_keys",
"//gin",
"//gpu/command_buffer/service",
"//gpu/ipc:gl_in_process_context",
"//ui/events:gesture_detection",
"//weblayer:weblayer_lib",
]
if (enable_gwp_asan) {
deps += [ "//components/gwp_asan/client" ]
}
}
java_group("android_webview_java") {
deps = [
":browser_java",
......
......@@ -194,6 +194,9 @@ source_set("browser") {
"//components/cdm/browser",
"//components/content_capture/android",
"//components/content_capture/browser",
# Called via JNI in CrashpadMain
"//components/crash/android:crashpad_main",
"//components/crash/content/app",
"//components/crash/content/browser",
"//components/embedder_support/android:web_contents_delegate",
......
# Copyright 2019 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//components/gwp_asan/buildflags/buildflags.gni")
import("//components/spellcheck/spellcheck_build_features.gni")
source_set("lib") {
sources = [
"aw_main_delegate.cc",
"aw_main_delegate.h",
"webview_jni_onload.cc",
"webview_jni_onload.h",
]
deps = [
"//android_webview/browser",
"//android_webview/browser/gfx",
"//android_webview/common",
"//android_webview/gpu",
"//android_webview/renderer",
"//base",
"//cc/base",
"//components/autofill/core/common",
"//components/crash/core/common",
"//components/gwp_asan/buildflags",
"//components/safe_browsing/android:safe_browsing_api_handler",
"//components/services/heap_profiling/public/cpp",
"//components/spellcheck:buildflags",
"//components/version_info",
"//components/version_info/android:channel_getter",
"//components/viz/common",
"//content/public/app:both",
"//content/public/browser",
"//content/public/common",
"//content/public/common:content_descriptor_keys",
"//gin",
"//gpu/command_buffer/service",
"//gpu/config",
"//gpu/ipc:gl_in_process_context",
"//media",
"//media:media_buildflags",
"//ui/base",
"//ui/events:gesture_detection",
]
if (enable_gwp_asan) {
deps += [ "//components/gwp_asan/client" ]
}
if (enable_spellcheck) {
deps += [ "//components/spellcheck/common" ]
}
}
source_set("webview_entry_point") {
deps = [
":lib",
"//base",
"//weblayer:weblayer_lib",
]
sources = [
"webview_entry_point.cc",
]
}
......@@ -150,7 +150,7 @@ shared_library("libstandalonelibwebviewchromium") {
ldflags = [ "-Wl,-shared,-Bsymbolic" ]
deps = [
":webview_instrumentation_test_native_jni_impl",
"//android_webview:webview_entry_point",
"//android_webview/lib:webview_entry_point",
"//base",
"//components/heap_profiling:test_support",
"//components/minidump_uploader",
......
......@@ -1469,7 +1469,7 @@ template("libmonochrome_apk_or_bundle_tmpl") {
"../browser/android/monochrome_entry_point.cc",
]
deps = [
"//android_webview:common",
"//android_webview/lib",
"//components/about_ui:about_ui_android",
"//components/crash/android:crashpad_main",
"//weblayer:weblayer_lib",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment