| commit | 4e7a3077309d33a21b08e9380573019cc7a8cffb | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Thu Apr 06 12:15:23 2017 -0700 |
| committer | Steven Moreland <smoreland@google.com> | Thu Apr 06 22:04:05 2017 +0000 |
| tree | 2efcdaaefc18ef56bc6e5b8ac4ff72199a78646d | |
| parent | 69571ba233d8da5b5d8e9fd6704b65f916363926 [diff] |
Fix transitive includes. Files relying on transitive include of utils/Log.h (and things that it includes) from MQDescriptor.h Test: pass Merged-In: Iff316b21bef556bb026378b7f89e97ded3febef4 Change-Id: Iff316b21bef556bb026378b7f89e97ded3febef4
diff --git a/camera/common/1.0/default/CameraMetadata.cpp b/camera/common/1.0/default/CameraMetadata.cpp index 44c2040..0e7ef6e 100644 --- a/camera/common/1.0/default/CameraMetadata.cpp +++ b/camera/common/1.0/default/CameraMetadata.cpp
@@ -17,7 +17,7 @@ // #define LOG_NDEBUG 0 #define LOG_TAG "CamComm1.0-MD" -#include <utils/Log.h> +#include <log/log.h> #include <utils/Errors.h> #include "CameraMetadata.h"
diff --git a/camera/common/1.0/default/HandleImporter.cpp b/camera/common/1.0/default/HandleImporter.cpp index dee2973..e22f26f 100644 --- a/camera/common/1.0/default/HandleImporter.cpp +++ b/camera/common/1.0/default/HandleImporter.cpp
@@ -15,8 +15,8 @@ */ #define LOG_TAG "HandleImporter" -#include <utils/Log.h> #include "HandleImporter.h" +#include <log/log.h> namespace android { namespace hardware {
diff --git a/camera/common/1.0/default/VendorTagDescriptor.cpp b/camera/common/1.0/default/VendorTagDescriptor.cpp index db884a8..bc18270 100644 --- a/camera/common/1.0/default/VendorTagDescriptor.cpp +++ b/camera/common/1.0/default/VendorTagDescriptor.cpp
@@ -16,13 +16,13 @@ #define LOG_TAG "CamComm1.0-VTDesc" -#include <utils/Errors.h> -#include <utils/Log.h> -#include <utils/Mutex.h> -#include <utils/Vector.h> -#include <utils/SortedVector.h> +#include <log/log.h> #include <system/camera_metadata.h> #include <camera_metadata_hidden.h> +#include <utils/Errors.h> +#include <utils/Mutex.h> +#include <utils/SortedVector.h> +#include <utils/Vector.h> #include "VendorTagDescriptor.h"