diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-09-30 16:21:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-30 16:21:59 +0000 |
| commit | 95fd067cc8dc8cd10bd14dba5bc2000600c75449 (patch) | |
| tree | 16ff82ba9593df162b43cb3ba51c561298df6c47 | |
| parent | 6cd6792a3289c0c50542d8113068478dbc3a5ad0 (diff) | |
| parent | 7c0a284cbc227e35213d3c606edd29c05225f3a7 (diff) | |
| download | frameworks_av-95fd067cc8dc8cd10bd14dba5bc2000600c75449.zip frameworks_av-95fd067cc8dc8cd10bd14dba5bc2000600c75449.tar.gz frameworks_av-95fd067cc8dc8cd10bd14dba5bc2000600c75449.tar.bz2 | |
Merge "Fix linkage when building with clang, Intel CC or gcc -O0"
| -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( |