diff options
author | Brett Wilson <brettw@chromium.org> | 2014-09-04 15:27:57 -0700 |
---|---|---|
committer | Brett Wilson <brettw@chromium.org> | 2014-09-04 22:29:41 +0000 |
commit | 6a90cafc8e2b0f1e1bc6a8f7e69470ac8acfa253 (patch) | |
tree | bdd2f1da236b04ca9ef3420a508050234f12455b /build | |
parent | 9dcd3b507f0a8bae61b6b20c0779c852fcd2ac7a (diff) | |
download | chromium_src-6a90cafc8e2b0f1e1bc6a8f7e69470ac8acfa253.zip chromium_src-6a90cafc8e2b0f1e1bc6a8f7e69470ac8acfa253.tar.gz chromium_src-6a90cafc8e2b0f1e1bc6a8f7e69470ac8acfa253.tar.bz2 |
Hook up resources to the chrome GN build.
It also hooks up libpdf which chrome requires at startup.
Adds the enable_hidpi and use_athena build flags.
Adds a locales list.
This makes the chrome target actually runnable from a GN build.
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/541153002
Cr-Commit-Position: refs/heads/master@{#293360}
Diffstat (limited to 'build')
-rw-r--r-- | build/config/BUILD.gn | 6 | ||||
-rw-r--r-- | build/config/locales.gni | 118 | ||||
-rw-r--r-- | build/config/ui.gni | 4 |
3 files changed, 128 insertions, 0 deletions
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn index b3702b1..8fa2095 100644 --- a/build/config/BUILD.gn +++ b/build/config/BUILD.gn @@ -177,6 +177,12 @@ config("feature_flags") { if (enable_one_click_signin) { defines += [ "ENABLE_ONE_CLICK_SIGNIN" ] } + if (use_athena) { + defines += [ "USE_ATHENA=1" ] + } + if (enable_hidpi) { + defines += [ "ENABLE_HIDPI=1" ] + } } # Debug/release ---------------------------------------------------------------- diff --git a/build/config/locales.gni b/build/config/locales.gni new file mode 100644 index 0000000..a628007 --- /dev/null +++ b/build/config/locales.gni @@ -0,0 +1,118 @@ +# Copyright 2014 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. + +# Note: keep in sync with below. +locales = [ + "am", + "ar", + "bg", + "bn", + "ca", + "cs", + "da", + "de", + "el", + "en-GB", + "en-US", + "es-419", + "es", + "et", + "fa", + "fi", + "fil", + "fr", + "gu", + "he", + "hi", + "hr", + "hu", + "id", + "it", + "ja", + "kn", + "ko", + "lt", + "lv", + "ml", + "mr", + "ms", + "nb", + "nl", + "pl", + "pt-BR", + "pt-PT", + "ro", + "ru", + "sk", + "sl", + "sr", + "sv", + "sw", + "ta", + "te", + "th", + "tr", + "uk", + "vi", + "zh-CN", + "zh-TW", +] + +# Same as the locales list but in the format Mac expects for output files: +# it uses underscores instead of hyphens, and "en" instead of "en-US". +locales_as_mac_outputs = [ + "am", + "ar", + "bg", + "bn", + "ca", + "cs", + "da", + "de", + "el", + "en_GB", + "en", + "es_419", + "es", + "et", + "fa", + "fi", + "fil", + "fr", + "gu", + "he", + "hi", + "hr", + "hu", + "id", + "it", + "ja", + "kn", + "ko", + "lt", + "lv", + "ml", + "mr", + "ms", + "nb", + "nl", + "pl", + "pt_BR", + "pt_PT", + "ro", + "ru", + "sk", + "sl", + "sr", + "sv", + "sw", + "ta", + "te", + "th", + "tr", + "uk", + "vi", + "zh_CN", + "zh_TW", +] diff --git a/build/config/ui.gni b/build/config/ui.gni index b58d7ed..9c159a2 100644 --- a/build/config/ui.gni +++ b/build/config/ui.gni @@ -61,3 +61,7 @@ use_ozone_evdev = use_ozone use_glib = is_linux use_clipboard_aurax11 = is_linux && use_aura && use_x11 + +use_athena = false + +enable_hidpi = is_mac || is_chromeos || is_win |