skia_enable_android_framework_defines in all code, public and private, optional and required.
The bug fixed here can be demonstrated by
$ ninja -C out pdf -v
before and after this CL. Before you won't see the Android defines, afterwards you do. Previously the defines applied only privately to Skia, and only to its non-optional components.
TBR=reed@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2356783002
Review-Url: https://codereview.chromium.org/2356783002
diff --git a/BUILD.gn b/BUILD.gn
index 5544593..c94f3cf 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -49,6 +49,9 @@
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.
@@ -224,11 +227,6 @@
}
}
-optional("android_framework_defines") {
- enabled = skia_enable_android_framework_defines
- public_defines = skia_android_framework_defines
-}
-
optional("fontmgr_android") {
enabled = fontmgr_android_enabled
@@ -392,7 +390,6 @@
configs += skia_library_configs
deps = [
- ":android_framework_defines",
":arm64",
":armv7",
":avx",