diff options
| author | Jorge Lucangeli Obes <jorgelo@google.com> | 2015-12-08 17:18:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-08 17:18:37 +0000 |
| commit | e472d731dc679ee74b247f68636f55086dc312ea (patch) | |
| tree | 66c7c3dba88099895e2faa53c33522c9ced86674 | |
| parent | 333f8dbf000e234e9e6cd2b8d97de657bef86d04 (diff) | |
| parent | abbf6e6b8ae943d16dc3f35b7886464d8dd4200f (diff) | |
| download | brillo-m8-dev.tar.gz | |
Merge "Rename 'base/logging.h'."brillo-m8-releasebrillo-m8-dev
5 files changed, 5 insertions, 5 deletions
diff --git a/pts/audio/brillo-audio-test/brillo_audio_test.cpp b/pts/audio/brillo-audio-test/brillo_audio_test.cpp index 5ae3e5f..e52351e 100644 --- a/pts/audio/brillo-audio-test/brillo_audio_test.cpp +++ b/pts/audio/brillo-audio-test/brillo_audio_test.cpp @@ -18,7 +18,7 @@ #include <stdlib.h> #include <stdio.h> -#include <base/logging.h> +#include <android-base/logging.h> #include "libmedia_playback.h" #include "libmedia_record.h" diff --git a/pts/audio/brillo-audio-test/libmedia_playback.cpp b/pts/audio/brillo-audio-test/libmedia_playback.cpp index fa1d380..3054458 100644 --- a/pts/audio/brillo-audio-test/libmedia_playback.cpp +++ b/pts/audio/brillo-audio-test/libmedia_playback.cpp @@ -16,7 +16,7 @@ #include "libmedia_playback.h" -#include <base/logging.h> +#include <android-base/logging.h> #include <media/AudioTrack.h> #include <media/stagefright/MediaSource.h> diff --git a/pts/audio/brillo-audio-test/libmedia_record.cpp b/pts/audio/brillo-audio-test/libmedia_record.cpp index 82f36b5..09923fe 100644 --- a/pts/audio/brillo-audio-test/libmedia_record.cpp +++ b/pts/audio/brillo-audio-test/libmedia_record.cpp @@ -16,7 +16,7 @@ #include "libmedia_record.h" -#include <base/logging.h> +#include <android-base/logging.h> #include <media/AudioRecord.h> #include <media/AudioTrack.h> diff --git a/pts/audio/brillo-audio-test/stagefright_playback.cpp b/pts/audio/brillo-audio-test/stagefright_playback.cpp index fd410c9..7e8b285 100644 --- a/pts/audio/brillo-audio-test/stagefright_playback.cpp +++ b/pts/audio/brillo-audio-test/stagefright_playback.cpp @@ -16,7 +16,7 @@ #include "stagefright_playback.h" -#include <base/logging.h> +#include <android-base/logging.h> #include <media/stagefright/AudioPlayer.h> #include <media/stagefright/DataSource.h> #include <media/stagefright/FileSource.h> diff --git a/pts/audio/brillo-audio-test/stagefright_record.cpp b/pts/audio/brillo-audio-test/stagefright_record.cpp index aca4389..a4bca2b 100644 --- a/pts/audio/brillo-audio-test/stagefright_record.cpp +++ b/pts/audio/brillo-audio-test/stagefright_record.cpp @@ -16,7 +16,7 @@ #include "stagefright_record.h" -#include <base/logging.h> +#include <android-base/logging.h> #include <binder/ProcessState.h> #include <media/stagefright/AudioPlayer.h> #include <media/stagefright/AudioSource.h> |