skia_enable_android_framework_defines in all code, public and private, optional and required.

BUILD.gn

 # Copyright 2016 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("gn/shared_sources.gni")
 
 declare_args() {
   skia_enable_tools = !is_fuchsia && !is_component_build
 
@@ skipping 31 matching lines @@
   "include/xml",
 ]
 
 # Skia public API, generally provided by :skia.
 config("skia_public") {
   include_dirs = skia_public_includes
   defines = [ "SKIA_DLL" ]
   if (is_linux) {
     defines += [ "SK_SAMPLES_FOR_X" ]
   }
+  if (skia_enable_android_framework_defines) {
+    defines += skia_android_framework_defines
+  }
 }
 
 # Skia internal APIs, used by Skia itself and a few test tools.
 config("skia_private") {
   visibility = [ ":*" ]
 
   include_dirs = [
     "include/private",
     "src/c",
     "src/codec",
@@ skipping 155 matching lines @@
                                "sources_when_disabled",
                              ])
       if (defined(invoker.sources_when_disabled)) {
         sources = invoker.sources_when_disabled
       }
       configs += skia_library_configs
     }
   }
 }
 
-optional("android_framework_defines") {
-  enabled = skia_enable_android_framework_defines
-  public_defines = skia_android_framework_defines
-}
-
 optional("fontmgr_android") {
   enabled = fontmgr_android_enabled
 
   deps = [
     "//third_party/expat",
     "//third_party/freetype2",
   ]
   sources = [
     "src/ports/SkFontMgr_android.cpp",
     "src/ports/SkFontMgr_android_factory.cpp",
@@ skipping 143 matching lines @@
     "src/xml/SkXMLParser.cpp",
     "src/xml/SkXMLWriter.cpp",
   ]
 }
 
 component("skia") {
   public_configs = [ ":skia_public" ]
   configs += skia_library_configs
 
   deps = [
-    ":android_framework_defines",
     ":arm64",
     ":armv7",
     ":avx",
     ":crc32",
     ":dsp",
     ":fontmgr_android",
     ":fontmgr_custom",
     ":fontmgr_fontconfig",
     ":fontmgr_fuchsia",
     ":gif",
@@ skipping 477 matching lines @@
       "tools/get_images_from_skps.cpp",
     ]
     deps = [
       ":flags",
       ":skia",
       "//third_party/jsoncpp",
     ]
     testonly = true
   }
 }