diff options
| author | Dan Albert <danalbert@google.com> | 2017-01-05 15:49:09 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2017-01-05 15:49:09 -0800 |
| commit | 022e7a383923cafea1a697383c90118112bb926a (patch) | |
| tree | d506941202f4a1a5d2328be47b43fcb3ff6cab22 /cc | |
| parent | 98dbb3bc2dda9633222fc66786cc122d79b4b33d (diff) | |
| download | build_soong-022e7a383923cafea1a697383c90118112bb926a.tar.gz build_soong-022e7a383923cafea1a697383c90118112bb926a.tar.bz2 build_soong-022e7a383923cafea1a697383c90118112bb926a.zip | |
Allow `unversioned_until: "current"`.
Since most system libraries aren't actually versioned yet, we
shouldn't be building the stub libraries with version info just yet.
Setting `unversioned_until: "current"` will not use the version
script for anything but android-current (this way when the version
script is applied, we'll immediately catch it if they don't match).
Test: Updated frameworks/wilhelp to use this, make ndk
Bug: https://github.com/android-ndk/ndk/issues/278
Change-Id: I0dab7fd21bb0f063c39368d37feaa3f822e908ce
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/ndk_library.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cc/ndk_library.go b/cc/ndk_library.go index aea0d52f..da3d5c7b 100644 --- a/cc/ndk_library.go +++ b/cc/ndk_library.go @@ -162,6 +162,14 @@ func shouldUseVersionScript(stub *stubDecorator) (bool, error) { return true, nil } + if stub.properties.Unversioned_until == "current" { + if stub.properties.ApiLevel == "current" { + return true, nil + } else { + return false, nil + } + } + if stub.properties.ApiLevel == "current" { return true, nil } |