Commit c9039aa0 authored by Wei Lee's avatar Wei Lee Committed by Commit Bot

Fix issue that CCA cannot launch successfully due to missing dependency

This issue is introduced by this CL: https://crrev.com/c/1722167
Since it makes camera_app.mojom depends on camera_intent.mojom but did
not add camera_intent.mojom into the CCA's dependency, CCA will complain
when launching.

Bug: 980812, 967611, b/131809655, b/134635999
Test: Tested on Soraka and CCA could launch successfully with this CL
Change-Id: Icb43a6e83ec13e391dd82fa281a52d99244de618
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1817872Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Reviewed-by: default avatarShik Chen <shik@chromium.org>
Commit-Queue: Wei Lee <wtlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699178}
parent b3b1ed4b
......@@ -233,6 +233,7 @@ copy("chrome_camera_app_views") {
copy("chrome_camera_app_mojo_generated") {
sources = [
"$root_gen_dir/components/arc/mojom/camera_intent.mojom-lite.js",
"$root_gen_dir/media/capture/mojom/image_capture.mojom-lite.js",
"$root_gen_dir/media/capture/video/chromeos/mojom/camera_app.mojom-lite.js",
"$root_gen_dir/media/capture/video/chromeos/mojom/camera_common.mojom-lite.js",
......@@ -244,6 +245,7 @@ copy("chrome_camera_app_mojo_generated") {
]
deps = [
"//components/arc/mojom:camera_intent_js",
"//media/capture/mojom:image_capture_js",
"//media/capture/video/chromeos/mojom:cros_camera_js",
"//mojo/public/js:bindings_lite",
......
......@@ -56,6 +56,10 @@
</structures>
<includes>
<!-- Mojo Lite Bindings -->
<include name="IDR_CAMERA_CAMERA_INTENT_MOJOM_LITE_JS"
file="${root_gen_dir}/components/arc/mojom/camera_intent.mojom-lite.js"
use_base_dir="false"
type="BINDATA"/>
<include name="IDR_CAMERA_IMAGE_CAPTURE_MOJOM_LITE_JS"
file="${root_gen_dir}/media/capture/mojom/image_capture.mojom-lite.js"
use_base_dir="false"
......
......@@ -14,6 +14,7 @@ js_type_check("closure_compile") {
js_library("chrome_helper") {
deps = [
"//components/arc/mojom:camera_intent_js_library_for_compile",
"//media/capture/video/chromeos/mojom:cros_camera_js_library_for_compile",
]
externs_list = [ "$externs_path/pending.js" ]
......
......@@ -35,6 +35,7 @@
<script src="../js/mojo/image_capture.mojom-lite.js"></script>
<script src="../js/mojo/geometry.mojom-lite.js"></script>
<script src="../js/mojo/range.mojom-lite.js"></script>
<script src="../js/mojo/camera_intent.mojom-lite.js"></script>
<script src="../js/mojo/camera_app.mojom-lite.js"></script>
<script src="../js/mojo/chrome_helper.js"></script>
<script src="../js/mojo/device_operator.js"></script>
......
......@@ -37,6 +37,8 @@ content::WebUIDataSource* CreateCameraUIHTMLSource() {
IDR_CAMERA_WEBUI_BROWSER_PROXY);
// Add mojom-lite files under expected paths.
source->AddResourcePath("src/js/mojo/camera_intent.mojom-lite.js",
IDR_CAMERA_CAMERA_INTENT_MOJOM_LITE_JS);
source->AddResourcePath("src/js/mojo/image_capture.mojom-lite.js",
IDR_CAMERA_IMAGE_CAPTURE_MOJOM_LITE_JS);
source->AddResourcePath("src/js/mojo/camera_common.mojom-lite.js",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment