summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortorne <torne@chromium.org>2014-09-03 03:55:58 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-03 10:58:08 +0000
commiteac62b75ce57c1689a48fadd4229c1346509a170 (patch)
tree5d85ca104281dcf837cda8a063331489174e52a3
parent3e0cdac17f97622b18cefbc7211259e5e8f1ef81 (diff)
downloadchromium_src-eac62b75ce57c1689a48fadd4229c1346509a170.zip
chromium_src-eac62b75ce57c1689a48fadd4229c1346509a170.tar.gz
chromium_src-eac62b75ce57c1689a48fadd4229c1346509a170.tar.bz2
android_webview: stop using system expat.
To support unbundled updates we need to stop depending on system libraries. Disable using the system version of libexpat and instead link Chromium's copy, and stop removing the expat sources from the checkout. This increases binary size by ~64KB. Also remove an obsolete comment about using the system version of sqlite; this was never implemented and now will not be. BUG=409851 Review URL: https://codereview.chromium.org/534603002 Cr-Commit-Position: refs/heads/master@{#293115}
-rw-r--r--android_webview/tools/known_issues.py1
-rw-r--r--build/common.gypi3
2 files changed, 0 insertions, 4 deletions
diff --git a/android_webview/tools/known_issues.py b/android_webview/tools/known_issues.py
index fc04e99..588e4cb 100644
--- a/android_webview/tools/known_issues.py
+++ b/android_webview/tools/known_issues.py
@@ -53,7 +53,6 @@ KNOWN_INCOMPATIBLE = {
# Code we don't want to build/include by accident from the main chromium
# src/ directory.
'third_party/ashmem/*.[ch]',
- 'third_party/expat/files/lib',
'third_party/libjpeg/*.[ch]',
],
'third_party/icu': [
diff --git a/build/common.gypi b/build/common.gypi
index 1b867f5..fc89186 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1797,9 +1797,6 @@
# When building as part of the Android system, use system libraries
# where possible to reduce ROM size.
- # TODO(steveblock): Investigate using the system version of sqlite.
- 'use_system_sqlite%': 0, # '<(android_webview_build)',
- 'use_system_expat%': '<(android_webview_build)',
'use_system_icu%': '<(android_webview_build)',
'use_system_stlport%': '<(android_webview_build)',