diff options
| author | cjhopman <cjhopman@chromium.org> | 2014-10-27 10:11:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-27 17:11:34 +0000 |
| commit | 09981a9eb8bff00e2644f3174e5651b5734eed9a (patch) | |
| tree | 95f1e38463a94a67b65cb937e64add40bda228b2 /content/app | |
| parent | 68c65a48b958c1a5e029cece19ef5eb01ab99fff (diff) | |
| download | chromium_src-09981a9eb8bff00e2644f3174e5651b5734eed9a.zip chromium_src-09981a9eb8bff00e2644f3174e5651b5734eed9a.tar.gz chromium_src-09981a9eb8bff00e2644f3174e5651b5734eed9a.tar.bz2 | |
GN: Fix Android component build
This change makes all libraries in the Android component build link
successfully (including fixing and enabling libchrome_shell). This also makes
all the libraries link in a component build for Linux, but without bot coverage
for that platform it'll surely regress.
This is almost entirely just fixing some missing/incorrect dependencies and
adding missing source files for Android.
Some targets were depending on an internal source_set/static_library when they
should have been (or already were) depending on the corresponding component. In
these cases, I added some visibility restrictions to those internal targets to
try to prevent those types of dependencies from coming back.
BUG=359249
Review URL: https://codereview.chromium.org/666813002
Cr-Commit-Position: refs/heads/master@{#301386}
Diffstat (limited to 'content/app')
| -rw-r--r-- | content/app/BUILD.gn | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn index f68c6de..8d70a51 100644 --- a/content/app/BUILD.gn +++ b/content/app/BUILD.gn @@ -2,6 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +# TODO(GYP) enable chrome_multiple_dll support +is_chrome_multiple_dll = false + content_app_sources = [ "android/app_jni_registrar.cc", "android/app_jni_registrar.h", @@ -63,6 +66,10 @@ content_app_extra_configs = [ "//content:content_implementation", ] +if (!is_chrome_multiple_dll) { + content_app_deps += [ "//content/gpu" ] +} + # This includes the app sources for both the browser and child processes. source_set("both") { # Only the public target should depend on this. All other targets (even @@ -74,9 +81,6 @@ source_set("both") { deps = content_app_deps } -# TODO(GYP) enable chrome_multiple_dll support -is_chrome_multiple_dll = false - if (is_chrome_multiple_dll) { # It doesn't make sense to do the browser/child dll split in component mode. assert(!is_component_build) |