Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Unified Diff: public.bzl

Issue 2186373002: Update public.bzl based on internal cl/128616707. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: public.bzl
diff --git a/public.bzl b/public.bzl
index a725c0e35c147db97d8cb08a97f0c3fb2f2b59be..128f853673cdd0e5155240236b72710541700fa5 100644
--- a/public.bzl
+++ b/public.bzl
@@ -55,13 +55,20 @@ def skia_glob(srcs):
## PRIVATE_HDRS
################################################################################
-PRIVATE_HDRS_LIST = [
- "include/private/**/*",
- "src/utils/SkWhitelistChecksums.inc",
+PRIVATE_HDRS_INCLUDE_LIST = [
+ "include/private/**/*.h",
+ "src/**/*.inc",
]
PRIVATE_HDRS = struct(
- include = PRIVATE_HDRS_LIST,
+ include = PRIVATE_HDRS_INCLUDE_LIST,
+)
+
+ALL_HDRS = struct(
+ include = [
+ "src/**/*.h",
+ "include/**/*.h",
+ ],
)
################################################################################
@@ -80,7 +87,10 @@ BASE_SRCS_ALL = struct(
"third_party/ktx/*.cpp",
"third_party/ktx/*.h",
],
- exclude = PRIVATE_HDRS_LIST + [
+ # Note: PRIVATE_HDRS_INCLUDE_LIST is excluded from BASE_SRCS_ALL here
+ # because they are required to appear in srcs for some rules but hdrs for
+ # other rules. See internal cl/119566959.
+ exclude = PRIVATE_HDRS_INCLUDE_LIST + [
# Exclude platform-dependent files.
"src/android/*",
"src/codec/*",
@@ -121,7 +131,6 @@ BASE_SRCS_ALL = struct(
"src/utils/SkLua*",
# Not used.
- "src/animator/**/*",
"src/views/**/*",
# Currently exclude all vulkan specific files
@@ -320,7 +329,7 @@ BASE_HDRS = struct(
include = [
"include/**/*.h",
],
- exclude = PRIVATE_HDRS_LIST + [
+ exclude = PRIVATE_HDRS_INCLUDE_LIST + [
# Not used.
"include/animator/**/*",
"include/views/**/*",
@@ -395,22 +404,34 @@ DM_SRCS_ALL = struct(
"gm/*.h",
"tests/*.cpp",
"tests/*.h",
+ "tools/BigPathBench.inc",
"tools/CrashHandler.cpp",
"tools/CrashHandler.h",
"tools/ProcStats.cpp",
"tools/ProcStats.h",
"tools/Resources.cpp",
"tools/Resources.h",
+ "tools/SkJSONCPP.h",
+ "tools/UrlDataManager.cpp",
+ "tools/UrlDataManager.h",
+ "tools/debugger/*.cpp",
+ "tools/debugger/*.h",
"tools/flags/*.cpp",
"tools/flags/*.h",
"tools/gpu/**/*.cpp",
"tools/gpu/**/*.h",
"tools/picture_utils.cpp",
+ "tools/picture_utils.h",
"tools/random_parse_path.cpp",
"tools/random_parse_path.h",
"tools/sk_tool_utils.cpp",
"tools/sk_tool_utils.h",
+ "tools/sk_tool_utils_flags.h",
"tools/sk_tool_utils_font.cpp",
+ "tools/test_font_monospace.inc",
+ "tools/test_font_sans_serif.inc",
+ "tools/test_font_serif.inc",
+ "tools/test_font_index.inc",
"tools/timer/*.cpp",
"tools/timer/*.h",
],
@@ -471,9 +492,9 @@ DM_INCLUDES = [
"src/pathops",
"src/pipe/utils",
"src/ports",
- "tools/debugger",
"tests",
"tools",
+ "tools/debugger",
"tools/flags",
"tools/gpu",
"tools/timer",
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698