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

Unified Diff: third_party/BUILD.gn

Issue 1882123002: Revert of [iOS] Defaults to use system libjpeg on iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@net
Patch Set: Created 4 years, 8 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: third_party/BUILD.gn
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index 6d97aafdbce05c75ea1a3ed68552d77ba115b94e..cf62b83fca29975a1817d3791b0110c2cf9250a0 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -8,7 +8,7 @@
declare_args() {
# Uses system libjpeg. If true, overrides use_libjpeg_turbo.
- use_system_libjpeg = is_ios
+ use_system_libjpeg = false
# Uses libjpeg_turbo as the jpeg implementation. Has no effect if
# use_system_libjpeg is set.
@@ -16,7 +16,6 @@
}
config("system_libjpeg_config") {
- libs = [ "jpeg" ]
defines = [ "USE_SYSTEM_LIBJPEG" ]
}
@@ -29,6 +28,7 @@
# declared in this file.
group("jpeg") {
if (use_system_libjpeg) {
+ libs = [ "jpeg" ]
public_configs = [ ":system_libjpeg_config" ]
} else if (use_libjpeg_turbo) {
public_deps = [
« 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