diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-04 11:54:28 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-02-04 11:54:28 -0800 |
| commit | a1e8944a21e5833b7aadc451776f11797f5f9273 (patch) | |
| tree | b7f4c150346d21f4862f231160c7df6602509a12 /include | |
| parent | 16e8d463bc5c8805ae6815c67875b16d177a9d8a (diff) | |
| download | frameworks_av-a1e8944a21e5833b7aadc451776f11797f5f9273.zip frameworks_av-a1e8944a21e5833b7aadc451776f11797f5f9273.tar.gz frameworks_av-a1e8944a21e5833b7aadc451776f11797f5f9273.tar.bz2 | |
Move AString's StringPrintf out of the way.
We should come back and replace AString with std::string and switch to the
"real" StringPrintf family, but this fixes the ODR violation that was
preventing us from booting.
Bug: 19265750
Change-Id: I798eb9ca5dd634e44625af5e583439ef9f0cdc35
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/foundation/AString.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/foundation/AString.h b/include/media/stagefright/foundation/AString.h index c3a68e1..822dbb3 100644 --- a/include/media/stagefright/foundation/AString.h +++ b/include/media/stagefright/foundation/AString.h @@ -102,7 +102,7 @@ private: void makeMutable(); }; -AString StringPrintf(const char *format, ...); +AString AStringPrintf(const char *format, ...); } // namespace android |