Load ash_sysui resources with ResourceLoader.

Load ash_sysui resources with ResourceLoader.

Create ash_sysui specific .pak files and load them with ResourceLoader.
For now the .pak files are just the previous ash test resources but that
can be changed easily. The ash_sysui .pak files are moved to the
Mojo Applications/ash_sysui subdir.

Moving the resources to the correct subdir will help simplify deploying
mash to a Chromebook. The deploy_chrome script can copy
"Mojo Applications/" only that way.

Also update mus_app resource loading to be a bit cleaner. Remove the
source_set that was built under android as it's unused. Remove the
android_loader.cc/h files which are unused without the target.

BUG=601167
Committed: https://crrev.com/884173bed9487d7f79fedd01476850936df7fd01
Cr-Commit-Position: refs/heads/master@{#386678}

[kylechar, 2016-04-08 18:32:30]

kylechar@chromium.org changed reviewers:
+ msw@chromium.org, sky@chromium.org

[msw, 2016-04-08 19:10:43]

lgtm with a nit

https://codereview.chromium.org/1874703003/diff/1/ash/mus/sysui_application.cc
File ash/mus/sysui_application.cc (right):

https://codereview.chromium.org/1874703003/diff/1/ash/mus/sysui_application.c...
ash/mus/sysui_application.cc:248: // TODO(msw): Do not load 'test' resources
(include sys lang; rename paks?).
nit: maybe move this TODO to BUILD.gn, where it grabs ash_test_*?

[kylechar, 2016-04-08 19:18:50]

Description was changed from

==========
Load ash_sysui resources with ResourceLoader.

Create ash_sysui specific .pak files and load them with ResourceLoader.
For now the .pak files are just the previous ash test resources but that
can be easily changed. The .pak files are generated in the
Mojo Applications/ash_sysui subdir as well.

Moving the resources to the correct subdir will help simplify deploying
mash to a Chromebook.

Also update mus_app resource loading to be a bit cleaner.

BUG=601167
==========

to

==========
Load ash_sysui resources with ResourceLoader.

Create ash_sysui specific .pak files and load them with ResourceLoader.
For now the .pak files are just the previous ash test resources but that
can be changed easily. The ash_sysui .pak files are generated in the
Mojo Applications/ash_sysui subdir.

Moving the resources to the correct subdir will help simplify deploying
mash to a Chromebook. The deploy_chrome script can copy
"Mojo Applications/" only that way.

Also update mus_app resource loading to be a bit cleaner.

BUG=601167
==========

[kylechar, 2016-04-08 19:21:29]

https://codereview.chromium.org/1874703003/diff/1/ash/mus/sysui_application.cc
File ash/mus/sysui_application.cc (right):

https://codereview.chromium.org/1874703003/diff/1/ash/mus/sysui_application.c...
ash/mus/sysui_application.cc:248: // TODO(msw): Do not load 'test' resources
(include sys lang; rename paks?).
On 2016/04/08 at 19:10:42, msw wrote:
> nit: maybe move this TODO to BUILD.gn, where it grabs ash_test_*?

Done.

[kylechar, 2016-04-08 19:36:35]

Patchset #2 (id:20001) has been deleted

[sky, 2016-04-08 21:53:45]

https://codereview.chromium.org/1874703003/diff/40001/ash/mus/BUILD.gn
File ash/mus/BUILD.gn (right):

https://codereview.chromium.org/1874703003/diff/40001/ash/mus/BUILD.gn#newcode91
ash/mus/BUILD.gn:91: resource_out_dir =
"$root_out_dir/$mojo_application_subdir/ash_sysui/resources"
Instead of outputting to this location you should should have the "mus" target
list the resources it needs in resources. This way they'll be copied correctly.

https://codereview.chromium.org/1874703003/diff/40001/components/mus/BUILD.gn
File components/mus/BUILD.gn (right):

https://codereview.chromium.org/1874703003/diff/40001/components/mus/BUILD.gn...
components/mus/BUILD.gn:121: resource_out_dir =
"$root_out_dir/$mojo_application_subdir/mus/resources"
Similar comment here.

[kylechar, 2016-04-11 13:16:34]

I've changed //ash/mus resources as requested. I'm less sure about the
//components/mus resource changes due to the how the targets are structured.

https://codereview.chromium.org/1874703003/diff/40001/ash/mus/BUILD.gn
File ash/mus/BUILD.gn (right):

https://codereview.chromium.org/1874703003/diff/40001/ash/mus/BUILD.gn#newcode91
ash/mus/BUILD.gn:91: resource_out_dir =
"$root_out_dir/$mojo_application_subdir/ash_sysui/resources"
On 2016/04/08 at 21:53:45, sky wrote:
> Instead of outputting to this location you should should have the "mus" target
list the resources it needs in resources. This way they'll be copied correctly.

Didn't realize that was a thing. Done. The only thing that seems concerning is
now the //ash/mus:lib target doesn't actually include in the resources it needs,
the //ash/mus target is what has them, so that could cause problems down the
line if someone else includes //ash/mus:lib?

https://codereview.chromium.org/1874703003/diff/40001/components/mus/BUILD.gn
File components/mus/BUILD.gn (right):

https://codereview.chromium.org/1874703003/diff/40001/components/mus/BUILD.gn...
components/mus/BUILD.gn:121: resource_out_dir =
"$root_out_dir/$mojo_application_subdir/mus/resources"
On 2016/04/08 at 21:53:45, sky wrote:
> Similar comment here.

Hmm. So there are two implementations of //components/mus here, depending on
is_android. One is the mojo_native_application and the other is just as a source
set. If I were to move the resources into the mojo_native_application then the
android source_set would likely be broken?

[sky, 2016-04-11 15:00:30]

https://codereview.chromium.org/1874703003/diff/40001/ash/mus/BUILD.gn
File ash/mus/BUILD.gn (right):

https://codereview.chromium.org/1874703003/diff/40001/ash/mus/BUILD.gn#newcode91
ash/mus/BUILD.gn:91: resource_out_dir =
"$root_out_dir/$mojo_application_subdir/ash_sysui/resources"
On 2016/04/11 13:16:33, kylechar wrote:
> On 2016/04/08 at 21:53:45, sky wrote:
> > Instead of outputting to this location you should should have the "mus"
target
> list the resources it needs in resources. This way they'll be copied
correctly.
> 
> Didn't realize that was a thing. Done. The only thing that seems concerning is
> now the //ash/mus:lib target doesn't actually include in the resources it
needs,
> the //ash/mus target is what has them, so that could cause problems down the
> line if someone else includes //ash/mus:lib?

I think that's the common pattern, even for non-mus apps. The resources are
listed in the executable target. If there is a better way where resources can be
listed in any targets, it would be good to change it.

https://codereview.chromium.org/1874703003/diff/40001/components/mus/BUILD.gn
File components/mus/BUILD.gn (right):

https://codereview.chromium.org/1874703003/diff/40001/components/mus/BUILD.gn...
components/mus/BUILD.gn:121: resource_out_dir =
"$root_out_dir/$mojo_application_subdir/mus/resources"
On 2016/04/11 13:16:33, kylechar wrote:
> On 2016/04/08 at 21:53:45, sky wrote:
> > Similar comment here.
> 
> Hmm. So there are two implementations of //components/mus here, depending on
> is_android. One is the mojo_native_application and the other is just as a
source
> set. If I were to move the resources into the mojo_native_application then the
> android source_set would likely be broken?

I don't think mus works well on android at this point. I'm fine with dropping
the android support here entirely.

[kylechar, 2016-04-11 15:33:09]

Description was changed from

==========
Load ash_sysui resources with ResourceLoader.

Create ash_sysui specific .pak files and load them with ResourceLoader.
For now the .pak files are just the previous ash test resources but that
can be changed easily. The ash_sysui .pak files are generated in the
Mojo Applications/ash_sysui subdir.

Moving the resources to the correct subdir will help simplify deploying
mash to a Chromebook. The deploy_chrome script can copy
"Mojo Applications/" only that way.

Also update mus_app resource loading to be a bit cleaner.

BUG=601167
==========

to

==========
Load ash_sysui resources with ResourceLoader.

Create ash_sysui specific .pak files and load them with ResourceLoader.
For now the .pak files are just the previous ash test resources but that
can be changed easily. The ash_sysui .pak files are moved to the
Mojo Applications/ash_sysui subdir.

Moving the resources to the correct subdir will help simplify deploying
mash to a Chromebook. The deploy_chrome script can copy
"Mojo Applications/" only that way.

Also update mus_app resource loading to be a bit cleaner. Remove the
source_set that was built under android as it's unused. Remove the
android_loader.cc/h files which are unused without the target.

BUG=601167
==========

[kylechar, 2016-04-11 15:34:53]

I've removed the android source_set/android_loader.cc/h and updated
//components/mus.

[sky, 2016-04-11 20:48:35]

LGTM

[kylechar, 2016-04-12 13:08:24]

The CQ bit was checked by kylechar@chromium.org

[kylechar, 2016-04-12 13:08:25]

The patchset sent to the CQ was uploaded after l-g-t-m from msw@chromium.org
Link to the patchset: https://codereview.chromium.org/1874703003/#ps80001
(title: "Change //components/mus resources.")

[commit-bot: I haz the power, 2016-04-12 13:08:42]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1874703003/80001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1874703003/80001

[commit-bot: I haz the power, 2016-04-12 13:15:20]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-04-12 13:15:21]

