From 9be81c588afc913f5214d78608fecafeef8bc160 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Mon, 24 Mar 2014 18:49:30 +0100 Subject: Get rid of GTK dependencies Build with aura by default and remove GTK related code. This patch introduces a mechanism for setting gyp build configuration variables using a GYP_CONFIG and adds a desktop_linux.pri configuration for this target. Change-Id: I6b044ba52ebb20c187572669af94a6fc280b0412 Reviewed-by: Jocelyn Turcotte --- src/core/resources/repack_resources.gypi | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/core/resources') diff --git a/src/core/resources/repack_resources.gypi b/src/core/resources/repack_resources.gypi index 49bd52b8e..5a955cccc 100644 --- a/src/core/resources/repack_resources.gypi +++ b/src/core/resources/repack_resources.gypi @@ -8,8 +8,11 @@ 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', -# FIXME: we'll probably want those as well -# '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', ], }, 'inputs': [ -- cgit v1.2.3