diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-24 10:50:13 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-24 10:50:13 +0100 |
| commit | 0529e5d033099cbfc42635f6f6183833b09dff6e (patch) | |
| tree | badea60062e611382d8a37e3b0bfda8d69760c2b /sql | |
| parent | 8346740f6fb555ccbb9b4148ab63402ae8f6e4ca (diff) | |
| download | chromium_org-0529e5d033099cbfc42635f6f6183833b09dff6e.tar.gz | |
Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py.
Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql.gyp | 1 | ||||
| -rw-r--r-- | sql/sql.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | sql/sql.target.darwin-mips.mk | 1 | ||||
| -rw-r--r-- | sql/sql.target.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | sql/sql.target.darwin-x86_64.mk | 1 | ||||
| -rw-r--r-- | sql/sql.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | sql/sql.target.linux-mips.mk | 1 | ||||
| -rw-r--r-- | sql/sql.target.linux-x86.mk | 1 | ||||
| -rw-r--r-- | sql/sql.target.linux-x86_64.mk | 1 |
9 files changed, 0 insertions, 9 deletions
diff --git a/sql/sql.gyp b/sql/sql.gyp index 0d861a8953..f62a2eb8f8 100644 --- a/sql/sql.gyp +++ b/sql/sql.gyp @@ -130,7 +130,6 @@ ], 'variables': { 'test_suite_name': 'sql_unittests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sql_unittests<(SHARED_LIB_SUFFIX)', }, 'includes': [ '../build/apk_test.gypi' ], }, diff --git a/sql/sql.target.darwin-arm.mk b/sql/sql.target.darwin-arm.mk index 9bdd4716b5..6e1cdfafd4 100644 --- a/sql/sql.target.darwin-arm.mk +++ b/sql/sql.target.darwin-arm.mk @@ -232,7 +232,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/sql/sql.target.darwin-mips.mk b/sql/sql.target.darwin-mips.mk index aabb6e1951..fde2034c39 100644 --- a/sql/sql.target.darwin-mips.mk +++ b/sql/sql.target.darwin-mips.mk @@ -228,7 +228,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/sql/sql.target.darwin-x86.mk b/sql/sql.target.darwin-x86.mk index cb9a2e90b8..c9bf1f4781 100644 --- a/sql/sql.target.darwin-x86.mk +++ b/sql/sql.target.darwin-x86.mk @@ -230,7 +230,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/sql/sql.target.darwin-x86_64.mk b/sql/sql.target.darwin-x86_64.mk index 86aa9d5205..3f5d446b10 100644 --- a/sql/sql.target.darwin-x86_64.mk +++ b/sql/sql.target.darwin-x86_64.mk @@ -230,7 +230,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/sql/sql.target.linux-arm.mk b/sql/sql.target.linux-arm.mk index 9bdd4716b5..6e1cdfafd4 100644 --- a/sql/sql.target.linux-arm.mk +++ b/sql/sql.target.linux-arm.mk @@ -232,7 +232,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/sql/sql.target.linux-mips.mk b/sql/sql.target.linux-mips.mk index aabb6e1951..fde2034c39 100644 --- a/sql/sql.target.linux-mips.mk +++ b/sql/sql.target.linux-mips.mk @@ -228,7 +228,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/sql/sql.target.linux-x86.mk b/sql/sql.target.linux-x86.mk index cb9a2e90b8..c9bf1f4781 100644 --- a/sql/sql.target.linux-x86.mk +++ b/sql/sql.target.linux-x86.mk @@ -230,7 +230,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/sql/sql.target.linux-x86_64.mk b/sql/sql.target.linux-x86_64.mk index 86aa9d5205..3f5d446b10 100644 --- a/sql/sql.target.linux-x86_64.mk +++ b/sql/sql.target.linux-x86_64.mk @@ -230,7 +230,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed |