fixup! [Tizen] Support HW key event 75/159875/11
authorYoungsoo Choi <kenshin.choi@samsung.com>
Mon, 13 Nov 2017 10:44:32 +0000 (19:44 +0900)
committerSungsik Han <ss440.han@samsung.com>
Tue, 14 Nov 2017 05:50:23 +0000 (05:50 +0000)
The efl-extension is not supportive on desktop.

1. no package found
>> Package efl-extension was not found in the pkg-config search path.
>> Perhaps you should add the directory containing `efl-extension.pc'
>> to the PKG_CONFIG_PATH environment variable
>> No package 'efl-extension' found

2. not declared function
>> error: ‘HWBackKeyCallback’ was not declared in this scope

Change-Id: I252aa5368723c82d13ee567a60b83b8f41241d3c
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>
atom/browser/native_window_efl.cc
efl/build/system.gyp

index 4968f0b..209e49c 100644 (file)
@@ -101,10 +101,12 @@ NativeWindowEfl::NativeWindowEfl(
 }
 
 NativeWindowEfl::~NativeWindowEfl() {
+#if defined(OS_TIZEN)
   eext_object_event_callback_del(web_view_, EEXT_CALLBACK_BACK,
       &HWBackKeyCallback);
   eext_object_event_callback_del(web_view_, EEXT_CALLBACK_MORE,
       &HWBackKeyCallback);
+#endif
 }
 
 #if defined(OS_TIZEN_TV_PRODUCT)
index df2852f..b35dd83 100644 (file)
     {
       'target_name': 'efl-extension',
       'type': 'none',
-      'direct_dependent_settings': {
-        'cflags': [
-          '<!@(<(pkg-config) --cflags efl-extension)',
-        ],
-      },
-      'link_settings': {
-        'ldflags': [
-          '<!@(<(pkg-config) --libs-only-L --libs-only-other efl-extension)',
-        ],
-        'libraries': [
-          '<!@(<(pkg-config) --libs-only-l efl-extension)',
-        ],
-      },
+      'conditions': [
+        ['is_tizen==1', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags efl-extension)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other efl-extension)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l efl-extension)',
+            ],
+          },
+        }], # is_tizen==1
+      ],
     }, # efl-extension
     {
       'target_name': 'vd-win-util',
               '<!@(pkg-config --libs-only-l ecore-wayland vd-win-util)',
             ],
           },
-        }], # building_for_tizen_tv==1
+        }], # tizen_product_tv==1
       ],
     }, # vd-win-util
   ],