summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-11 00:06:18 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-11 00:06:18 +0000
commit46c80dce6ea8ed3eaabef34a4b7b7bd564eb24be (patch)
tree47203b7e2a0305503b673b9312233dc116a4db6e /build
parent8a33b058eaca9592fd6fb06f5e55c1734069463b (diff)
downloadchromium_src-46c80dce6ea8ed3eaabef34a4b7b7bd564eb24be.zip
chromium_src-46c80dce6ea8ed3eaabef34a4b7b7bd564eb24be.tar.gz
chromium_src-46c80dce6ea8ed3eaabef34a4b7b7bd564eb24be.tar.bz2
Minimal athena shell main
BUG=362288 Review URL: https://codereview.chromium.org/270763002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269643 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp6
1 files changed, 6 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp
index d3f558f..23da49d 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -225,6 +225,11 @@
'../apps/shell/app_shell.gyp:*',
],
}],
+ ['chromeos==1', {
+ 'dependencies': [
+ '../athena/main/athena_main.gyp:*',
+ ],
+ }],
],
}, # target_name: All
{
@@ -1202,6 +1207,7 @@
['chromeos==1', {
'dependencies': [
'../chromeos/chromeos.gyp:chromeos_unittests',
+ '../athena/main/athena_main.gyp:*',
],
}],
['use_ozone==1', {