From 963c8527b331983a8f8ccb7d11aec2a50a6fcf77 Mon Sep 17 00:00:00 2001 From: oshima Date: Tue, 2 Sep 2014 16:31:34 -0700 Subject: Run athena on chrome There are more work needs to be finished, but this should at least allow us to implement login UI * Added chrome version of ExtensionsDelegate and AppActivity * introduce use_athena gyp flag * disabled features/code path that does not work yet on athena. Filed bugs to keep track of them. BUG=397167 R=mukai@chromium.org, yoz@chromium.org Review URL: https://codereview.chromium.org/514293003 Cr-Commit-Position: refs/heads/master@{#293023} --- chrome/chrome_repack_chrome_100_percent.gypi | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'chrome/chrome_repack_chrome_100_percent.gypi') diff --git a/chrome/chrome_repack_chrome_100_percent.gypi b/chrome/chrome_repack_chrome_100_percent.gypi index 37ec654..f83799d 100644 --- a/chrome/chrome_repack_chrome_100_percent.gypi +++ b/chrome/chrome_repack_chrome_100_percent.gypi @@ -22,6 +22,11 @@ '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak', ], }], + ['use_athena==1', { + 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/athena/resources/athena_resources_100_percent.pak', + ], + }], ['chromeos==1', { 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak', -- cgit v1.1