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

Unified 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 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 f84abc0e6c9abca39049585ac77661f1fadd3d2c..5ba561231085bd349ae4ba4262c4882bc218abf7 100644
--- a/public.bzl
+++ b/public.bzl
@@ -79,6 +79,9 @@ BASE_SRCS_ALL = struct(
"third_party/etc1/*.h",
"third_party/ktx/*.cpp",
"third_party/ktx/*.h",
+
+ "third_party/libpng/*.c",
+ "third_party/libpng/*.h",
],
exclude = PRIVATE_HDRS_LIST + [
# Exclude platform-dependent files.
@@ -383,6 +386,7 @@ INCLUDES = [
"src/utils",
"third_party/etc1",
"third_party/ktx",
+ "third_party/libpng",
]
################################################################################
@@ -547,15 +551,17 @@ COPTS_ALL = []
################################################################################
DEFINES_UNIX = [
- "PNG_SKIP_SETJMP_CHECK",
"SK_BUILD_FOR_UNIX",
"SK_SAMPLES_FOR_X",
"SK_SFNTLY_SUBSETTER",
"SK_CODEC_DECODES_RAW",
"SK_HAS_GIF_LIBRARY",
"SK_HAS_JPEG_LIBRARY",
- "SK_HAS_PNG_LIBRARY",
"SK_HAS_WEBP_LIBRARY",
+ "SK_HAS_PNG_LIBRARY",
+ "PNG_ARM_NEON_OPT=0",
+ "PNG_INTEL_SSE_OPT=0",
+ "PNG_ARM_NEON_IMPLEMENTATION=0",
]
DEFINES_ANDROID = [
@@ -563,8 +569,11 @@ DEFINES_ANDROID = [
"SK_CODEC_DECODES_RAW",
"SK_HAS_GIF_LIBRARY",
"SK_HAS_JPEG_LIBRARY",
- "SK_HAS_PNG_LIBRARY",
"SK_HAS_WEBP_LIBRARY",
+ "SK_HAS_PNG_LIBRARY",
+ "PNG_ARM_NEON_OPT=0",
+ "PNG_INTEL_SSE_OPT=0",
+ "PNG_ARM_NEON_IMPLEMENTATION=0",
]
DEFINES_IOS = [
« 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