From 3312821719a3b30323c93c6babf0a7ce1af7a200 Mon Sep 17 00:00:00 2001
From: Piotr Tworek
Date: Fri, 6 Mar 2015 20:34:18 +0900
Subject: [PATCH] fixup! Merge efl-port POC code into tizen_src
It seems the previous patch for tizen stylesheet generation issue did
not really take care of the problem. The problem was still reproducible
on build server with 80 cores. The root cause seems to be in a fact that
in generic blink we do actually have 2 targets for the autogenerated
files. One generates it, while the other is supposed to build it. Lets
follow that approach.
Change-Id: I35b391ba2674829a4e36e46d6084ef6dc9fd6c5a
Signed-off-by: Piotr Tworek
---
tizen_src/chromium_impl/content/content_efl.gypi | 1 -
tizen_src/chromium_impl/third_party/WebKit/Source/core/core_efl.gypi | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/tizen_src/chromium_impl/content/content_efl.gypi b/tizen_src/chromium_impl/content/content_efl.gypi
index 275e8c4..bfe8721 100644
--- a/tizen_src/chromium_impl/content/content_efl.gypi
+++ b/tizen_src/chromium_impl/content/content_efl.gypi
@@ -22,7 +22,6 @@
],
'external_content_renderer_deps': [
'<(DEPTH)/tizen_src/build/system.gyp:tts',
- '<(DEPTH)/third_party/WebKit/Source/core/core.gyp:webcore_generated',
],
'external_content_gpu_deps': [
'<(DEPTH)/tizen_src/build/system.gyp:evas',
diff --git a/tizen_src/chromium_impl/third_party/WebKit/Source/core/core_efl.gypi b/tizen_src/chromium_impl/third_party/WebKit/Source/core/core_efl.gypi
index 8a2fa51..075d400 100644
--- a/tizen_src/chromium_impl/third_party/WebKit/Source/core/core_efl.gypi
+++ b/tizen_src/chromium_impl/third_party/WebKit/Source/core/core_efl.gypi
@@ -22,6 +22,9 @@
'<(SHARED_INTERMEDIATE_DIR)/TizenUserAgentStyleSheets.h',
'<(SHARED_INTERMEDIATE_DIR)/TizenUserAgentStyleSheetsData.cpp',
],
+ }], # webcore_generated
+
+ ['_target_name=="make_core_generated"', {
'actions': [
{
'action_name': 'TizenUserAgentStyleSheets',
--
2.7.4