commit d88dfe8607af019186a309674d9081a056ed3daa
author Mark Salyzyn <salyzyn@google.com> Tue Apr 11 08:56:09 2017 -0700
committer Mark Salyzyn <salyzyn@google.com> Tue Apr 11 10:50:06 2017 -0700
tree f25e5b360739e6791624fe5061e73e0d0d373c8e
parent f08d9dff190ffc1b479bede0b6037cfb1a9cb7fa

libhardware: deprecate cutils/log.h

Replace cutils/log.h with log/log.h. Sort headers. Minimize conflicts.
Add missing required headers.

Test: compile
Bug: 34250038
Change-Id: I5c0f231cbfed90b73e0538c9d32ad3226c7cc5e4

modules/camera/CameraHAL.cpp

diff --git a/modules/camera/CameraHAL.cpp b/modules/camera/CameraHAL.cpp
index e395ce5..2d1d763 100644
--- a/modules/camera/CameraHAL.cpp
+++ b/modules/camera/CameraHAL.cpp
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+//#define LOG_NDEBUG 0
+#define LOG_TAG "DefaultCameraHAL"
 
 #include <cstdlib>
+
+#include <log/log.h>
+#define ATRACE_TAG (ATRACE_TAG_CAMERA | ATRACE_TAG_HAL)
+#include <cutils/trace.h>
+
 #include <hardware/camera_common.h>
 #include <hardware/hardware.h>
 #include "ExampleCamera.h"
 #include "VendorTags.h"
 
-//#define LOG_NDEBUG 0
-#define LOG_TAG "DefaultCameraHAL"
-#include <cutils/log.h>
-
-#define ATRACE_TAG (ATRACE_TAG_CAMERA | ATRACE_TAG_HAL)
-#include <cutils/trace.h>
-
 #include "CameraHAL.h"
 
 /*