diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 06:25:31 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 06:25:31 +0000 |
commit | faa93c836385aa0383a93e462f95b1a9e552bfa4 (patch) | |
tree | ed57b24e9329bc4ee03ace9168f3fb11f0820223 /tools/gn/bin | |
parent | f8d1ac3ecf032ac15d3fae0515c64526a58018de (diff) | |
download | chromium_src-faa93c836385aa0383a93e462f95b1a9e552bfa4.zip chromium_src-faa93c836385aa0383a93e462f95b1a9e552bfa4.tar.gz chromium_src-faa93c836385aa0383a93e462f95b1a9e552bfa4.tar.bz2 |
Pull GN at r265100 (Windows r265101).
This also adds my upload scripts for uploading the binaries to Google storage, and adds files for the build arguments used to generate the official GN builds for each platform.
TBR=scottmg
Review URL: https://codereview.chromium.org/246663002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265197 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn/bin')
-rw-r--r-- | tools/gn/bin/linux/args.txt | 2 | ||||
-rw-r--r-- | tools/gn/bin/linux/args32.txt | 2 | ||||
-rw-r--r-- | tools/gn/bin/linux/gn.sha1 | 2 | ||||
-rw-r--r-- | tools/gn/bin/linux/gn32.sha1 | 2 | ||||
-rwxr-xr-x | tools/gn/bin/linux/upload | 3 | ||||
-rw-r--r-- | tools/gn/bin/mac/args.txt | 2 | ||||
-rw-r--r-- | tools/gn/bin/mac/gn.sha1 | 2 | ||||
-rwxr-xr-x | tools/gn/bin/mac/upload | 2 | ||||
-rw-r--r-- | tools/gn/bin/win/args.txt | 2 | ||||
-rw-r--r-- | tools/gn/bin/win/gn.exe.sha1 | 3 | ||||
-rwxr-xr-x | tools/gn/bin/win/upload.bat | 1 |
11 files changed, 19 insertions, 4 deletions
diff --git a/tools/gn/bin/linux/args.txt b/tools/gn/bin/linux/args.txt new file mode 100644 index 0000000..6e992f4 --- /dev/null +++ b/tools/gn/bin/linux/args.txt @@ -0,0 +1,2 @@ +# These are the build arguments used for a 64-bit Linux build: +use_ozone=true symbol_level=0 is_official_build=true is_debug=false is_chrome_branded=true cpu_arch="x64" diff --git a/tools/gn/bin/linux/args32.txt b/tools/gn/bin/linux/args32.txt new file mode 100644 index 0000000..b17b413 --- /dev/null +++ b/tools/gn/bin/linux/args32.txt @@ -0,0 +1,2 @@ +# These are the build arguments used for a 32-bit Linux build: +use_ozone=true symbol_level=0 is_official_build=true is_debug=false is_chrome_branded=true cpu_arch="x86" diff --git a/tools/gn/bin/linux/gn.sha1 b/tools/gn/bin/linux/gn.sha1 index 853d740..a97f17c 100644 --- a/tools/gn/bin/linux/gn.sha1 +++ b/tools/gn/bin/linux/gn.sha1 @@ -1 +1 @@ -757c4f0da61041a2de8ae881e88107c8ed7d1942
\ No newline at end of file +5d83f785d62856cc6f9817608c5e25fc11803748
\ No newline at end of file diff --git a/tools/gn/bin/linux/gn32.sha1 b/tools/gn/bin/linux/gn32.sha1 index 58424e9..5f5ef66 100644 --- a/tools/gn/bin/linux/gn32.sha1 +++ b/tools/gn/bin/linux/gn32.sha1 @@ -1 +1 @@ -058076b1160c3c32b7d660a7452f77e5f732b1a5
\ No newline at end of file +cdb58345bba399de11e45c255f9b598aba984820
\ No newline at end of file diff --git a/tools/gn/bin/linux/upload b/tools/gn/bin/linux/upload new file mode 100755 index 0000000..591676c --- /dev/null +++ b/tools/gn/bin/linux/upload @@ -0,0 +1,3 @@ +#!/bin/sh +upload_to_google_storage.py -b chromium-gn gn +upload_to_google_storage.py -b chromium-gn gn32 diff --git a/tools/gn/bin/mac/args.txt b/tools/gn/bin/mac/args.txt new file mode 100644 index 0000000..d83bbd8 --- /dev/null +++ b/tools/gn/bin/mac/args.txt @@ -0,0 +1,2 @@ +# These are the build arguments for a Mac release GN build: +is_debug=false symbol_level=0 diff --git a/tools/gn/bin/mac/gn.sha1 b/tools/gn/bin/mac/gn.sha1 index 02f099d..6d33175 100644 --- a/tools/gn/bin/mac/gn.sha1 +++ b/tools/gn/bin/mac/gn.sha1 @@ -1 +1 @@ -1a3cf3a53f691546d0660d6c2b7e4661f6200fcc +1d037c843cc1ae86203dee80d6461720b1058413 diff --git a/tools/gn/bin/mac/upload b/tools/gn/bin/mac/upload new file mode 100755 index 0000000..8930b32 --- /dev/null +++ b/tools/gn/bin/mac/upload @@ -0,0 +1,2 @@ +#!/bin/sh +upload_to_google_storage.py -b chromium-gn gn diff --git a/tools/gn/bin/win/args.txt b/tools/gn/bin/win/args.txt new file mode 100644 index 0000000..e4562fc --- /dev/null +++ b/tools/gn/bin/win/args.txt @@ -0,0 +1,2 @@ +# These are the build arguments for a Windows release build. +is_official_build=true symbol_level=2 is_debug=false diff --git a/tools/gn/bin/win/gn.exe.sha1 b/tools/gn/bin/win/gn.exe.sha1 index 0b31676..86893a2 100644 --- a/tools/gn/bin/win/gn.exe.sha1 +++ b/tools/gn/bin/win/gn.exe.sha1 @@ -1 +1,2 @@ -7462bcb2bb0b8877dbf6ba6d7ae5090b1093817e +deb2bfcaaa9eb465ada1b9f407e19361f03370e9 + diff --git a/tools/gn/bin/win/upload.bat b/tools/gn/bin/win/upload.bat new file mode 100755 index 0000000..8a3d651 --- /dev/null +++ b/tools/gn/bin/win/upload.bat @@ -0,0 +1 @@ +python C:\apps\depot_tools\upload_to_google_storage.py -b chromium-gn gn.exe
|