AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "[bazel] Unify boolean flags to be enable*"

Browse Source 
This reverts commit 02986aed2a.

Reason for revert: Android roll

Original change's description:
> [bazel] Unify boolean flags to be enable*
>
> I think they read better when it is enable_foo. I have to
> do less double-negation in my head if they are set to false
> then.
>
> Change-Id: I53bc5575c11d489029904965d991abc5a9d0fd89
> Bug: skia:12541
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528838
> Reviewed-by: Ben Wagner <bungeman@google.com>

Bug: skia:12541
Change-Id: I63f827c41ddc8a149cd190179ad099ff8671579a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/529128
Auto-Submit: John Stiles <johnstiles@google.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
This commit is contained in:
John Stiles 2022-04-11 17:40:47 +00:00 committed by SkCQ
parent 02986aed2a
commit d459e5c70f
3 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.bazelrc
View File

@ -20,19 +20,18 @@ build --flag_alias=include_fontmgr=//bazel/common_config_settings:include_fontmg
build --flag_alias=shaper_backend=//bazel/common_config_settings:shaper_backend
build --flag_alias=with_gl_standard=//bazel/common_config_settings:with_gl_standard
build --flag_alias=disable_effect_serialization=no//bazel/common_config_settings:enable_effect_serialization
build --flag_alias=enable_effect_serialization=//bazel/common_config_settings:enable_effect_serialization
build --flag_alias=disable_skslc=no//bazel/common_config_settings:enable_skslc
build --flag_alias=enable_skslc=//bazel/common_config_settings:enable_skslc
build --flag_alias=disable_sksl_tracing=no//bazel/common_config_settings:enable_sksl_tracing
build --flag_alias=enable_sksl_tracing=//bazel/common_config_settings:enable_sksl_tracing
build --flag_alias=disable_tracing=no//bazel/common_config_settings:enable_tracing
build --flag_alias=enable_tracing=//bazel/common_config_settings:enable_tracing
build --flag_alias=disable_vma=no//bazel/common_config_settings:use_vulkan_memory_allocator
build --flag_alias=enable_vma=//bazel/common_config_settings:use_vulkan_memory_allocator
build --flag_alias=with_icu=//bazel/common_config_settings:use_icu
build --flag_alias=with_no_icu=no//bazel/common_config_settings:use_icu
build --flag_alias=disable_tracing=//bazel/common_config_settings:disable_tracing
build --flag_alias=enable_tracing=no//bazel/common_config_settings:disable_tracing
build --flag_alias=disable_effect_serialization=//bazel/common_config_settings:disable_effect_serialization
build --flag_alias=enable_effect_serialization=no//bazel/common_config_settings:disable_effect_serialization
build --flag_alias=enable_vma=//bazel/common_config_settings:use_vulkan_memory_allocator
build --flag_alias=disable_vma=no//bazel/common_config_settings:use_vulkan_memory_allocator
build --flag_alias=enable_skslc=//bazel/common_config_settings:enable_skslc
build --flag_alias=disable_skslc=no//bazel/common_config_settings:enable_skslc
build --flag_alias=enable_sksl_tracing=//bazel/common_config_settings:enable_sksl_tracing
build --flag_alias=disable_sksl_tracing=no//bazel/common_config_settings:enable_sksl_tracing
# CanvasKit flags
build --flag_alias=ck_enable_fonts=//modules/canvaskit:enable_fonts
build --flag_alias=ck_disable_fonts=no//modules/canvaskit:enable_fonts

4
bazel/BUILD.bazel
View File

@ -14,10 +14,10 @@ GENERAL_DEFINES = [
"SK_RELEASE",
],
}) + select({
"//bazel/common_config_settings:enable_tracing_false": ["SK_DISABLE_TRACING"],
"//bazel/common_config_settings:disable_tracing_true": ["SK_DISABLE_TRACING"],
"//conditions:default": [],
}) + select({
"//bazel/common_config_settings:enable_effect_serialization_false": ["SK_DISABLE_EFFECT_DESERIALIZATION"],
"//bazel/common_config_settings:disable_effect_serialization_true": ["SK_DISABLE_EFFECT_DESERIALIZATION"],
"//conditions:default": [],
}) + select({
"//bazel/common_config_settings:is_skia_dev_build_true": [

25
bazel/common_config_settings/BUILD.bazel
View File

@ -183,8 +183,18 @@ string_flag_with_values(
)
bool_flag(
default = True,
flag_name = "enable_effect_serialization",
default = False,
flag_name = "use_icu",
)
bool_flag(
default = False,
flag_name = "disable_tracing",
)
bool_flag(
default = False,
flag_name = "disable_effect_serialization",
)
bool_flag(
@ -197,22 +207,11 @@ bool_flag(
flag_name = "enable_sksl_tracing",
)
bool_flag(
# See SkTraceVentCommon.h for more on this type of tracing.
default = True,
flag_name = "enable_tracing",
)
bool_flag(
default = False,
flag_name = "is_skia_dev_build",
)
bool_flag(
default = False,
flag_name = "use_icu",
)
bool_flag(
default = True,
flag_name = "use_vulkan_memory_allocator",