msm8998: deprecate cutils/log.h

Replace cutils/log.h with log/log.h.  Fix up header ordering.

Test: compile
Bug: 34250038
Change-Id: Ib9d9f9919e6a220205014c2f720f7b9633e1bc87

msm8909/libgralloc/gpu.h

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include "gralloc_priv.h"
 #include "fb_priv.h"

msm8996/libgralloc/framebuffer.cpp

@@ -15,31 +15,28 @@
  * limitations under the License.
  */
 
-#include <sys/mman.h>
-
-#include <cutils/log.h>
-#include <cutils/properties.h>
 #include <dlfcn.h>
-
-#include <hardware/hardware.h>
-
-#include <fcntl.h>
 #include <errno.h>
-#include <sys/ioctl.h>
-#include <string.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include <cutils/atomic.h>
-
+#include <fcntl.h>
 #include <linux/fb.h>
 #include <linux/msm_mdp.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+
+#include <cutils/atomic.h>
+#include <cutils/properties.h>
+#include <log/log.h>
+
+#include <hardware/hardware.h>
 
 #include <GLES/gl.h>
 
 #include "gralloc_priv.h"
 #include "fb_priv.h"
 #include "gr.h"
-#include <cutils/properties.h>
 #include <profiler.h>
 
 #define EVEN_OUT(x) if (x & 0x0001) {x--;}

msm8996/libgralloc/ionalloc.cpp

@@ -29,13 +29,19 @@
 
 #define DEBUG 0
 #define ATRACE_TAG (ATRACE_TAG_GRAPHICS | ATRACE_TAG_HAL)
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <cutils/log.h>
-#include <errno.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <cutils/trace.h>
+#include <log/log.h>
 #include <utils/Trace.h>
+
 #include "gralloc_priv.h"
 #include "ionalloc.h"
 

msm8996/libgralloc/mapper.cpp

@@ -16,20 +16,20 @@
  */
 
 #define ATRACE_TAG (ATRACE_TAG_GRAPHICS | ATRACE_TAG_HAL)
-#include <limits.h>
-#include <errno.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdarg.h>
 
+#include <errno.h>
+#include <limits.h>
+#include <pthread.h>
+#include <stdarg.h>
+#include <string.h>
+#include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/ioctl.h>
+#include <unistd.h>
 
-#include <cutils/log.h>
 #include <cutils/atomic.h>
+#include <log/log.h>
 #include <utils/Trace.h>
 
 #include <hardware/hardware.h>
@@ -43,7 +43,6 @@
 #include "memalloc.h"
 #include <qdMetaData.h>
 
-
 using namespace gralloc;
 /*****************************************************************************/
 

msm8996/sdm/libs/hwc/hwc_debugger.h

@@ -32,11 +32,13 @@
 
 #define ATRACE_TAG (ATRACE_TAG_GRAPHICS | ATRACE_TAG_HAL)
 
+#include <bitset>
+
+#include <log/log.h>
+#include <utils/Trace.h>
+
 #include <core/sdm_types.h>
 #include <core/debug_interface.h>
-#include <cutils/log.h>
-#include <utils/Trace.h>
-#include <bitset>
 
 namespace sdm {
 

msm8998/hdmi_cec/qhdmi_cec.cpp

@@ -29,12 +29,16 @@
 
 #define DEBUG 0
 #define ATRACE_TAG (ATRACE_TAG_GRAPHICS | ATRACE_TAG_HAL)
-#include <cstdlib>
-#include <cutils/log.h>
+
 #include <errno.h>
 #include <fcntl.h>
-#include <hardware/hdmi_cec.h>
+
+#include <cstdlib>
+
+#include <log/log.h>
 #include <utils/Trace.h>
+
+#include <hardware/hdmi_cec.h>
 #include "qhdmi_cec.h"
 #include "QHDMIClient.h"
 

msm8998/libcopybit/copybit.cpp

@@ -18,20 +18,18 @@
  * limitations under the License.
  */
 
-#include <cutils/log.h>
-
-#include <linux/msm_mdp.h>
-#include <linux/fb.h>
-
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-
+#include <linux/msm_mdp.h>
+#include <linux/fb.h>
+#include <stdint.h>
+#include <string.h>
 #include <sys/ioctl.h>
-#include <sys/types.h>
 #include <sys/mman.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <log/log.h>
 
 #include <copybit.h>
 

msm8998/libcopybit/copybit_c2d.cpp

@@ -17,24 +17,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <cutils/log.h>
-#include <sys/resource.h>
-#include <sys/prctl.h>
 
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
+#include <dlfcn.h>
 #include <errno.h>
 #include <fcntl.h>
-
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-
 #include <linux/msm_kgsl.h>
+#include <stdint.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/prctl.h>
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <cutils/native_handle.h>
+#include <log/log.h>
 
 #include <EGL/eglplatform.h>
-#include <cutils/native_handle.h>
 
 #include <copybit.h>
 #include <alloc_controller.h>
@@ -43,8 +43,6 @@
 #include "c2d2.h"
 #include "software_converter.h"
 
-#include <dlfcn.h>
-
 using gralloc::IMemAlloc;
 using gralloc::IonController;
 using gralloc::alloc_data;

msm8998/libcopybit/software_converter.cpp

@@ -27,9 +27,11 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <cutils/log.h>
-#include <stdlib.h>
 #include <errno.h>
+#include <stdlib.h>
+
+#include <log/log.h>
+
 #include "software_converter.h"
 
 /** Convert YV12 to YCrCb_420_SP */

msm8998/libgralloc/gralloc_priv.h

@@ -18,12 +18,11 @@
 #ifndef GRALLOC_PRIV_H_
 #define GRALLOC_PRIV_H_
 
-#include <stdint.h>
-#include <limits.h>
-#include <sys/cdefs.h>
-#include <hardware/gralloc.h>
-#include <pthread.h>
 #include <errno.h>
+#include <limits.h>
+#include <pthread.h>
+#include <stdint.h>
+#include <sys/cdefs.h>
 #include <unistd.h>
 
 
@@ -35,8 +34,9 @@
 
 
 #include <cutils/native_handle.h>
+#include <log/log.h>
 
-#include <cutils/log.h>
+#include <hardware/gralloc.h>
 
 #define ROUND_UP_PAGESIZE(x) (unsigned int)( ((x) + getpagesize()-1)  & \
                                              (~(getpagesize()-1)) )

