diff options
| author | Kevin Lubick <kjlubick@google.com> | 2023-12-12 16:17:19 -0500 |
|---|---|---|
| committer | Kevin Lubick <kjlubick@google.com> | 2023-12-12 21:44:38 +0000 |
| commit | 3a3475d12f220b795821eabae517ab7cb6f12c9f (patch) | |
| tree | c1e4f66d8643b9e6685ad1d524ccefda40b46349 | |
| parent | e7e8a521abc8803b1f54642997eb592485627081 (diff) | |
| download | skia-3a3475d12f220b795821eabae517ab7cb6f12c9f.tar.gz | |
Fix defines for G3 android build
There are 3 android builds, so we need to represent the defines
more granularly. See also http://cl/585658282
Bug: b/305780908
Change-Id: I634d91f0fe11dca251e31fab58eedd38098a3bb4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/789217
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: Leandro Lovisolo <lovisolo@google.com>
| -rw-r--r-- | public.bzl | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/public.bzl b/public.bzl index 8c44cb46e5..05d501b4f7 100644 --- a/public.bzl +++ b/public.bzl @@ -2250,17 +2250,25 @@ UNIX_DEFINES = [ "SK_FONTMGR_FREETYPE_EMPTY_AVAILABLE", "SK_FONTMGR_FONTCONFIG_AVAILABLE", ] -ANDROID_DEFINES = [ +ANDROID_BASE_DEFINES = [ "SK_BUILD_FOR_ANDROID", - "SK_CODEC_DECODES_PNG", - "SK_CODEC_DECODES_WEBP", "SK_GL", - "SK_CODEC_DECODES_JPEG", +] +ANDROID_FONT_DEFINES = [ "SK_FONTMGR_ANDROID_AVAILABLE", "SK_FONTMGR_FREETYPE_DIRECTORY_AVAILABLE", "SK_FONTMGR_FREETYPE_EMPTY_AVAILABLE", "SK_FONTMGR_FONTCONFIG_AVAILABLE", ] +ANDROID_CODEC_DEFINES = [ + "SK_CODEC_DECODES_PNG", + "SK_CODEC_DECODES_WEBP", + "SK_CODEC_DECODES_JPEG", +] + +# TODO(kjlubick) Delete these once we use the more granular versions +ANDROID_DEFINES = ANDROID_BASE_DEFINES + ANDROID_FONT_DEFINES + ANDROID_CODEC_DEFINES +ANDROID_NO_CODECS_DEFINES = ANDROID_BASE_DEFINES IOS_DEFINES = [ "SK_BUILD_FOR_IOS", "SK_CODEC_DECODES_JPEG", @@ -2292,10 +2300,6 @@ MACOS_DEFINES = [ "SK_CODEC_DECODES_JPEG", "SK_FONTMGR_CORETEXT_AVAILABLE", ] -ANDROID_NO_CODECS_DEFINES = [ - "SK_BUILD_FOR_ANDROID", - "SK_GL", -] ################################################################################ ## sksg_lib |