5 files changed, 214 insertions, 4 deletions
diff --git a/blimp/engine/BUILD.gn b/blimp/engine/BUILD.gn
index 5bd4c21..a19eb10 100644
--- a/blimp/engine/BUILD.gn
+++ b/blimp/engine/BUILD.gn
@@ -223,6 +223,7 @@ if (is_linux) {
       ":blimp_engine_app",
       ":pak",
       "//sandbox/linux:chrome_sandbox",
+      "//third_party/blimp_fonts",
     ]
 
     # List dependencies as both deps and data_deps to ensure changes trigger a
diff --git a/blimp/engine/DEPS b/blimp/engine/DEPS
index e4ebc4e..5c16370 100644
--- a/blimp/engine/DEPS
+++ b/blimp/engine/DEPS
@@ -6,6 +6,7 @@ include_rules = [
   "+components/web_cache/renderer",
   "+content/public",
   "+net",
+  "+third_party/blimp_fonts",
   "+third_party/khronos/GLES2/gl2.h",
   "+third_party/WebKit/public/web/WebInputEvent.h",
   "+ui/aura",
diff --git a/blimp/engine/Dockerfile b/blimp/engine/Dockerfile
index 0410cf8..7e3cbba 100644
--- a/blimp/engine/Dockerfile
+++ b/blimp/engine/Dockerfile
@@ -13,7 +13,10 @@ RUN mkdir /engine
 
 RUN useradd -ms /bin/bash blimp_user
 
+# The glob below expands to all files, but does not add directories
+# recursively.
 ADD * /engine/
+ADD gen/third_party/blimp_fonts /engine/fonts
 RUN mv /engine/chrome_sandbox /engine/chrome-sandbox
 RUN chown -R blimp_user /engine
 
@@ -21,4 +24,3 @@ USER blimp_user
 WORKDIR "/engine"
 
 ENTRYPOINT ["/engine/start_engine.sh"]
-
diff --git a/blimp/engine/engine-manifest.txt b/blimp/engine/engine-manifest.txt
index d84b8f9..285e9c2 100644
--- a/blimp/engine/engine-manifest.txt
+++ b/blimp/engine/engine-manifest.txt
@@ -1,7 +1,7 @@
 # Runtime dependencies for the Blimp Engine
 #
 # This file was generated by running:
-# generate-engine-manifest.py --build-dir out/Linux --target //blimp/engine:blimp_engine --output blimp/engine/engine-manifest.txt
+# generate-engine-manifest.py --build-dir out-chromeos/Debug --target //blimp/engine:blimp_engine --output blimp/engine/engine-manifest.txt
 #
 # Note: Any unnecessary dependencies should be added to
 #       manifest-blacklist.txt and this file should be regenerated.
@@ -9,4 +9,209 @@
 icudtl.dat
 natives_blob.bin
 blimp_engine.pak
-./chrome_sandbox
-\ No newline at end of file
+./chrome_sandbox
+gen/third_party/blimp_fonts/LICENSE
+gen/third_party/blimp_fonts/LICENSE.Apache
+gen/third_party/blimp_fonts/LICENSE.OFL
+gen/third_party/blimp_fonts/AndroidClock.ttf
+gen/third_party/blimp_fonts/AndroidClock_Highlight.ttf
+gen/third_party/blimp_fonts/AndroidClock_Solid.ttf
+gen/third_party/blimp_fonts/CarroisGothicSC-Regular.ttf
+gen/third_party/blimp_fonts/Clockopia.ttf
+gen/third_party/blimp_fonts/ComingSoon.ttf
+gen/third_party/blimp_fonts/CutiveMono.ttf
+gen/third_party/blimp_fonts/DancingScript-Bold.ttf
+gen/third_party/blimp_fonts/DancingScript-Regular.ttf
+gen/third_party/blimp_fonts/DroidSansFallback.ttf
+gen/third_party/blimp_fonts/DroidSansFallbackFull.ttf
+gen/third_party/blimp_fonts/DroidSansMono.ttf
+gen/third_party/blimp_fonts/MTLc3m.ttf
+gen/third_party/blimp_fonts/MTLmr3m.ttf
+gen/third_party/blimp_fonts/NanumGothic.ttf
+gen/third_party/blimp_fonts/NanumGothicBold.ttf
+gen/third_party/blimp_fonts/NotoColorEmoji.ttf
+gen/third_party/blimp_fonts/NotoKufiArabic-Bold.ttf
+gen/third_party/blimp_fonts/NotoKufiArabic-Regular.ttf
+gen/third_party/blimp_fonts/NotoNaskhArabic-Bold.ttf
+gen/third_party/blimp_fonts/NotoNaskhArabic-Regular.ttf
+gen/third_party/blimp_fonts/NotoNaskhArabicUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoNaskhArabicUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSans-Bold.ttf
+gen/third_party/blimp_fonts/NotoSans-BoldItalic.ttf
+gen/third_party/blimp_fonts/NotoSans-Italic.ttf
+gen/third_party/blimp_fonts/NotoSans-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansArmenian-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansArmenian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansAvestan-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansBalinese-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansBamum-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansBatak-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansBengali-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansBengali-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansBengaliUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansBengaliUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansBrahmi-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansBuginese-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansBuhid-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansCanadianAboriginal-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansCarian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansCham-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansCham-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansCherokee-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansCoptic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansCuneiform-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansCypriot-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansDeseret-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansDevanagari-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansDevanagari-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansDevanagariUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansDevanagariUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansEgyptianHieroglyphs-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansEthiopic-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansEthiopic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansGeorgian-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansGeorgian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansGlagolitic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansGothic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansGujarati-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansGujarati-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansGujaratiUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansGujaratiUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansGurmukhi-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansGurmukhi-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansGurmukhiUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansGurmukhiUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansHanunoo-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansHebrew-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansHebrew-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansImperialAramaic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansInscriptionalPahlavi-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansInscriptionalParthian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansJP-Regular-Subsetted.otf
+gen/third_party/blimp_fonts/NotoSansJP-Regular.otf
+gen/third_party/blimp_fonts/NotoSansJavanese-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansKR-Regular.otf
+gen/third_party/blimp_fonts/NotoSansKaithi-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansKannada-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansKannada-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansKannadaUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansKannadaUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansKayahLi-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansKharoshthi-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansKhmer-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansKhmer-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansKhmerUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansKhmerUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansLao-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansLao-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansLaoUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansLaoUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansLepcha-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansLimbu-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansLinearB-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansLisu-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansLycian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansLydian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansMalayalam-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansMalayalam-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansMalayalamUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansMalayalamUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansMandaic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansMeeteiMayek-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansMongolian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansMyanmar-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansMyanmar-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansMyanmarUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansMyanmarUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansNKo-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansNewTaiLue-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOgham-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOlChiki-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOldItalic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOldPersian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOldSouthArabian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOldTurkic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOriya-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansOriya-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOriyaUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansOriyaUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansOsmanya-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansPhagsPa-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansPhoenician-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansRejang-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansRunic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSC-Regular.otf
+gen/third_party/blimp_fonts/NotoSansSamaritan-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSaurashtra-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansShavian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSinhala-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansSinhala-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSundanese-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSylotiNagri-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSymbols-Regular-Subsetted.ttf
+gen/third_party/blimp_fonts/NotoSansSymbols-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSyriacEastern-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSyriacEstrangela-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansSyriacWestern-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTC-Regular.otf
+gen/third_party/blimp_fonts/NotoSansTagalog-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTagbanwa-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTaiLe-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTaiTham-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTaiViet-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTamil-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansTamil-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTamilUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansTamilUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTelugu-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansTelugu-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTeluguUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansTeluguUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansThaana-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansThaana-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansThai-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansThai-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansThaiUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansThaiUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTibetan-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansTifinagh-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansUI-Bold.ttf
+gen/third_party/blimp_fonts/NotoSansUI-BoldItalic.ttf
+gen/third_party/blimp_fonts/NotoSansUI-Italic.ttf
+gen/third_party/blimp_fonts/NotoSansUI-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansUgaritic-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansVai-Regular.ttf
+gen/third_party/blimp_fonts/NotoSansYi-Regular.ttf
+gen/third_party/blimp_fonts/NotoSerif-Bold.ttf
+gen/third_party/blimp_fonts/NotoSerif-BoldItalic.ttf
+gen/third_party/blimp_fonts/NotoSerif-Italic.ttf
+gen/third_party/blimp_fonts/NotoSerif-Regular.ttf
+gen/third_party/blimp_fonts/NotoSerifArmenian-Bold.ttf
+gen/third_party/blimp_fonts/NotoSerifArmenian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSerifGeorgian-Bold.ttf
+gen/third_party/blimp_fonts/NotoSerifGeorgian-Regular.ttf
+gen/third_party/blimp_fonts/NotoSerifKhmer-Bold.ttf
+gen/third_party/blimp_fonts/NotoSerifKhmer-Regular.ttf
+gen/third_party/blimp_fonts/NotoSerifLao-Bold.ttf
+gen/third_party/blimp_fonts/NotoSerifLao-Regular.ttf
+gen/third_party/blimp_fonts/NotoSerifThai-Bold.ttf
+gen/third_party/blimp_fonts/NotoSerifThai-Regular.ttf
+gen/third_party/blimp_fonts/Roboto-Black.ttf
+gen/third_party/blimp_fonts/Roboto-BlackItalic.ttf
+gen/third_party/blimp_fonts/Roboto-Bold.ttf
+gen/third_party/blimp_fonts/Roboto-BoldItalic.ttf
+gen/third_party/blimp_fonts/Roboto-Italic.ttf
+gen/third_party/blimp_fonts/Roboto-Light.ttf
+gen/third_party/blimp_fonts/Roboto-LightItalic.ttf
+gen/third_party/blimp_fonts/Roboto-Medium.ttf
+gen/third_party/blimp_fonts/Roboto-MediumItalic.ttf
+gen/third_party/blimp_fonts/Roboto-Regular.ttf
+gen/third_party/blimp_fonts/Roboto-Thin.ttf
+gen/third_party/blimp_fonts/Roboto-ThinItalic.ttf
+gen/third_party/blimp_fonts/RobotoCondensed-Bold.ttf
+gen/third_party/blimp_fonts/RobotoCondensed-BoldItalic.ttf
+gen/third_party/blimp_fonts/RobotoCondensed-Italic.ttf
+gen/third_party/blimp_fonts/RobotoCondensed-Light.ttf
+gen/third_party/blimp_fonts/RobotoCondensed-LightItalic.ttf
+gen/third_party/blimp_fonts/RobotoCondensed-Regular.ttf
+gen/third_party/blimp_fonts/fonts.xml
+\ No newline at end of file
diff --git a/blimp/engine/start_engine.sh b/blimp/engine/start_engine.sh
index f507c24..a9cf193 100755
--- a/blimp/engine/start_engine.sh
+++ b/blimp/engine/start_engine.sh
@@ -8,11 +8,12 @@ stunnel \
   -p /engine/data/stunnel.pem \
   -P /engine/stunnel.pid \
   -d 25466 -r 25467 -f &
-/engine/blimp_engine_app \
+LD_LIBRARY_PATH=/engine/ /engine/blimp_engine_app \
   --disable-gpu \
   --use-remote-compositing \
   --disable-cached-picture-raster \
   --blimp-client-token-path=/engine/data/client_token \
+  --android-fonts-path=/engine/fonts \
   $@ &
 
 # Stop execution if either stunnel or blimp_engine_app die.