msm8998/libgralloc1/gr_adreno_info.cpp

@@ -27,11 +27,11 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <dlfcn.h>
 #include <string.h>
 
-#include <cutils/log.h>
 #include <cutils/properties.h>
-#include <dlfcn.h>
+#include <log/log.h>
 
 #include "gralloc_priv.h"
 #include "gr_adreno_info.h"

msm8998/libgralloc1/gr_allocator.cpp

@@ -27,10 +27,13 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <cutils/log.h>
+#include <unistd.h>
+
 #include <algorithm>
 #include <vector>
 
+#include <log/log.h>
+
 #include "gr_utils.h"
 #include "gr_allocator.h"
 #include "gr_adreno_info.h"

msm8998/libgralloc1/gr_device_impl.cpp

@@ -28,14 +28,17 @@
  */
 
 #define ATRACE_TAG (ATRACE_TAG_GRAPHICS | ATRACE_TAG_HAL)
-#include <cutils/log.h>
-#include <utils/Trace.h>
-#include <cutils/trace.h>
+#include <string.h>
 #include <sync/sync.h>
+
 #include <algorithm>
 #include <sstream>
 #include <string>
 
+#include <cutils/trace.h>
+#include <log/log.h>
+#include <utils/Trace.h>
+
 #include "gr_device_impl.h"
 #include "gr_buf_descriptor.h"
 #include "gralloc_priv.h"

msm8998/libgralloc1/gr_ion_alloc.cpp

@@ -29,15 +29,20 @@
 
 #define DEBUG 0
 #define ATRACE_TAG (ATRACE_TAG_GRAPHICS | ATRACE_TAG_HAL)
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <cutils/log.h>
-#include <errno.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <string>
+
+#include <log/log.h>
 #include <utils/Trace.h>
 #include <cutils/trace.h>
-#include <string>
 
 #include "gralloc_priv.h"
 #include "gr_utils.h"

msm8998/libgralloc1/gr_priv_handle.h

@@ -21,8 +21,10 @@
 #define __GR_PRIV_HANDLE_H__
 
 #include <errno.h>
+#include <stdint.h>
+
+#include <log/log.h>
 
-#include <cutils/log.h>
 #include <hardware/gralloc1.h>
 #include <hardware/gralloc.h>
 #include <cinttypes>

msm8998/libqdutils/profiler.h

@@ -31,9 +31,10 @@
 #define INCLUDE_PROFILER
 
 #include <stdio.h>
-#include <utils/Singleton.h>
+
 #include <cutils/properties.h>
-#include <cutils/log.h>
+#include <log/log.h>
+#include <utils/Singleton.h>
 
 #ifndef DEBUG_CALC_FPS
 #define CALC_FPS() ((void)0)

msm8998/libqservice/QService.h

@@ -30,10 +30,13 @@
 #ifndef ANDROID_QSERVICE_H
 #define ANDROID_QSERVICE_H
 
-#include <utils/Errors.h>
+#include <stdint.h>
 #include <sys/types.h>
-#include <cutils/log.h>
+
 #include <binder/IServiceManager.h>
+#include <log/log.h>
+#include <utils/Errors.h>
+
 #include <IQService.h>
 #include <IQClient.h>