fixup! Fix for Tizen 10 TV Build

This patch fixes Desktop Build Errors introduced by the parent patch

Change-Id: I651fcd7c7fbd570a33b0c4db92fd872cb131244f
Signed-off-by: Sumant Chaudhary <sumant.c@samsung.com>

diff --git a/base/allocator/partition_allocator/src/partition_alloc/BUILD.gn b/base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
index dacfc4a97c2563bb3d21488640460ea1fb388e3f..4a7825b66e560cbcec5c85d87e65cee6ddaf4f1e 100644 (file)
--- a/base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
+++ b/base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
@@ -10,6 +10,9 @@ import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
 import("//build/config/logging.gni")
 import("../../partition_alloc.gni")
+if (use_efl) {
+  import("//tizen_src/build/config/tizen_features.gni")
+}
 
 # Add partition_alloc.gni and import it for partition_alloc configs.
 

diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index 5dfcb08a409cec1e90914ddeae19f4302a1f1f93..6409c54a39bd3f179baa65c98c36a074c22fb836 100644 (file)
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -31,13 +31,13 @@
 #include "crypto/nss_crypto_module_delegate.h"
 #include "crypto/nss_util_internal.h"
 
-#if BUILDFLAG(IS_TIZEN)
+#if BUILDFLAG(IS_EFL)
 #include "chromium_impl/build/tizen_version.h"
+#endif
 #if BUILDFLAG(IS_TIZEN_TV)
 #include <vconf/vconf.h>
 #include "base/files/file_enumerator.h"
 #endif
-#endif
 
 namespace crypto {