fixup! Make text selection feature available on desktop builds.

The original patch [1] had one problem:

No matter if one makes a debug or release build,
the value passed to GYP was the same, e.g.:

"$ build_desktop.sh --debug"

... was going to pass "-Dedje_dir=out.x64/Debug" to ninja,
regardless of the build configuration (Release or Debug), as show below.

$ grep -nHR edje_dir out.x64 --include=*.ninja
/out.x64/Debug/obj/content/content_common.ninja:
  '-DEDJE_DIR="/path>/out.x64/Debug/resources"'
/out.x64/Release/obj/content/content_common.ninja:
  '-DEDJE_DIR="/path>/out.x64/Debug/resources"'

See "Debug" in both ninja files.

To fix that, patch passes only the generic "out" directory to GYP,
and yields to GYP the responsibility to identify the build configuration.

"out" will allow us to use the logic to unify more codepaths,
including LOCALE_DIR.

[1] http://165.213.202.130/gerrit/#/c/84154/
Reviewed by: Janusz Majnert, SeungSeop Park

Change-Id: I6504ddb14ba4ee770701d61e26b28a108be68777
Signed-off-by: Antonio Gomes <a1.gomes@samsung.com>

diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh
index 3e8e466..5019d6d 100755 (executable)
--- a/tizen_src/build/common.sh
+++ b/tizen_src/build/common.sh
@@ -136,7 +136,7 @@ function hostGypChromiumEfl() {
     ${TOPDIR}/tizen_src/build/gyp_chromiumefl.sh \
       $XWALK_ARG \
       $COMPONENT_ARG \
-      -Dedje_dir="out.$(getHostArch)/${BUILD_SUBDIRECTORY}/resources" \
+      -Doutdir="$TOPDIR/out.$(getHostArch)" \
       $@
   fi
 }

diff --git a/tizen_src/chromium_impl/content/content_common_efl.gypi b/tizen_src/chromium_impl/content/content_common_efl.gypi
index 1c81d02..08eec3b 100644 (file)
--- a/tizen_src/chromium_impl/content/content_common_efl.gypi
+++ b/tizen_src/chromium_impl/content/content_common_efl.gypi
@@ -6,7 +6,6 @@
   'defines': [
     'DATA_DIR="<(data_dir)"',
     'EXE_DIR="<(exe_dir)"',
-    'EDJE_DIR="<(edje_dir)"',
     'LOCALE_DIR="<(locale_dir)"',
   ],
   'sources': [
@@ -23,11 +22,27 @@
   ],
   'conditions': [
     ['building_for_tizen==1', {
+      'defines': [
+        'EDJE_DIR="<(edje_dir)"',
+      ],
       'sources': [
         'common/tts_messages_efl.h',
         'common/tts_utterance_request_efl.cc',
         'common/tts_utterance_request_efl.h',
       ],
+    } , {
+      'configurations': {
+        'Release': {
+          'defines': [
+            'EDJE_DIR="<(outdir)/Release/resources"',
+          ],
+        },
+        'Debug': {
+          'defines': [
+            'EDJE_DIR="<(outdir)/Debug/resources"',
+          ],
+        },
+      },
     }], # building_for_tizen
     # TODO: Get gpu_memory_buffer_impl_efl working with M42
     ['building_for_tizen==1 and ewk_bringup!=1', {