Camera: Clarify camera ID selection logic for logical camera
am: 1a5092e964
Change-Id: Ifda594d989fe083a6711fec65fec4d3fa67267b5
diff --git a/audio/Android.bp b/audio/Android.bp
index 68043da..bda39b4 100644
--- a/audio/Android.bp
+++ b/audio/Android.bp
@@ -16,7 +16,7 @@
enabled: true,
},
vendor: {
- cflags: ["AUDIO_NO_SYSTEM_DECLARATIONS"],
+ cflags: ["-DAUDIO_NO_SYSTEM_DECLARATIONS"],
},
}
}
diff --git a/audio_utils/fifo.cpp b/audio_utils/fifo.cpp
index 883a9c0..7ac17da 100644
--- a/audio_utils/fifo.cpp
+++ b/audio_utils/fifo.cpp
@@ -26,7 +26,7 @@
#include <audio_utils/fifo.h>
#include <audio_utils/futex.h>
#include <audio_utils/roundup.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <utils/Errors.h>
audio_utils_fifo_base::audio_utils_fifo_base(uint32_t frameCount,
diff --git a/audio_utils/spdif/AC3FrameScanner.cpp b/audio_utils/spdif/AC3FrameScanner.cpp
index 4055bb0..6ebe9e3 100644
--- a/audio_utils/spdif/AC3FrameScanner.cpp
+++ b/audio_utils/spdif/AC3FrameScanner.cpp
@@ -18,7 +18,7 @@
#include <string.h>
-#include <utils/Log.h>
+#include <log/log.h>
#include <audio_utils/spdif/FrameScanner.h>
#include "AC3FrameScanner.h"
diff --git a/audio_utils/spdif/BitFieldParser.cpp b/audio_utils/spdif/BitFieldParser.cpp
index 8f1c11e..3d3642b 100644
--- a/audio_utils/spdif/BitFieldParser.cpp
+++ b/audio_utils/spdif/BitFieldParser.cpp
@@ -20,7 +20,7 @@
#include <string.h>
#include <assert.h>
-#include <utils/Log.h>
+#include <log/log.h>
#include "BitFieldParser.h"
namespace android {
diff --git a/audio_utils/spdif/DTSFrameScanner.cpp b/audio_utils/spdif/DTSFrameScanner.cpp
index 944f4a7..408f1b4 100644
--- a/audio_utils/spdif/DTSFrameScanner.cpp
+++ b/audio_utils/spdif/DTSFrameScanner.cpp
@@ -20,7 +20,7 @@
#include <assert.h>
#include <string.h>
-#include <utils/Log.h>
+#include <log/log.h>
#include <audio_utils/spdif/FrameScanner.h>
#include "BitFieldParser.h"
diff --git a/audio_utils/spdif/FrameScanner.cpp b/audio_utils/spdif/FrameScanner.cpp
index 2b591e3..81de943 100644
--- a/audio_utils/spdif/FrameScanner.cpp
+++ b/audio_utils/spdif/FrameScanner.cpp
@@ -19,7 +19,7 @@
#include <string.h>
#include <assert.h>
-#include <utils/Log.h>
+#include <log/log.h>
#include <audio_utils/spdif/FrameScanner.h>
namespace android {
diff --git a/audio_utils/spdif/SPDIFEncoder.cpp b/audio_utils/spdif/SPDIFEncoder.cpp
index 5c62299..250f961 100644
--- a/audio_utils/spdif/SPDIFEncoder.cpp
+++ b/audio_utils/spdif/SPDIFEncoder.cpp
@@ -18,7 +18,7 @@
#include <string.h>
#define LOG_TAG "AudioSPDIF"
-#include <utils/Log.h>
+#include <log/log.h>
#include <audio_utils/spdif/SPDIFEncoder.h>
#include "AC3FrameScanner.h"
