See discussion at chromium issue 338885.
When USE_OPENSSL_CERTS is defined, X509::OSCertHandle is now
typedef'ed to struct X509*.
When USE_OPENSSL is defined, USE_OPENSSL_CERTS will now be
defined for linux and Android, while being off for Mac and
Windows. This allows OpenSSL to be used while leaving
certificate handling to the OS.
OpenSSL cert verifying code will only be used on Linux.
This patch does not change any default behavior.
Bug=none
Test=none
Review URL: https://codereview.chromium.org/206453002
git-svn-id: http://src.chromium.org/svn/trunk/src/build@260152 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
apkbuilder only uses sourcefolder to package non-java files (see
addSourceFolder() and checkFileForPackaging() in
e162064a7b/sdkmanager/libs/sdklib/src/com/android/sdklib/build/ApkBuilder.java ),
and our java/src folders only contain .java (and OWNERS) files.
(Determined via `find . -type f -a -path '*/src/*' -a -not -name '*.java'` and
manually ignoring everything not looking like a java folder.)
No intended behavior change; Chrome.apk looks identical with and without
this change (except for timestamps).
BUG=none
NOTRY=true
Review URL: https://codereview.chromium.org/212173003
git-svn-id: http://src.chromium.org/svn/trunk/src/build@260047 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
> Set the default ASan options for executables built with ASan on Linux.
>
> This is a copy of https://codereview.chromium.org/25687005/ updated for the current trunk
> with the link_dependency attribute speculatively added to base/base.gyp:sanitizer_options
> to avoid potential dependency cycles.
>
> This CL introduces a module, base/debug/sanitizer_options.cc, which will override
> the defaults for various dynamic tools (only ASan at this moment). For every executable
> built with a dynamic tool this module will be linked into that executable, providing
> weak functions to be called by the tool.
>
> The existing declaration of __asan_default_options() in chrome/app/chrome_exe_main_gtk.cc
> has been moved into sanitizer_options.cc (now every binary built with GOOGLE_CHROME_BUILD=1
> will have the same options as google-chrome-asan.
> The existing declaration of __asan_default_options() in chrome/nacl/nacl_helper_linux.cc
> has been kept as is, but we had to remove -Wl,-u_sanitizer_options_link_helper to avoid picking sanitizer_options.cc.
>
> GYP changes for OSX and iOS will be committed separately.
>
> BUG=302040
> TBR=thakis@chromium.org
>
> Review URL: https://codereview.chromium.org/201153007TBR=glider@chromium.org
BUG=357093
Review URL: https://codereview.chromium.org/215363006
git-svn-id: http://src.chromium.org/svn/trunk/src/build@260037 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Note that this change DOES NOT "opt-in" any platform at this time, it merely
makes it possible to read the CLD data in from a file if cld_version=2 and
cld_dynamic=1. Subsequent changes will be required for platforms to "opt-in"
to using this approach; e.g., each platform will have to generate their data
file and package it appropriately before turning this feature on in compile
flags.
IMPORTANT: Can't be enabled on on Android until the SIGBUS in CLD is fixed:
https://code.google.com/p/cld2/issues/detail?id=11
BUG=326023
Review URL: https://codereview.chromium.org/187393005
git-svn-id: http://src.chromium.org/svn/trunk/src/build@259900 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This also checks the 2nd parent during a merge, to allow commiting a
merge that contains newer versions of the submodules. In particular
merging chromium master into a local branch will now work.
TEST=git checkout -b test origin/master~200
git merge --no-ff --no-commit origin/master
git commit
Review URL: https://codereview.chromium.org/192443006
git-svn-id: http://src.chromium.org/svn/trunk/src/build@259711 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This is a copy of https://codereview.chromium.org/25687005/ updated for the current trunk
with the link_dependency attribute speculatively added to base/base.gyp:sanitizer_options
to avoid potential dependency cycles.
This CL introduces a module, base/debug/sanitizer_options.cc, which will override
the defaults for various dynamic tools (only ASan at this moment). For every executable
built with a dynamic tool this module will be linked into that executable, providing
weak functions to be called by the tool.
The existing declaration of __asan_default_options() in chrome/app/chrome_exe_main_gtk.cc
has been moved into sanitizer_options.cc (now every binary built with GOOGLE_CHROME_BUILD=1
will have the same options as google-chrome-asan.
The existing declaration of __asan_default_options() in chrome/nacl/nacl_helper_linux.cc
has been kept as is, but we had to remove -Wl,-u_sanitizer_options_link_helper to avoid picking sanitizer_options.cc.
GYP changes for OSX and iOS will be committed separately.
BUG=302040
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/201153007
git-svn-id: http://src.chromium.org/svn/trunk/src/build@259561 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Since r257419, linker warning starts to cause the build failure.
This CL is fixing some linker warnings on cross compilation build so that build with target_arch=ia32 option works properly.
Here are the error logs:
/usr/bin/ld: skipping incompatible /lib/x86_64-linux-gnu/libgcrypt.so when searching for -lgcrypt
/usr/bin/ld: skipping incompatible /lib/x86_64-linux-gnu/libgcrypt.a when searching for -lgcrypt
/usr/bin/ld: skipping incompatible /lib/x86_64-linux-gnu/libcap.so when searching for -lcap
/usr/bin/ld: skipping incompatible /lib/x86_64-linux-gnu/libcap.a when searching for -lcap
/usr/bin/ld: warning: libgnutls.so.26, needed by /usr/lib/gcc/x86_64-linux-gnu/4.6/../../../../lib32/libcups.so, may conflict with libgnutls.so.28
BUG=n/a
TEST=build with GYP_DEFINES=target_arch=ia32, run trybot.
Review URL: https://codereview.chromium.org/202633008
git-svn-id: http://src.chromium.org/svn/trunk/src/build@259463 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
It's part of the pango library we use already, so by using it, we avoid
a link time collission.
However, if you build just the browser on linux on ubuntu 12, we don't
have such an up to date pango available, so we need to be a bit smart
about whether or not to use the system harfbuzz.
This also allows for treating linker warnings as errors on chromeos
BUG=353127
R=jshin@chromium.org,thakis@chromium.org
Review URL: https://codereview.chromium.org/203163003
git-svn-id: http://src.chromium.org/svn/trunk/src/build@259423 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Also, remove install of apk in device status check to track install speed. We have not been tracking install speed and have not found it to be very useful. I want to avoid doing too many installs. We can bring it back if we find out that it is useful. We originally added it because installs were timing out, but we found install speed to be too variable across the same device to be useful.
BUG=335549
TBR=craigdh@chromium.org
Review URL: https://codereview.chromium.org/204353011
git-svn-id: http://src.chromium.org/svn/trunk/src/build@258967 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
When running gyp_chromium with the following diff:
diff --git a/build/gyp_chromium b/build/gyp_chromium
index 63e8671..ca9b6a4 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -509,8 +509,6 @@ if __name__ == '__main__':
# option. http://crbug.com/35878.
# TODO(tc): Fix circular dependencies in ChromiumOS then add linux2
# list.
- if sys.platform not in ('darwin',):
- args.append('--no-circular-check')
These cycles are found:
gyp: Cycles in .gyp file dependency graph detected:
Cycle: content/content_shell_and_tests.gyp ->
ui/views/controls/webview/webview.gyp -> ui/views/views.gyp ->
content/content_shell_and_tests.gyp
Cycle: ui/views/controls/webview/webview.gyp -> ui/views/views.gyp ->
content/content_shell_and_tests.gyp ->
ui/views/controls/webview/webview.gyp
Cycle: ui/views/views.gyp -> content/content_shell_and_tests.gyp ->
ui/views/controls/webview/webview.gyp -> ui/views/views.gyp
Cycle: ui/views/views.gyp -> content/content_shell_and_tests.gyp ->
ui/views/views.gyp
Cycle: ui/views/controls/webview/webview.gyp -> ui/views/views.gyp ->
ui/views/controls/webview/webview.gyp
Cycle: ui/views/views.gyp -> ui/views/controls/webview/webview.gyp ->
ui/views/views.gyp
Cycle: content/content_shell_and_tests.gyp -> ui/views/views.gyp ->
content/content_shell_and_tests.gyp
By moving '*examples*' targets from views.gyp to examples.gyp we break
most of these cycles.
Then it remains the cycle:
Cycle: content/content_shell_and_tests.gyp -> ui/views/controls/webview/webview.gyp -> content/content_shell_and_tests.gyp
To fix that we introduced a webview_tests.gyp to which we moved the include of
content_shell_and_tests.gyp from webview.gyp, and thus breaking that
cycle and fixing all the circlar dependencies found above.
BUG=331669,35878
TEST=run gyp_chromium with the above diff, gyp should not throw any
cycles output.
R=ben@chromium.org, harrym@chromium.org, tapted@chromium.org
Review URL: https://codereview.chromium.org/201093002
git-svn-id: http://src.chromium.org/svn/trunk/src/build@258758 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
On some Android devices (e.g., Sony Xperia), package manager may
fail to extract native libraries when updating Chrome.
The change tries alleviate the situation by:
1) name libchrome with version number;
2) when failed to load library, try to extract native libraies
and load them.
BUG=311644
Review URL: https://codereview.chromium.org/200753002
git-svn-id: http://src.chromium.org/svn/trunk/src/build@258546 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Changes:
1. Consolidate the logic of "ENABLE_MDNS or OS_MACOSX" into a single C++/grit/ninja define called "enable_service_discovery"
2. Move a bunch of files from being conditioned on enable_mdns to being conditioned on enable_service_discovery.
3. Create a separate, simplified PrivetHTTPAsynchronousFactory that synchronously returns a PrivetHTTPClient for the mDNS host and port
without resolving, since on OSX mDNS resolution is baked into the operating system.
BUG=352811
Review URL: https://codereview.chromium.org/195983023
git-svn-id: http://src.chromium.org/svn/trunk/src/build@258480 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
aurimas@google.com
mnissler@chromium.org
jochen@chromium.org
davemoore@chromium.org
andrewhayden@chromium.org
haavardm@opera.com
brettw@chromium.org
tfarina@chromium.org
thakis@chromium.org
mukai@chromium.org
bajones@chromium.org
dmikurube@chromium.org
chrisha@google.com
spang@chromium.org
sky@chromium.org
glider@chromium.org
hidehiko@chromium.org
erikchen@chromium.org
kerz@chromium.org
szager@chromium.org
tonyg@chromium.org
rmcilroy@chromium.org
navabi@google.com
jbudorick@chromium.org
yang.gu@intel.com
mithro@mithis.com
dbeam@chromium.org
feng@chromium.org
noamsml@chromium.org