From 48c84de20dc26c64b83a9104667eb959d40d2b3c Mon Sep 17 00:00:00 2001
From: Chandan Padhi <c.padhi@samsung.com>
Date: Tue, 16 Apr 2019 06:27:13 -0700
Subject: [PATCH] [M73 Dev][EFL] Fix errors to generate ninja files

This commit fixes gn files to generate ninja files for desktop build.

Change-Id: Ie27e41a3eca53cdc6ac4d4a814a3bd73a7d02623
Signed-off-by: Chandan Padhi <c.padhi@samsung.com>
---
 third_party/angle/BUILD.gn            | 34 ++++++++++++++++++----------------
 third_party/libaom/options.gni        |  4 ++--
 tizen_src/chromium_impl/ui/ui_efl.gni |  4 +---
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/third_party/angle/BUILD.gn b/third_party/angle/BUILD.gn
index b2440d1..7909ff3 100644
--- a/third_party/angle/BUILD.gn
+++ b/third_party/angle/BUILD.gn
@@ -936,25 +936,27 @@ config("angle_feature_support_config") {
   }
 }
 
-angle_shared_library("libfeature_support${angle_libs_suffix}") {
-  if (is_android) {
-    libs = [ "log" ]
-  }
+if (!use_efl) {
+  angle_shared_library("libfeature_support${angle_libs_suffix}") {
+    if (is_android) {
+      libs = [ "log" ]
+    }
 
-  public_configs += [
-    ":angle_feature_support_config",
-    "third_party/jsoncpp:jsoncpp_config",
-  ]
+    public_configs += [
+      ":angle_feature_support_config",
+      "third_party/jsoncpp:jsoncpp_config",
+    ]
 
-  sources = [
-    "src/feature_support_util/feature_support_util.cpp",
-    "src/feature_support_util/feature_support_util.h",
-  ]
+    sources = [
+      "src/feature_support_util/feature_support_util.cpp",
+      "src/feature_support_util/feature_support_util.h",
+    ]
 
-  deps = [
-    ":angle_gpu_info_util",
-    "third_party/jsoncpp:jsoncpp",
-  ]
+    deps = [
+      ":angle_gpu_info_util",
+      "third_party/jsoncpp:jsoncpp",
+    ]
+  }
 }
 
 if (!is_component_build && is_android && symbol_level != 0) {
diff --git a/third_party/libaom/options.gni b/third_party/libaom/options.gni
index 6d01c37..2cdd5c0 100644
--- a/third_party/libaom/options.gni
+++ b/third_party/libaom/options.gni
@@ -2,6 +2,6 @@ import("//build/config/gclient_args.gni")
 
 declare_args() {
   # Enable decoding AV1 video files.
-  enable_av1_decoder =
-      !is_android && !is_ios && (current_cpu == "x86" || current_cpu == "x64")
+  enable_av1_decoder = !is_android && !is_ios && !use_efl &&
+                       (current_cpu == "x86" || current_cpu == "x64")
 }
diff --git a/tizen_src/chromium_impl/ui/ui_efl.gni b/tizen_src/chromium_impl/ui/ui_efl.gni
index 8fe34e6..7395b2a 100644
--- a/tizen_src/chromium_impl/ui/ui_efl.gni
+++ b/tizen_src/chromium_impl/ui/ui_efl.gni
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("ui_efl_injections.gni")
 import("//tizen_src/build/config/tizen_features.gni")
+import("ui_efl_injections.gni")
 
 external_ui_base_configs = [
   "//tizen_src/build:elementary",
@@ -98,8 +98,6 @@ if (wayland_bringup) {
 # For //ui/base target
 external_ui_base_includes = [ "//third_party/mojo/src/" ]
 external_ui_base_sources = [
-  "//ui/base/cursor/cursor.h",
-  "//ui/base/cursor/cursor.cc",
   "//ui/base/nine_image_painter_factory.h",
   "//tizen_src/chromium_impl/ui/base/resource/resource_bundle_efl.cc",
   "//tizen_src/chromium_impl/ui/base/clipboard/clipboard_efl.cc",
-- 
2.7.4