Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / ffmpeg / BUILD.gn

diff --git a/src/third_party/ffmpeg/BUILD.gn b/src/third_party/ffmpeg/BUILD.gn
index 9e99baa..cef32d5 100644 (file)
--- a/src/third_party/ffmpeg/BUILD.gn
+++ b/src/third_party/ffmpeg/BUILD.gn
@@ -66,7 +66,7 @@ action("ffmpeg_generate_stubs") {
 
   script = generate_stubs_script
   sources = sig_files
-  source_prereqs = [ extra_header ]
+  inputs = [ extra_header ]
 
   if (is_win) {
     if (build_cpu_arch == "x64") {
@@ -199,7 +199,7 @@ if (build_ffmpegsumo) {
         # We want to be consistent with CrOS and have configured
         # ffmpeg for thumb. Protect yourself from -marm.
         if (is_chromeos) {
-          cflags = [ "-marm" ]
+          cflags += [ "-marm" ]
         }
         cflags += [
           "-mthumb",
@@ -390,8 +390,8 @@ if (is_win) {
   }
 
   group("ffmpeg") {
-    direct_dependent_configs = [ ":ffmpeg_win_dependent_config" ]
-    deps = [
+    public_configs = [ ":ffmpeg_win_dependent_config" ]
+    public_deps = [
       ":ffmpeg_generate_stubs",
       ":ffmpegsumo",
     ]
@@ -418,7 +418,7 @@ if (is_win) {
       ".",
     ]
 
-    direct_dependent_configs = [ ":ffmpeg_posix_dependent_config" ]
+    public_configs = [ ":ffmpeg_posix_dependent_config" ]
     deps = [ ":ffmpeg_generate_stubs", ":ffmpegsumo" ]
   }
 }