summaryrefslogtreecommitdiffstats
path: root/third_party/sqlite/sqlite.gyp
diff options
context:
space:
mode:
authoryongsheng.zhu@intel.com <yongsheng.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-24 08:25:53 +0000
committeryongsheng.zhu@intel.com <yongsheng.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-24 08:25:53 +0000
commit1348765a72f3c22d4cae052bd774184cc8403250 (patch)
tree6a6ce644bccfac6b56c0a277076c5960dbcb571f /third_party/sqlite/sqlite.gyp
parent5d2172c0f59e14907d5ab2687fa59a23726c59dc (diff)
downloadchromium_src-1348765a72f3c22d4cae052bd774184cc8403250.zip
chromium_src-1348765a72f3c22d4cae052bd774184cc8403250.tar.gz
chromium_src-1348765a72f3c22d4cae052bd774184cc8403250.tar.bz2
Fix the sqlite errors of content unittests on Android
Many tests are failed due to sqlite errors on Android. The reason is that sqlite need a temporary directory to store internal temporary files. However, Android doesn't have this kind of directory while Linux has /var/tmp. To fix this, use in-memory temporary files. It also includes: 1) Add one unit test in sql unittests to reproduce this issue for Android. 2) Remove those disabled cases for content unitests on Android. BUG= TEST=run_tests.py -s sql_unittests; run_test.py -s net_unittests Review URL: https://chromiumcodereview.appspot.com/10809015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/sqlite/sqlite.gyp')
-rw-r--r--third_party/sqlite/sqlite.gyp5
1 files changed, 5 insertions, 0 deletions
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index 6c4316b..e129046 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -41,6 +41,11 @@
],
},
}],
+ ['OS == "android"', {
+ 'defines': [
+ 'SQLITE_TEMP_STORE=3',
+ ],
+ }],
['os_posix == 1 and OS != "mac" and use_system_sqlite', {
'type': 'none',
'direct_dependent_settings': {