summaryrefslogtreecommitdiffstats
path: root/blimp/docs
diff options
context:
space:
mode:
authornyquist <nyquist@chromium.org>2016-03-08 10:17:44 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-08 18:19:09 +0000
commite246e4c702d03cde59f044748dc4a8f04b92d269 (patch)
tree7287e160690073906d200d4d490b96be53842efb /blimp/docs
parentf9461d1a2460a7d9d1f9d31e2aef2fc88f120674 (diff)
downloadchromium_src-e246e4c702d03cde59f044748dc4a8f04b92d269.zip
chromium_src-e246e4c702d03cde59f044748dc4a8f04b92d269.tar.gz
chromium_src-e246e4c702d03cde59f044748dc4a8f04b92d269.tar.bz2
Revert of Add Android fonts to blimp engine (patchset #7 id:120001 of https://codereview.chromium.org/1735783002/ )
Reason for revert: Will change to use a single archive instead of multiple files. Original issue's description: > Add Android fonts to blimp engine > > The blimp engine is currently using Linux fonts, which works well > for Linux clients. However, for Android clients, Skia should be > instructed to use Android fonts instead to ensure that the font > rendering works correctly. > > This CL adds a starting set of fonts to be used, ensures that they > are part of the engine bundle, and provides documentation for how > to use them in locally hosted engines and also for how to keep the > fonts up to date. > > This also updates the engine manifest and starts loading a new > dynamic library while running the engine plus fixes the documentation > for running the engine as a container. > > BUG=585668, 588929 > > Committed: https://crrev.com/7b1d1d89b247c0bd82d527c6ded5da4128883274 > Cr-Commit-Position: refs/heads/master@{#379734} TBR=dpranke@chromium.org,dtrainor@chromium.org,maniscalco@chromium.org,open-source-third-party-reviews@google.com,klobag@chromium.org,thakis@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=585668, 588929 Review URL: https://codereview.chromium.org/1772343003 Cr-Commit-Position: refs/heads/master@{#379860}
Diffstat (limited to 'blimp/docs')
-rw-r--r--blimp/docs/container.md8
-rw-r--r--blimp/docs/fonts.md39
-rw-r--r--blimp/docs/running.md3
3 files changed, 4 insertions, 46 deletions
diff --git a/blimp/docs/container.md b/blimp/docs/container.md
index 7a1902a..31adc80 100644
--- a/blimp/docs/container.md
+++ b/blimp/docs/container.md
@@ -43,7 +43,7 @@ dependencies. From time to time, this list may need to be updated. Use
```bash
./blimp/tools/generate-engine-manifest.py \
- --build-dir out-chromeos/Debug \
+ --build-dir out-linux/Debug \
--target //blimp/engine:blimp_engine \
--output blimp/engine/engine-manifest.txt
```
@@ -56,7 +56,7 @@ dependencies.
Using the tarfile you can create a Docker image:
```bash
-docker build -t blimp_engine - < ./out-chromeos/Debug/blimp_engine_bundle.tar.gz
+docker build -t blimp_engine - < ./out-linux/Debug/blimp_engine_bundle.tar
```
## Running the Engine in a Docker Container
@@ -74,8 +74,7 @@ few files that are not provided by the container. You need:
public certificate. Permissions should be set to 644.
* `$CONFIG_DIR/client_token`: A file with a non-empty string used as the
client token (the shared secret between the client and the engine).
- Permissions should also be set to 644. See [running](running.md) for how
- to get the default token from the source code.
+ Persmissions should also be set to 644.
This setup step is only required once and can be reused for all the rest of the
runs of the engine.
@@ -95,3 +94,4 @@ docker run ... blimp_engine --with-my-flags
```
See the [blimp engine `Dockerfile`](../engine/Dockerfile) to find out what flags
are passed by default.
+
diff --git a/blimp/docs/fonts.md b/blimp/docs/fonts.md
deleted file mode 100644
index 44b744f..0000000
--- a/blimp/docs/fonts.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Updating Blimp Fonts
-
-1. Clone the git-repositories listed in
- `//third_party/blimp_fonts/README.chromium`, and roll forward to the commit
- you want.
-1. Copy the necessary files to `//third_party/blimp_fonts`.
-1. Verify that the `LICENSE` file is still up to date and lists all relevant
- licenses and which fonts use which license.
-1. Update the `//third_party/blimp_fonts:fonts` target to include all the
- current fonts and their license files.
-1. Update the engine dependencies using
- `//blimp/tools/generate-engine-manifest.py`. This step is documented in
- `//blimp/docs/container.md`.
-1. Run the `upload_to_google_storage.py` (from depot_tools) script to upload
- the files. To do this, execute:
-
- ```bash
- find ./third_party/blimp_fonts \
- -regex '^.*.\(ttf\|otf\)$' -type f -print0 | \
- upload_to_google_storage.py --use_null_terminator -b chromium-fonts -
- ```
-
- If the set of fonts includes more than `.ttf` or `.otf` files, you must
- update the regular expression to include such fonts.
-1. Verify that `//third_party/blimp_fonts/.gitignore` lists the correct files
- to ignore.
-1. Add all the `.sha1` files to the chromium src repository, by executing the
- following command:
-
- ```bash
- git add ./third_party/blimp_fonts/*.sha1
- ```
-
-1. Commit and upload the change for review:
-
- ```bash
- git commit
- git cl upload
- ```
diff --git a/blimp/docs/running.md b/blimp/docs/running.md
index bb92199..8accd3e 100644
--- a/blimp/docs/running.md
+++ b/blimp/docs/running.md
@@ -100,8 +100,6 @@ also start a new shell and keep the following command running:
compositor.
* `--disable-cached-picture-raster`: Ensures that rasterized content is not
destroyed before serialization.
-* `--android-fonts-path=$PATH`: Path to where the fonts are located.
- Typically this would be `out-linux/Debug/gen/third_party/blimp_fonts`.
#### Typical invocation
When the client connects to a manually specified engine instead of using the
@@ -124,7 +122,6 @@ out-linux/Debug/blimp_engine_app \
--disable-cached-picture-raster \
--blimp-client-token-path=/tmp/blimpengine-token \
--user-data-dir=/tmp/blimpengine \
- --android-fonts-path=out-linux/Debug/gen/third_party/blimp_fonts \
--enable-logging=stderr \
--vmodule="blimp*=1"
```