Skip to content

Commit

Permalink
Exclude the PDF font subsetter on macOS to reduce size. see issue #174
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattleibow
mattleibow committed Jan 30, 2017
1 parent c5188a1 commit 93b1f90
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 87 deletions.
2 changes: 1 addition & 1 deletion cake/BuildExternals.cake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ Task ("externals-osx")
.Does (() =>
{
var buildArch = new Action<string, string> ((arch, skiaArch) => {
RunGyp ("skia_arch_type='" + skiaArch + "' skia_gpu=1 skia_osx_deployment_target=10.8", "xcode");
RunGyp ("skia_arch_type='" + skiaArch + "' skia_gpu=1 skia_pdf_use_sfntly=0 skia_osx_deployment_target=10.8", "xcode");

XCodeBuild (new XCodeBuildSettings {
Project = "native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj",
Expand Down
86 changes: 0 additions & 86 deletions native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
342959F61C6173F900BF1BB6 /* libwebp_enc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 342959E91C61737400BF1BB6 /* libwebp_enc.a */; };
342959F71C6173F900BF1BB6 /* libwebp_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 342959EB1C61737400BF1BB6 /* libwebp_utils.a */; };
343DAE301C3F26CF00FAD826 /* SkiaKeeper.c in Sources */ = {isa = PBXBuildFile; fileRef = 343DAE2E1C3F26CF00FAD826 /* SkiaKeeper.c */; };
344B478A1D1ADD7400EFE6F9 /* libsfntly.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 344B47861D1ADD6A00EFE6F9 /* libsfntly.a */; };
3460AD3E1D0157F10051FEA0 /* libskia_codec_android.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFE951D015718002A83B6 /* libskia_codec_android.a */; };
3460AD3F1D0157F10051FEA0 /* libskia_codec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFE921D015718002A83B6 /* libskia_codec.a */; };
3460AD401D0157F10051FEA0 /* libskia_pdf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFEB91D015718002A83B6 /* libskia_pdf.a */; };
Expand All @@ -55,7 +54,6 @@
3488AE1D1D1ADC7E00BE2DC3 /* libzlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3488AE111D1ADC3F00BE2DC3 /* libzlib.a */; };
34C653D71D76017D000C1D5D /* libskia_opts_sse42.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 21C9519A1C03D392003A1E1D /* libskia_opts_sse42.a */; };
34D3B8451E2D0EEA00731C1C /* libexpat_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34D3B82E1E2D0EDE00731C1C /* libexpat_static.a */; };
34FEFECE1D01572D002A83B6 /* libicuuc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFE9B1D015718002A83B6 /* libicuuc.a */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -311,20 +309,6 @@
remoteGlobalIDString = 43AF69108FDDD0AB4332A1ED;
remoteInfo = libwebp_dsp_enc;
};
344B47851D1ADD6A00EFE6F9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 344B476D1D1ADD6A00EFE6F9 /* sfntly.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 70CCA63D0A9AF8CD04A019F9;
remoteInfo = sfntly;
};
344B47881D1ADD6F00EFE6F9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 344B476D1D1ADD6A00EFE6F9 /* sfntly.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 94EC2B00B9A5217A42B1C7D4;
remoteInfo = sfntly;
};
3460AD621D0158270051FEA0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 34FEFE781D015718002A83B6 /* codec_android.xcodeproj */;
Expand Down Expand Up @@ -556,13 +540,6 @@
remoteGlobalIDString = 02416B678B4C01D8DEE485DE;
remoteInfo = sksl;
};
34FEFE9A1D015718002A83B6 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 34FEFE811D015718002A83B6 /* icu.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 47A48DEFDFDD22CF05CDA95B;
remoteInfo = icuuc;
};
34FEFEA41D015718002A83B6 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 34FEFE841D015718002A83B6 /* libpng.xcodeproj */;
Expand All @@ -584,13 +561,6 @@
remoteGlobalIDString = 0DC15EA4ADE06EC812B0409E;
remoteInfo = pdf;
};
34FEFECA1D015725002A83B6 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 34FEFE811D015718002A83B6 /* icu.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A8365F341FF32481B097DC30;
remoteInfo = icuuc;
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -621,7 +591,6 @@
3429598C1C616FA000BF1BB6 /* libjpeg-turbo.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo.xcodeproj"; path = "../../externals/skia/out/gyp/libjpeg-turbo.xcodeproj"; sourceTree = "<group>"; };
342959D41C61737400BF1BB6 /* libwebp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libwebp.xcodeproj; path = ../../externals/skia/out/gyp/libwebp.xcodeproj; sourceTree = "<group>"; };
343DAE2E1C3F26CF00FAD826 /* SkiaKeeper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SkiaKeeper.c; path = ../src/SkiaKeeper.c; sourceTree = "<group>"; };
344B476D1D1ADD6A00EFE6F9 /* sfntly.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sfntly.xcodeproj; path = ../../externals/skia/out/gyp/sfntly.xcodeproj; sourceTree = "<group>"; };
34770F891E2D07B1009471AF /* svg.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = svg.xcodeproj; path = ../../externals/skia/out/gyp/svg.xcodeproj; sourceTree = "<group>"; };
34770F8D1E2D07B2009471AF /* xml.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = xml.xcodeproj; path = ../../externals/skia/out/gyp/xml.xcodeproj; sourceTree = "<group>"; };
3488ADFC1D1ADC3F00BE2DC3 /* dng_sdk.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = dng_sdk.xcodeproj; path = ../../externals/skia/out/gyp/dng_sdk.xcodeproj; sourceTree = "<group>"; };
Expand All @@ -631,7 +600,6 @@
34FEFE781D015718002A83B6 /* codec_android.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec_android.xcodeproj; path = ../../externals/skia/out/gyp/codec_android.xcodeproj; sourceTree = "<group>"; };
34FEFE7B1D015718002A83B6 /* codec.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec.xcodeproj; path = ../../externals/skia/out/gyp/codec.xcodeproj; sourceTree = "<group>"; };
34FEFE7E1D015718002A83B6 /* sksl.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sksl.xcodeproj; path = ../../externals/skia/out/gyp/sksl.xcodeproj; sourceTree = "<group>"; };
34FEFE811D015718002A83B6 /* icu.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = icu.xcodeproj; path = ../../externals/skia/out/gyp/icu.xcodeproj; sourceTree = "<group>"; };
34FEFE841D015718002A83B6 /* libpng.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libpng.xcodeproj; path = ../../externals/skia/out/gyp/libpng.xcodeproj; sourceTree = "<group>"; };
34FEFE871D015718002A83B6 /* pdf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pdf.xcodeproj; path = ../../externals/skia/out/gyp/pdf.xcodeproj; sourceTree = "<group>"; };
34FEFE8D1D015718002A83B6 /* skia_lib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = skia_lib.xcodeproj; path = ../../externals/skia/out/gyp/skia_lib.xcodeproj; sourceTree = "<group>"; };
Expand All @@ -647,7 +615,6 @@
34770FB81E2D07C6009471AF /* libskia_xml.a in Frameworks */,
3474BFC81DAE8B8D00107695 /* libskia_opts_hsw.a in Frameworks */,
34C653D71D76017D000C1D5D /* libskia_opts_sse42.a in Frameworks */,
344B478A1D1ADD7400EFE6F9 /* libsfntly.a in Frameworks */,
3488AE1A1D1ADC7E00BE2DC3 /* libdng_sdk.a in Frameworks */,
3488AE1B1D1ADC7E00BE2DC3 /* libpiex.a in Frameworks */,
3488AE1C1D1ADC7E00BE2DC3 /* libraw_codec.a in Frameworks */,
Expand All @@ -657,7 +624,6 @@
3460AD3E1D0157F10051FEA0 /* libskia_codec_android.a in Frameworks */,
3460AD3F1D0157F10051FEA0 /* libskia_codec.a in Frameworks */,
3460AD401D0157F10051FEA0 /* libskia_pdf.a in Frameworks */,
34FEFECE1D01572D002A83B6 /* libicuuc.a in Frameworks */,
342959F21C6173F900BF1BB6 /* libwebp_dec.a in Frameworks */,
342959F31C6173F900BF1BB6 /* libwebp_demux.a in Frameworks */,
342959F41C6173F900BF1BB6 /* libwebp_dsp_enc.a in Frameworks */,
Expand Down Expand Up @@ -722,7 +688,6 @@
21C951ED1C03D551003A1E1D /* etc1.xcodeproj */,
34D3B8241E2D0EDE00731C1C /* expat.xcodeproj */,
21C951A11C03D39B003A1E1D /* gpu.xcodeproj */,
34FEFE811D015718002A83B6 /* icu.xcodeproj */,
21C951BB1C03D3EA003A1E1D /* ImageIO.framework */,
21C9517E1C03D38A003A1E1D /* images.xcodeproj */,
21C951D71C03D4F9003A1E1D /* ktx.xcodeproj */,
Expand All @@ -736,7 +701,6 @@
3488ADFF1D1ADC3F00BE2DC3 /* piex.xcodeproj */,
21C951CE1C03D4B8003A1E1D /* ports.xcodeproj */,
21C951661C03D363003A1E1D /* sfnt.xcodeproj */,
344B476D1D1ADD6A00EFE6F9 /* sfntly.xcodeproj */,
34FEFE8D1D015718002A83B6 /* skia_lib.xcodeproj */,
34FEFE7E1D015718002A83B6 /* sksl.xcodeproj */,
34770F891E2D07B1009471AF /* svg.xcodeproj */,
Expand Down Expand Up @@ -876,14 +840,6 @@
name = Source;
sourceTree = "<group>";
};
344B476E1D1ADD6A00EFE6F9 /* Products */ = {
isa = PBXGroup;
children = (
344B47861D1ADD6A00EFE6F9 /* libsfntly.a */,
);
name = Products;
sourceTree = "<group>";
};
34770F8A1E2D07B1009471AF /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -958,14 +914,6 @@
name = Products;
sourceTree = "<group>";
};
34FEFE821D015718002A83B6 /* Products */ = {
isa = PBXGroup;
children = (
34FEFE9B1D015718002A83B6 /* libicuuc.a */,
);
name = Products;
sourceTree = "<group>";
};
34FEFE851D015718002A83B6 /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1022,7 +970,6 @@
34770FB61E2D07BD009471AF /* PBXTargetDependency */,
3474BFAF1DAE8B7900107695 /* PBXTargetDependency */,
34C653D61D760173000C1D5D /* PBXTargetDependency */,
344B47891D1ADD6F00EFE6F9 /* PBXTargetDependency */,
3488AE131D1ADC6400BE2DC3 /* PBXTargetDependency */,
3488AE151D1ADC6400BE2DC3 /* PBXTargetDependency */,
3488AE171D1ADC6400BE2DC3 /* PBXTargetDependency */,
Expand All @@ -1038,7 +985,6 @@
3460AD731D0158270051FEA0 /* PBXTargetDependency */,
3460AD751D0158270051FEA0 /* PBXTargetDependency */,
3460AD771D0158270051FEA0 /* PBXTargetDependency */,
34FEFECB1D015725002A83B6 /* PBXTargetDependency */,
342959F11C6173E900BF1BB6 /* PBXTargetDependency */,
21C951F41C03D557003A1E1D /* PBXTargetDependency */,
21C951EB1C03D532003A1E1D /* PBXTargetDependency */,
Expand Down Expand Up @@ -1116,10 +1062,6 @@
ProductGroup = 21C951A21C03D39B003A1E1D /* Products */;
ProjectRef = 21C951A11C03D39B003A1E1D /* gpu.xcodeproj */;
},
{
ProductGroup = 34FEFE821D015718002A83B6 /* Products */;
ProjectRef = 34FEFE811D015718002A83B6 /* icu.xcodeproj */;
},
{
ProductGroup = 21C9517F1C03D38A003A1E1D /* Products */;
ProjectRef = 21C9517E1C03D38A003A1E1D /* images.xcodeproj */;
Expand Down Expand Up @@ -1164,10 +1106,6 @@
ProductGroup = 21C951671C03D363003A1E1D /* Products */;
ProjectRef = 21C951661C03D363003A1E1D /* sfnt.xcodeproj */;
},
{
ProductGroup = 344B476E1D1ADD6A00EFE6F9 /* Products */;
ProjectRef = 344B476D1D1ADD6A00EFE6F9 /* sfntly.xcodeproj */;
},
{
ProductGroup = 34FEFE8E1D015718002A83B6 /* Products */;
ProjectRef = 34FEFE8D1D015718002A83B6 /* skia_lib.xcodeproj */;
Expand Down Expand Up @@ -1355,13 +1293,6 @@
remoteRef = 342959EA1C61737400BF1BB6 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
344B47861D1ADD6A00EFE6F9 /* libsfntly.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libsfntly.a;
remoteRef = 344B47851D1ADD6A00EFE6F9 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
3474BFC21DAE8B7900107695 /* libskia_opts_hsw.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
Expand Down Expand Up @@ -1453,13 +1384,6 @@
remoteRef = 34FEFE971D015718002A83B6 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
34FEFE9B1D015718002A83B6 /* libicuuc.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libicuuc.a;
remoteRef = 34FEFE9A1D015718002A83B6 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
34FEFEA51D015718002A83B6 /* libpng_static.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
Expand Down Expand Up @@ -1568,11 +1492,6 @@
name = libwebp_dsp_enc;
targetProxy = 342959F01C6173E900BF1BB6 /* PBXContainerItemProxy */;
};
344B47891D1ADD6F00EFE6F9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = sfntly;
targetProxy = 344B47881D1ADD6F00EFE6F9 /* PBXContainerItemProxy */;
};
3460AD631D0158270051FEA0 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = codec_android;
Expand Down Expand Up @@ -1673,11 +1592,6 @@
name = expat_static;
targetProxy = 34D3B8431E2D0EE400731C1C /* PBXContainerItemProxy */;
};
34FEFECB1D015725002A83B6 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = icuuc;
targetProxy = 34FEFECA1D015725002A83B6 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
Expand Down

0 comments on commit 93b1f90

Please sign in to comment.