Chromium Code Reviews Chromium Code Reviews
Issue 2033063003:
Check libpng directly into third_party/ (Closed)
Base URL: https://skia.googlesource.com/skia.git@master| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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", | |
|
msarett
2016/06/02 17:10:36
Not sure, but you might possibly want to set PNG_A
| |
| 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 Loading... | |
| 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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 602 | 606 |
| 603 LINKOPTS_ANDROID = [ | 607 LINKOPTS_ANDROID = [ |
| 604 "-lEGL", | 608 "-lEGL", |
| 605 ] | 609 ] |
| 606 | 610 |
| 607 LINKOPTS_IOS = [] | 611 LINKOPTS_IOS = [] |
| 608 | 612 |
| 609 LINKOPTS_ALL = [ | 613 LINKOPTS_ALL = [ |
| 610 "-ldl", | 614 "-ldl", |
| 611 ] | 615 ] |
| OLD | NEW |
