diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2014-09-28 14:46:14 +0200 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2014-09-28 14:46:14 +0200 |
| commit | 7c0a284cbc227e35213d3c606edd29c05225f3a7 (patch) | |
| tree | 16ff82ba9593df162b43cb3ba51c561298df6c47 /media/libstagefright/wifi-display | |
| parent | 6cd6792a3289c0c50542d8113068478dbc3a5ad0 (diff) | |
| download | frameworks_av-7c0a284cbc227e35213d3c606edd29c05225f3a7.zip frameworks_av-7c0a284cbc227e35213d3c606edd29c05225f3a7.tar.gz frameworks_av-7c0a284cbc227e35213d3c606edd29c05225f3a7.tar.bz2 | |
Fix linkage when building with clang, Intel CC or gcc -O0
This code fails to link when using clang, Intel CC, or gcc -O0 because of the
CHECK_GT statement in WifiDisplaySource::scheduleKeepAlive (explanation
at https://gcc.gnu.org/wiki/VerboseDiagnostics#missing_static_const_definition,
doesn't show up with gcc when optimizations are enabled because the
entire CHECK_GT statement is optimized away).
This fixes https://code.google.com/p/android/issues/detail?id=58221
Change-Id: I43d3629819a01971846c31e9f755d6e0567fb838
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Diffstat (limited to 'media/libstagefright/wifi-display')
| -rw-r--r-- | media/libstagefright/wifi-display/source/WifiDisplaySource.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp index da405e2..0c39ccf 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp @@ -43,6 +43,10 @@ namespace android { // static +const int64_t WifiDisplaySource::kReaperIntervalUs; +const int64_t WifiDisplaySource::kTeardownTriggerTimeouSecs; +const int64_t WifiDisplaySource::kPlaybackSessionTimeoutSecs; +const int64_t WifiDisplaySource::kPlaybackSessionTimeoutUs; const AString WifiDisplaySource::sUserAgent = MakeUserAgent(); WifiDisplaySource::WifiDisplaySource( |