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

Side by Side Diff: public.bzl

Issue 2044703006: Bring back compiling third_party/libpng in public.bzl (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Don't mess with iOS 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",
82 ], 85 ],
83 exclude = PRIVATE_HDRS_LIST + [ 86 exclude = PRIVATE_HDRS_LIST + [
84 # Exclude platform-dependent files. 87 # Exclude platform-dependent files.
85 "src/android/*", 88 "src/android/*",
86 "src/codec/*", 89 "src/codec/*",
87 "src/device/xps/*", # Windows-only. Move to ports? 90 "src/device/xps/*", # Windows-only. Move to ports?
88 "src/doc/*_XPS.cpp", # Windows-only. Move to ports? 91 "src/doc/*_XPS.cpp", # Windows-only. Move to ports?
89 "src/fonts/SkFontMgr_fontconfig.cpp", 92 "src/fonts/SkFontMgr_fontconfig.cpp",
90 "src/gpu/gl/android/*", 93 "src/gpu/gl/android/*",
91 "src/gpu/gl/egl/*", 94 "src/gpu/gl/egl/*",
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 "src/gpu", 379 "src/gpu",
377 "src/image", 380 "src/image",
378 "src/lazy", 381 "src/lazy",
379 "src/opts", 382 "src/opts",
380 "src/ports", 383 "src/ports",
381 "src/pdf", 384 "src/pdf",
382 "src/sfnt", 385 "src/sfnt",
383 "src/utils", 386 "src/utils",
384 "third_party/etc1", 387 "third_party/etc1",
385 "third_party/ktx", 388 "third_party/ktx",
389 "third_party/libpng",
386 ] 390 ]
387 391
388 ################################################################################ 392 ################################################################################
389 ## DM_SRCS 393 ## DM_SRCS
390 ################################################################################ 394 ################################################################################
391 395
392 DM_SRCS_ALL = struct( 396 DM_SRCS_ALL = struct(
393 include = [ 397 include = [
394 "dm/*.cpp", 398 "dm/*.cpp",
395 "dm/*.h", 399 "dm/*.h",
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 544
541 COPTS_IOS = [] 545 COPTS_IOS = []
542 546
543 COPTS_ALL = [] 547 COPTS_ALL = []
544 548
545 ################################################################################ 549 ################################################################################
546 ## DEFINES 550 ## DEFINES
547 ################################################################################ 551 ################################################################################
548 552
549 DEFINES_UNIX = [ 553 DEFINES_UNIX = [
550 "PNG_SKIP_SETJMP_CHECK",
551 "SK_BUILD_FOR_UNIX", 554 "SK_BUILD_FOR_UNIX",
552 "SK_SAMPLES_FOR_X", 555 "SK_SAMPLES_FOR_X",
553 "SK_SFNTLY_SUBSETTER", 556 "SK_SFNTLY_SUBSETTER",
554 "SK_CODEC_DECODES_RAW", 557 "SK_CODEC_DECODES_RAW",
555 "SK_HAS_GIF_LIBRARY", 558 "SK_HAS_GIF_LIBRARY",
556 "SK_HAS_JPEG_LIBRARY", 559 "SK_HAS_JPEG_LIBRARY",
560 "SK_HAS_WEBP_LIBRARY",
557 "SK_HAS_PNG_LIBRARY", 561 "SK_HAS_PNG_LIBRARY",
558 "SK_HAS_WEBP_LIBRARY", 562 "PNG_ARM_NEON_OPT=0",
563 "PNG_INTEL_SSE_OPT=0",
564 "PNG_ARM_NEON_IMPLEMENTATION=0",
559 ] 565 ]
560 566
561 DEFINES_ANDROID = [ 567 DEFINES_ANDROID = [
562 "SK_BUILD_FOR_ANDROID", 568 "SK_BUILD_FOR_ANDROID",
563 "SK_CODEC_DECODES_RAW", 569 "SK_CODEC_DECODES_RAW",
564 "SK_HAS_GIF_LIBRARY", 570 "SK_HAS_GIF_LIBRARY",
565 "SK_HAS_JPEG_LIBRARY", 571 "SK_HAS_JPEG_LIBRARY",
572 "SK_HAS_WEBP_LIBRARY",
566 "SK_HAS_PNG_LIBRARY", 573 "SK_HAS_PNG_LIBRARY",
567 "SK_HAS_WEBP_LIBRARY", 574 "PNG_ARM_NEON_OPT=0",
575 "PNG_INTEL_SSE_OPT=0",
576 "PNG_ARM_NEON_IMPLEMENTATION=0",
568 ] 577 ]
569 578
570 DEFINES_IOS = [ 579 DEFINES_IOS = [
571 "SK_BUILD_FOR_IOS", 580 "SK_BUILD_FOR_IOS",
572 "SK_BUILD_NO_OPTS", 581 "SK_BUILD_NO_OPTS",
573 "SK_IGNORE_ETC1_SUPPORT", 582 "SK_IGNORE_ETC1_SUPPORT",
574 "SKNX_NO_SIMD", 583 "SKNX_NO_SIMD",
575 ] 584 ]
576 585
577 DEFINES_ALL = [ 586 DEFINES_ALL = [
(...skipping 24 matching lines...) Expand all
602 611
603 LINKOPTS_ANDROID = [ 612 LINKOPTS_ANDROID = [
604 "-lEGL", 613 "-lEGL",
605 ] 614 ]
606 615
607 LINKOPTS_IOS = [] 616 LINKOPTS_IOS = []
608 617
609 LINKOPTS_ALL = [ 618 LINKOPTS_ALL = [
610 "-ldl", 619 "-ldl",
611 ] 620 ]
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