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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: public.bzl

Issue 2090643002: Revert of Bring back compiling third_party/libpng in public.bzl (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 ################################################################################ 1 ################################################################################
2 # Skylark macros 2 # Skylark macros
3 ################################################################################ 3 ################################################################################
4 4
5 is_bazel = not hasattr(native, "genmpm") 5 is_bazel = not hasattr(native, "genmpm")
6 6
7 def portable_select(select_dict, bazel_condition, default_condition): 7 def portable_select(select_dict, bazel_condition, default_condition):
8 """Replaces select() with a Bazel-friendly wrapper. 8 """Replaces select() with a Bazel-friendly wrapper.
9 9
10 Args: 10 Args:
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 BASE_SRCS_ALL = struct( 72 BASE_SRCS_ALL = struct(
73 include = [ 73 include = [
74 "src/**/*.h", 74 "src/**/*.h",
75 "src/**/*.cpp", 75 "src/**/*.cpp",
76 76
77 # Third Party 77 # Third Party
78 "third_party/etc1/*.cpp", 78 "third_party/etc1/*.cpp",
79 "third_party/etc1/*.h", 79 "third_party/etc1/*.h",
80 "third_party/ktx/*.cpp", 80 "third_party/ktx/*.cpp",
81 "third_party/ktx/*.h", 81 "third_party/ktx/*.h",
82
83 "third_party/libpng/*.c",
84 "third_party/libpng/*.h",
85 ], 82 ],
86 exclude = PRIVATE_HDRS_LIST + [ 83 exclude = PRIVATE_HDRS_LIST + [
87 # Exclude platform-dependent files. 84 # Exclude platform-dependent files.
88 "src/android/*", 85 "src/android/*",
89 "src/codec/*", 86 "src/codec/*",
90 "src/device/xps/*", # Windows-only. Move to ports? 87 "src/device/xps/*", # Windows-only. Move to ports?
91 "src/doc/*_XPS.cpp", # Windows-only. Move to ports? 88 "src/doc/*_XPS.cpp", # Windows-only. Move to ports?
92 "src/fonts/SkFontMgr_fontconfig.cpp", 89 "src/fonts/SkFontMgr_fontconfig.cpp",
93 "src/gpu/gl/android/*", 90 "src/gpu/gl/android/*",
94 "src/gpu/gl/egl/*", 91 "src/gpu/gl/egl/*",
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 "src/gpu", 376 "src/gpu",
380 "src/image", 377 "src/image",
381 "src/lazy", 378 "src/lazy",
382 "src/opts", 379 "src/opts",
383 "src/ports", 380 "src/ports",
384 "src/pdf", 381 "src/pdf",
385 "src/sfnt", 382 "src/sfnt",
386 "src/utils", 383 "src/utils",
387 "third_party/etc1", 384 "third_party/etc1",
388 "third_party/ktx", 385 "third_party/ktx",
389 "third_party/libpng",
390 ] 386 ]
391 387
392 ################################################################################ 388 ################################################################################
393 ## DM_SRCS 389 ## DM_SRCS
394 ################################################################################ 390 ################################################################################
395 391
396 DM_SRCS_ALL = struct( 392 DM_SRCS_ALL = struct(
397 include = [ 393 include = [
398 "dm/*.cpp", 394 "dm/*.cpp",
399 "dm/*.h", 395 "dm/*.h",
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 540
545 COPTS_IOS = [] 541 COPTS_IOS = []
546 542
547 COPTS_ALL = [] 543 COPTS_ALL = []
548 544
549 ################################################################################ 545 ################################################################################
550 ## DEFINES 546 ## DEFINES
551 ################################################################################ 547 ################################################################################
552 548
553 DEFINES_UNIX = [ 549 DEFINES_UNIX = [
550 "PNG_SKIP_SETJMP_CHECK",
554 "SK_BUILD_FOR_UNIX", 551 "SK_BUILD_FOR_UNIX",
555 "SK_SAMPLES_FOR_X", 552 "SK_SAMPLES_FOR_X",
556 "SK_SFNTLY_SUBSETTER", 553 "SK_SFNTLY_SUBSETTER",
557 "SK_CODEC_DECODES_RAW", 554 "SK_CODEC_DECODES_RAW",
558 "SK_HAS_GIF_LIBRARY", 555 "SK_HAS_GIF_LIBRARY",
559 "SK_HAS_JPEG_LIBRARY", 556 "SK_HAS_JPEG_LIBRARY",
557 "SK_HAS_PNG_LIBRARY",
560 "SK_HAS_WEBP_LIBRARY", 558 "SK_HAS_WEBP_LIBRARY",
561 "SK_HAS_PNG_LIBRARY",
562 "PNG_ARM_NEON_OPT=0",
563 "PNG_INTEL_SSE_OPT=0",
564 "PNG_ARM_NEON_IMPLEMENTATION=0",
565 ] 559 ]
566 560
567 DEFINES_ANDROID = [ 561 DEFINES_ANDROID = [
568 "SK_BUILD_FOR_ANDROID", 562 "SK_BUILD_FOR_ANDROID",
569 "SK_CODEC_DECODES_RAW", 563 "SK_CODEC_DECODES_RAW",
570 "SK_HAS_GIF_LIBRARY", 564 "SK_HAS_GIF_LIBRARY",
571 "SK_HAS_JPEG_LIBRARY", 565 "SK_HAS_JPEG_LIBRARY",
566 "SK_HAS_PNG_LIBRARY",
572 "SK_HAS_WEBP_LIBRARY", 567 "SK_HAS_WEBP_LIBRARY",
573 "SK_HAS_PNG_LIBRARY",
574 "PNG_ARM_NEON_OPT=0",
575 "PNG_INTEL_SSE_OPT=0",
576 "PNG_ARM_NEON_IMPLEMENTATION=0",
577 ] 568 ]
578 569
579 DEFINES_IOS = [ 570 DEFINES_IOS = [
580 "SK_BUILD_FOR_IOS", 571 "SK_BUILD_FOR_IOS",
581 "SK_BUILD_NO_OPTS", 572 "SK_BUILD_NO_OPTS",
582 "SK_IGNORE_ETC1_SUPPORT", 573 "SK_IGNORE_ETC1_SUPPORT",
583 "SKNX_NO_SIMD", 574 "SKNX_NO_SIMD",
584 ] 575 ]
585 576
586 DEFINES_ALL = [ 577 DEFINES_ALL = [
(...skipping 24 matching lines...) Expand all
611 602
612 LINKOPTS_ANDROID = [ 603 LINKOPTS_ANDROID = [
613 "-lEGL", 604 "-lEGL",
614 ] 605 ]
615 606
616 LINKOPTS_IOS = [] 607 LINKOPTS_IOS = []
617 608
618 LINKOPTS_ALL = [ 609 LINKOPTS_ALL = [
619 "-ldl", 610 "-ldl",
620 ] 611 ]
OLDNEW
« 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