summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpranke <dpranke@chromium.org>2014-11-13 18:02:55 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-14 02:04:17 +0000
commitbf14bb992d8111b6cc6e380aa0ab3030d4ec3b05 (patch)
tree803ba011b08b05c82766c45b1f2a635991e1ed38
parent84f335804bfe42fb669c254eb97088d27ae9fb93 (diff)
downloadchromium_src-bf14bb992d8111b6cc6e380aa0ab3030d4ec3b05.zip
chromium_src-bf14bb992d8111b6cc6e380aa0ab3030d4ec3b05.tar.gz
chromium_src-bf14bb992d8111b6cc6e380aa0ab3030d4ec3b05.tar.bz2
Update instructions, sha-1's for uploading GN binaries.
This should be synced to r304096. This drops the 'use_ozone' flag for the linux builds (no longer needed and didn't really make sense) and updates some instructions. TBR=brettw@chromium.org BUG= Review URL: https://codereview.chromium.org/720353002 Cr-Commit-Position: refs/heads/master@{#304146}
-rw-r--r--tools/gn/bin/linux/args.txt5
-rw-r--r--tools/gn/bin/linux/args32.txt5
-rw-r--r--tools/gn/bin/linux/gn.sha12
-rw-r--r--tools/gn/bin/linux/gn32.sha12
-rw-r--r--tools/gn/bin/mac/gn.sha12
-rw-r--r--tools/gn/bin/win/gn.exe.sha12
-rwxr-xr-xtools/gn/bin/win/upload2
7 files changed, 14 insertions, 6 deletions
diff --git a/tools/gn/bin/linux/args.txt b/tools/gn/bin/linux/args.txt
index 6e992f4..2c648fa 100644
--- a/tools/gn/bin/linux/args.txt
+++ b/tools/gn/bin/linux/args.txt
@@ -1,2 +1,5 @@
# 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"
+# Make sure you run 'gclient runhooks' with
+# GYP_DEFINES="branding=Chrome buildtype=Official"
+# to pull in the sysroots.
+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
index b17b413..cf9c73d 100644
--- a/tools/gn/bin/linux/args32.txt
+++ b/tools/gn/bin/linux/args32.txt
@@ -1,2 +1,5 @@
# 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"
+# Make sure you run 'gclient runhooks' with
+# GYP_DEFINES="branding=Chrome buildtype=Official"
+# to pull in the sysroots.
+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 1e0791f..a469a3d 100644
--- a/tools/gn/bin/linux/gn.sha1
+++ b/tools/gn/bin/linux/gn.sha1
@@ -1 +1 @@
-85ec3797a1263b8d633f88b537c6f0840ccbb62e \ No newline at end of file
+21f8eb38dc42f5deeb0f9fa7dc83f340ae2f2851 \ No newline at end of file
diff --git a/tools/gn/bin/linux/gn32.sha1 b/tools/gn/bin/linux/gn32.sha1
index d2ff702..80b5cb8 100644
--- a/tools/gn/bin/linux/gn32.sha1
+++ b/tools/gn/bin/linux/gn32.sha1
@@ -1 +1 @@
-257458a058760314036e38bdb56647548474b5b3 \ No newline at end of file
+9ec75b866f9d14121264cc37cf8499dc7c1bd3cc \ No newline at end of file
diff --git a/tools/gn/bin/mac/gn.sha1 b/tools/gn/bin/mac/gn.sha1
index 676ac3c..6b4db4a 100644
--- a/tools/gn/bin/mac/gn.sha1
+++ b/tools/gn/bin/mac/gn.sha1
@@ -1 +1 @@
-dceee45ef9bfa1b389d504106506e63df0adc9ae
+eba14cb1b673400eeb7bfb7f11b8ae12625adaaf \ No newline at end of file
diff --git a/tools/gn/bin/win/gn.exe.sha1 b/tools/gn/bin/win/gn.exe.sha1
index b8009a6..99152f6 100644
--- a/tools/gn/bin/win/gn.exe.sha1
+++ b/tools/gn/bin/win/gn.exe.sha1
@@ -1 +1 @@
-426f62ed6bd80b5c1395705fbee7e2578c521eaa
+506f9ef587641e36a9bb24c7edf92f46826c25ce \ No newline at end of file
diff --git a/tools/gn/bin/win/upload b/tools/gn/bin/win/upload
new file mode 100755
index 0000000..353a87e9
--- /dev/null
+++ b/tools/gn/bin/win/upload
@@ -0,0 +1,2 @@
+#!/bin/sh
+upload_to_google_storage.py -b chromium-gn gn.exe