summaryrefslogtreecommitdiffstats
path: root/sql/sql.gyp
diff options
context:
space:
mode:
authorshess <shess@chromium.org>2016-03-08 22:21:15 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-09 06:22:20 +0000
commitfd7e4dd0e9c63780fe97438b893a4848c1db49bf (patch)
tree32933b8554084d175e786bfab18853368325a5c6 /sql/sql.gyp
parent508915b949589cb4d34ed4723ec6db2d5ae42039 (diff)
downloadchromium_src-fd7e4dd0e9c63780fe97438b893a4848c1db49bf.zip
chromium_src-fd7e4dd0e9c63780fe97438b893a4848c1db49bf.tar.gz
chromium_src-fd7e4dd0e9c63780fe97438b893a4848c1db49bf.tar.bz2
Revert of [sqlite] sql::Recovery working under USE_SYSTEM_SQLITE. (patchset #2 id:20001 of https://codereview.chromium.org/1757653002/ )
Reason for revert: https://build.chromium.org/p/chromium/builders/Linux/builds/72746/steps/compile/logs/stdio FAILED: /b/build/slave/Linux/build/src/build/goma/client/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang -MMD -MF obj/third_party/sqlite/src/src/sqlite_recover.recover_varint.o.d -DSQLITE_ENABLE_FTS3 -DSQLITE_DISABLE_FTS3_UNICODE -DSQLITE_DISABLE_FTS4_DEFERRED -DSQLITE_ENABLE_ICU -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_SECURE_DELETE -DSQLITE_SEPARATE_CACHE_POOLS -DTHREADSAFE -DSQLITE_MAX_WORKER_THREADS=0 -DSQLITE_MAX_MMAP_SIZE=268435456 -DSQLITE_MMAP_READ_ONLY=1 -DSQLITE_DEFAULT_PCACHE_INITSZ=0 -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=2 -D_FILE_OFFSET_BITS=64 -DCHROMIUM_BUILD -DCR_CLANG_REVISION=261368-1 -DUI_COMPOSITOR_IMAGE_TRANSPORT -DUSE_AURA=1 -DUSE_PANGO=1 -DUSE_CAIRO=1 -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_LIBJPEG_TURBO=1 -DUSE_X11=1 -DUSE_CLIPBOARD_AURAX11=1 -DENABLE_WEBRTC=1 -DENABLE_MEDIA_ROUTER=1 -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_NOTIFICATIONS -DENABLE_TOPCHROME_MD=1 -DUSE_UDEV -DFIELDTRIAL_TESTING_ENABLED -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PDF=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_MDNS=1 -DENABLE_SERVICE_DISCOVERY=1 -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -Igen -fstack-protector --param=ssp-buffer-size=4 -Werror -pthread -fno-strict-aliasing -Wall -Wno-unused-parameter -Wno-missing-field-initializers -fvisibility=hidden -pipe -fPIC -Xclang -load -Xclang /b/build/slave/Linux/build/src/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang check-templates -Xclang -plugin-arg-find-bad-constructs -Xclang follow-macro-expansion -momit-leaf-frame-pointer -mstack-alignment=16 -mstackrealign -fcolor-diagnostics -B/b/build/slave/Linux/build/src/third_party/binutils/Linux_x64/Release/bin -Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration -Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing -Wno-deprecated-register -Wno-inconsistent-missing-override -Wno-shift-negative-value -Wno-unused-variable -msse2 -mfpmath=sse -mmmx -m32 --sysroot=/b/build/slave/Linux/build/src/build/linux/debian_wheezy_i386-sysroot -O2 -fno-ident -fdata-sections -ffunction-sections -funwind-tables -c ../../third_party/sqlite/src/src/recover_varint.c -o obj/third_party/sqlite/src/src/sqlite_recover.recover_varint.o ../../third_party/sqlite/src/src/recover_varint.c:18:10: fatal error: 'sqlite3.h' file not found #include "sqlite3.h" Original issue's description: > [sqlite] sql::Recovery working under USE_SYSTEM_SQLITE. > > Removes the USE_SYSTEM_SQLITE conditional sections in sql::Recover > implementation and tests. third_party/sqlite includes sqlite_recover > library for the USE_SYSTEM_SQLITE case, with recover.c compiled against > the system version of SQLite. > > Additionally remove interiorCursorEOF() from recover.c, as it was > unused, rather than adding a compile flag to allow it. > > BUG=584407 > > Committed: https://crrev.com/7776a37d651f0afdf61f150fba50884f2ad3ac5d > Cr-Commit-Position: refs/heads/master@{#380076} TBR=sdefresne@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=584407 Review URL: https://codereview.chromium.org/1778823002 Cr-Commit-Position: refs/heads/master@{#380084}
Diffstat (limited to 'sql/sql.gyp')
-rw-r--r--sql/sql.gyp12
1 files changed, 0 insertions, 12 deletions
diff --git a/sql/sql.gyp b/sql/sql.gyp
index cde3057..30bd76d 100644
--- a/sql/sql.gyp
+++ b/sql/sql.gyp
@@ -114,18 +114,6 @@
'../testing/android/native_test.gyp:native_test_native_code',
],
}],
- ['OS == "ios"', {
- 'actions': [{
- 'action_name': 'copy_test_data',
- 'variables': {
- 'test_data_files': [
- 'test/data',
- ],
- 'test_data_prefix' : 'sql',
- },
- 'includes': [ '../build/copy_test_data_ios.gypi' ],
- }],
- }],
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [4267, ],