diff options
| author | Alex Deymo <deymo@google.com> | 2018-01-08 20:43:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-08 20:43:13 +0000 |
| commit | fb9bb4b2ab398c43e78c91e514b108e0ed83520d (patch) | |
| tree | 10f2cc17311582d8f1b00ecf3ab0c4af213b839d /lib/Makefile.am | |
| parent | 10454ac0160379de136bacbd7919f97228e906e6 (diff) | |
| parent | 484d473385b76e888a2f692b4b6ada6d594868fe (diff) | |
| download | android_external_curl-fb9bb4b2ab398c43e78c91e514b108e0ed83520d.tar.gz android_external_curl-fb9bb4b2ab398c43e78c91e514b108e0ed83520d.tar.bz2 android_external_curl-fb9bb4b2ab398c43e78c91e514b108e0ed83520d.zip | |
Merge "Update from 7.55.1 to 7.57.0" am: 96660a18c5
am: 484d473385
Change-Id: I32e13d89b042b3e0f824bd2cc1f1da4b65140f0b
Diffstat (limited to 'lib/Makefile.am')
| -rw-r--r-- | lib/Makefile.am | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 176bf33..151c261 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -66,21 +66,7 @@ endif # Prevent LIBS from being used for all link targets LIBS = $(BLANK_AT_MAKETIME) -if SONAME_BUMP -# -# Bumping of SONAME conditionally may seem like a weird thing to do, and yeah -# it is. The problem is that we try to avoid the bump as hard as possible, but -# yet it is still necessary for a few rare situations. The configure script will -# attempt to figure out these situations, and it can be forced to consider this -# to be such a case! See README.curl_off_t for further details. -# -# This conditional soname bump SHOULD be removed at next "proper" bump. -# -VERSIONINFO=-version-info 9:0:4 -else -VERSIONINFO=-version-info 8:0:4 -endif - +VERSIONINFO=-version-info 9:0:5 # This flag accepts an argument of the form current[:revision[:age]]. So, # passing -version-info 3:12:1 sets current to 3, revision to 12, and age to # 1. |