From cfc4f44aebdd560c600991ad900a4f07c3958c8f Mon Sep 17 00:00:00 2001
From: Mike Klein <mtklein@chromium.org>
Date: Wed, 26 Oct 2016 17:19:03 -0400
Subject: gypi -> gni: core, effects, android framework defines

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4023

Change-Id: I29a26c1716a319156a34a64999756ed7dba1e603
Reviewed-on: https://skia-review.googlesource.com/4023
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
---
 gn/shared_sources.gni | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

(limited to 'gn/shared_sources.gni')

diff --git a/gn/shared_sources.gni b/gn/shared_sources.gni
index 067c1ede2c..0796095212 100644
--- a/gn/shared_sources.gni
+++ b/gn/shared_sources.gni
@@ -10,29 +10,6 @@
 _path_to_include = get_path_info("../include", "abspath")
 _path_to_src = get_path_info("../src", "abspath")
 
-# Core.
-_core_gypi = exec_script("gypi_to_gn.py",
-                         [
-                           rebase_path("../gyp/core.gypi"),
-                           "--replace=<(skia_include_path)=$_path_to_include",
-                           "--replace=<(skia_src_path)=$_path_to_src",
-                         ],
-                         "scope",
-                         [ "../gyp/core.gypi" ])
-skia_core_sources = _core_gypi.sources
-
-# Effects.
-_effects_gypi =
-    exec_script("gypi_to_gn.py",
-                [
-                  rebase_path("../gyp/effects.gypi"),
-                  "--replace=<(skia_include_path)=$_path_to_include",
-                  "--replace=<(skia_src_path)=$_path_to_src",
-                ],
-                "scope",
-                [ "../gyp/effects.gypi" ])
-skia_effects_sources = _effects_gypi.sources
-
 # GPU.
 _gpu_gypi = exec_script("gypi_to_gn.py",
                         [
@@ -58,7 +35,8 @@ skia_opts = exec_script("gypi_to_gn.py",
                         ],
                         "scope",
                         [ "../gyp/opts.gypi" ])
-
+import("core.gni")
+import("effects.gni")
 import("pdf.gni")
 import("sksl.gni")
 import("utils.gni")
@@ -66,12 +44,3 @@ import("utils.gni")
 # Skia Chromium defines. These flags will be defined in chromium If these
 # become 'permanent', they should be moved into Chrome's skia build file.
 skia_for_chromium_defines = [ "SK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS" ]
-
-_android_framework_defines =
-    exec_script(
-        "gypi_to_gn.py",
-        [ rebase_path("../gyp/skia_for_android_framework_defines.gypi") ],
-        "scope",
-        [ "../gyp/core.gypi" ])
-skia_android_framework_defines =
-    _android_framework_defines.skia_for_android_framework_defines
-- 
cgit v1.2.3