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

Unified Diff: public.bzl

Issue 1710493002: Speculative fix for Google3 iOS build (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Exclude srcs with dependencies Created 4 years, 10 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 f687a42fee9cafc44f670890d3c41959aac4fc66..064075f31b058af70c79f665de34526ecc688dde 100644
--- a/public.bzl
+++ b/public.bzl
@@ -70,8 +70,6 @@ BASE_SRCS_ALL = struct(
],
exclude = [
# Exclude platform-dependent files.
- "src/android/*",
- "src/codec/*",
"src/device/xps/*", # Windows-only. Move to ports?
"src/doc/*_XPS.cpp", # Windows-only. Move to ports?
"src/fonts/SkFontMgr_fontconfig.cpp",
@@ -119,8 +117,6 @@ BASE_SRCS_ALL = struct(
# Platform-dependent SRCS for google3-default platform.
BASE_SRCS_UNIX = struct(
include = [
- "src/android/*",
- "src/codec/*",
"src/fonts/SkFontMgr_fontconfig.cpp",
"src/images/*",
"src/opts/**/*.cpp",
@@ -167,8 +163,6 @@ BASE_SRCS_UNIX = struct(
# Platform-dependent SRCS for google3-default Android.
BASE_SRCS_ANDROID = struct(
include = [
- "src/android/*",
- "src/codec/*",
"src/images/*",
# TODO(benjaminwagner): Figure out how to compile with EGL.
"src/opts/**/*.cpp",
@@ -219,6 +213,12 @@ BASE_SRCS_IOS = struct(
"src/utils/mac/*.cpp",
],
exclude = [
+ "src/codec/*Gif*",
dogben 2016/02/17 20:00:58 Can't exclude these here, because they're already
msarett 2016/02/17 20:09:22 Oh gotcha - trying a new approach.
+ "src/codec/*Ico*",
+ "src/codec/*Jpeg*",
+ "src/codec/*Webp*",
+ "src/codec/*Png*",
+ "src/codec/*Raw*",
"src/opts/*mips*",
"src/opts/*NEON*",
"src/opts/*neon*",
« 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