Try jobs failed on following builders:
  chromium_presubmit on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[kylechar, 2016-04-12 13:32:36]

The CQ bit was checked by kylechar@chromium.org

[kylechar, 2016-04-12 13:32:36]

The patchset sent to the CQ was uploaded after l-g-t-m from msw@chromium.org,
sky@chromium.org
Link to the patchset: https://codereview.chromium.org/1874703003/#ps100001
(title: "Rebase.")

[commit-bot: I haz the power, 2016-04-12 13:32:48]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1874703003/100001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1874703003/100001

[commit-bot: I haz the power, 2016-04-12 14:17:37]

Committed patchset #5 (id:100001)

[commit-bot: I haz the power, 2016-04-12 14:19:26]

Description was changed from

==========
Load ash_sysui resources with ResourceLoader.

Create ash_sysui specific .pak files and load them with ResourceLoader.
For now the .pak files are just the previous ash test resources but that
can be changed easily. The ash_sysui .pak files are moved to the
Mojo Applications/ash_sysui subdir.

Moving the resources to the correct subdir will help simplify deploying
mash to a Chromebook. The deploy_chrome script can copy
"Mojo Applications/" only that way.

Also update mus_app resource loading to be a bit cleaner. Remove the
source_set that was built under android as it's unused. Remove the
android_loader.cc/h files which are unused without the target.

BUG=601167
==========

to

==========
Load ash_sysui resources with ResourceLoader.

Create ash_sysui specific .pak files and load them with ResourceLoader.
For now the .pak files are just the previous ash test resources but that
can be changed easily. The ash_sysui .pak files are moved to the
Mojo Applications/ash_sysui subdir.

Moving the resources to the correct subdir will help simplify deploying
mash to a Chromebook. The deploy_chrome script can copy
"Mojo Applications/" only that way.

Also update mus_app resource loading to be a bit cleaner. Remove the
source_set that was built under android as it's unused. Remove the
android_loader.cc/h files which are unused without the target.

BUG=601167

Committed: https://crrev.com/884173bed9487d7f79fedd01476850936df7fd01
Cr-Commit-Position: refs/heads/master@{#386678}
==========

[commit-bot: I haz the power, 2016-04-12 14:19:27]

Patchset 5 (id:??) landed as
https://crrev.com/884173bed9487d7f79fedd01476850936df7fd01
Cr-Commit-Position: refs/heads/master@{#386678}