aboutsummaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2012-05-06 13:27:13 -0700
committerJamie Gennis <jgennis@google.com>2012-05-06 13:35:46 -0700
commitd1270ce027b82d14c215719b236b3fe37695827e (patch)
tree0bdac5a7554460c524d366fc275a4987db5e4398 /README
parent7ee0e87ef2e148e02acb223570390f59a41e7a9b (diff)
downloadchromium-trace-d1270ce027b82d14c215719b236b3fe37695827e.tar.gz
update minified code and generator script
Change-Id: I3b94a13c9ba26a8e0e97f51ebd591eaf6a0e892a
Diffstat (limited to 'README')
-rw-r--r--README15
1 files changed, 10 insertions, 5 deletions
diff --git a/README b/README
index cedfff29..b61ae6ed 100644
--- a/README
+++ b/README
@@ -1,9 +1,14 @@
-The things in the www subdirectory were forked from the Chrome tracing tool.
-This should end up getting merged upstream at some point into either the
-Chromium code base or else a separate shared project.
+The src directory contains Chromium source from the following locations:
-The update.sh script should be used to package the CSS and Javascript files in
-the www directory into the style.css and script.js files. These files are
+ http://src.chromium.org/chrome/trunk/src/chrome/browser/resources/shared/
+ http://src.chromium.org/chrome/trunk/src/chrome/browser/resources/tracing/
+
+The file src/UPSTREAM_REVISION contains the upstream revision number that was
+last pulled. There may be local patches applied on top of the upstream source,
+but we should keep those to a minimum.
+
+The update.py script should be used to package the CSS and Javascript files in
+the src directory into the style.css and script.js files. These files are
being checked in, and get embedded in each trace HTML file the systrace.py
generates. Each time a file in the www directory gets updated, this script
will need to be rerun, and the generated files must be committed along with the