diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-09 23:44:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 23:44:51 +0000 |
| commit | 8593c3b74b059861fdaa6ca6a913597849fe9ae1 (patch) | |
| tree | 396e61645ef029986ca7984aeaf88cc97ec82937 /media/libmediaplayerservice | |
| parent | 8ce2ac3c23438177d600ff90e0d6e29b0bd5e24c (diff) | |
| parent | 33cc5c91e4bb9152ed122afacf7423e085420ac8 (diff) | |
| download | frameworks_av-8593c3b74b059861fdaa6ca6a913597849fe9ae1.zip frameworks_av-8593c3b74b059861fdaa6ca6a913597849fe9ae1.tar.gz frameworks_av-8593c3b74b059861fdaa6ca6a913597849fe9ae1.tar.bz2 | |
am 33cc5c91: am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"
* commit '33cc5c91e4bb9152ed122afacf7423e085420ac8':
Fix build with clang in C++11 mode
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/TestPlayerStub.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/TestPlayerStub.cpp b/media/libmediaplayerservice/TestPlayerStub.cpp index 5795773..c8bf6c5 100644 --- a/media/libmediaplayerservice/TestPlayerStub.cpp +++ b/media/libmediaplayerservice/TestPlayerStub.cpp @@ -45,7 +45,7 @@ bool isTestBuild() { char prop[PROPERTY_VALUE_MAX] = { '\0', }; - property_get(kBuildTypePropName, prop, '\0'); + property_get(kBuildTypePropName, prop, "\0"); return strcmp(prop, kEngBuild) == 0 || strcmp(prop, kTestBuild) == 0; } |