Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaa91ed1 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I63d524fd into eclair-mr2 

* changes:
  Fixing the build by renaming private "string.h" header file.
parents 169ef4cc 63d524fd

media/libstagefright/HTTPDataSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include "include/string.h"

#include "include/stagefright_string.h"

#include "include/HTTPStream.h"



#include <stdlib.h>

media/libstagefright/MediaPlayerImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#define LOG_TAG "MediaPlayerImpl"

#include "utils/Log.h"



#include "include/string.h"

#include "include/stagefright_string.h"

#include "include/HTTPStream.h"



#include <OMX_Component.h>

media/libstagefright/ShoutcastSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include "include/string.h"

#include "include/stagefright_string.h"

#include "include/HTTPStream.h"



#include <stdlib.h>

media/libstagefright/include/HTTPStream.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#define HTTP_STREAM_H_



#include "string.h"

#include "stagefright_string.h"



#include <sys/types.h>