Merge "Revert "Remove libcpp_is_static""
diff --git a/.gitignore b/.gitignore
index 28b39b1..dea1ab0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,11 +3,11 @@
third_party/libc++/trunk
third_party/libc++abi/trunk
third_party/libunwind/trunk
-linux64/gn
linux64/clang-format
-mac/gn
+linux64/gn
mac/clang-format
-win/gn.exe
+mac/gn
win/clang-format.exe
+win/gn.exe
android/doclava/
android/doclava.tar.gz
diff --git a/README.txt b/README.txt
index 1db97b4..30325bf 100644
--- a/README.txt
+++ b/README.txt
@@ -6,9 +6,6 @@
the various Chromium-related projects without each one needing to maintain
their own versionining of each binary.
-To update the GN binary, run (from the Chromium repo) tools/gn/bin/roll_gn.py
-which will automatically upload the binaries and roll build tools.
-
________________________________________
UPDATING AND ROLLING BUILDTOOLS MANUALLY
@@ -47,10 +44,7 @@
python ~/depot_tools/third_party/gsutil/gsutil config
- That will give a URL which you should log into with your web browser. For
- rolling GN, the username should be the one that is on the ACL for the
- "chromium-gn" bucket (probably your @google.com address). Contact the build
- team for help getting access if necessary.
+ That will give a URL which you should log into with your web browser.
Copy the code back to the command line util. Ignore the project ID (it's OK
to just leave blank when prompted).
diff --git a/linux64/gn.sha1 b/linux64/gn.sha1
index 4a9ddda..8e43c80 100644
--- a/linux64/gn.sha1
+++ b/linux64/gn.sha1
@@ -1 +1 @@
-c39494bc0710270aa3b56027d455b5db56977702
+57d96a3dc489ea38abf1d7acd466c82db1fac0a1
diff --git a/mac/gn.sha1 b/mac/gn.sha1
index 04f0c46..6c7c815 100644
--- a/mac/gn.sha1
+++ b/mac/gn.sha1
@@ -1 +1 @@
-8e0d359ddc66a771b660d6e619fbec6e718a48e1
+f08024240631f4974bb924b2f05712df185263ea
diff --git a/win/gn.exe.sha1 b/win/gn.exe.sha1
index e43b617..9ba92f4 100644
--- a/win/gn.exe.sha1
+++ b/win/gn.exe.sha1
@@ -1 +1 @@
-2688353e0b740fb35184ead15b7da96e6278e786
+a3f749800a386dba102a319b0e9770a3ca57650e
