commit 1994925f8874a17f917d3528ea2e80c585785b08
author Dan Austin <danielaustin@google.com> Sat Apr 23 05:48:42 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Apr 23 05:48:42 2016 +0000
tree 19ee31a72a74fb473a56c9ce2db97a3b3932e52d
parent e6f184de2e7afe96fa9f86b479b048a2d3af71ee
parent 438a86130d02c5a6fb71367ba8681f36c53531d2

Merge "Perform typecast to disambiguate the call to abs in preparation for libcxx rebase."

msm8084/libhwcomposer/hwc_uevents.cpp

diff --git a/msm8084/libhwcomposer/hwc_uevents.cpp b/msm8084/libhwcomposer/hwc_uevents.cpp
index 062bfc6..4a7b8e7 100644
--- a/msm8084/libhwcomposer/hwc_uevents.cpp
+++ b/msm8084/libhwcomposer/hwc_uevents.cpp
@@ -72,7 +72,7 @@
     const char* iter_str = strUdata;
     if (strcasestr("change@/devices/virtual/graphics/fb0", strUdata)) {
         while(((iter_str - strUdata) <= len) && (*iter_str)) {
-            char* pstr = strstr(iter_str, "PANEL_ALIVE=0");
+            const char* pstr = strstr(iter_str, "PANEL_ALIVE=0");
             if (pstr != NULL) {
                 ALOGI("%s: got change event in fb0 with PANEL_ALIVE=0",
                                                            __FUNCTION__);
@@ -90,7 +90,7 @@
 {
     const char* iter_str = strUdata;
     while(((iter_str - strUdata) <= len) && (*iter_str)) {
-        char* pstr = strstr(iter_str, "SWITCH_STATE=");
+        const char* pstr = strstr(iter_str, "SWITCH_STATE=");
         if (pstr != NULL) {
             return (atoi(pstr + strlen("SWITCH_STATE=")));
         }

msm8084/libvirtual/Android.mk

diff --git a/msm8084/libvirtual/Android.mk b/msm8084/libvirtual/Android.mk
index beeef25..0df7b39 100644
--- a/msm8084/libvirtual/Android.mk
+++ b/msm8084/libvirtual/Android.mk
@@ -6,7 +6,7 @@
 LOCAL_MODULE_PATH             := $(TARGET_OUT_SHARED_LIBRARIES)
 LOCAL_MODULE_TAGS             := optional
 LOCAL_C_INCLUDES              := $(common_includes) $(kernel_includes)
-LOCAL_SHARED_LIBRARIES        := $(common_libs) liboverlay libqdutils
+LOCAL_SHARED_LIBRARIES        := $(common_libs) liboverlay libqdutils libmedia
 LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"qdvirtual\"
 LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
 LOCAL_SRC_FILES               := virtual.cpp

msm8960/libexternal/Android.mk

diff --git a/msm8960/libexternal/Android.mk b/msm8960/libexternal/Android.mk
index f723113..9200478 100644
--- a/msm8960/libexternal/Android.mk
+++ b/msm8960/libexternal/Android.mk
@@ -6,7 +6,7 @@
 LOCAL_MODULE_PATH             := $(TARGET_OUT_SHARED_LIBRARIES)
 LOCAL_MODULE_TAGS             := optional
 LOCAL_C_INCLUDES              := $(common_includes) $(kernel_includes)
-LOCAL_SHARED_LIBRARIES        := $(common_libs) liboverlay
+LOCAL_SHARED_LIBRARIES        := $(common_libs) liboverlay libmedia
 LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"qdexternal\"
 LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
 LOCAL_SRC_FILES               := external.cpp

msm8974/libexternal/Android.mk

diff --git a/msm8974/libexternal/Android.mk b/msm8974/libexternal/Android.mk
index a82037a..228ebfc 100644
--- a/msm8974/libexternal/Android.mk
+++ b/msm8974/libexternal/Android.mk
@@ -6,7 +6,7 @@
 LOCAL_MODULE_PATH             := $(TARGET_OUT_SHARED_LIBRARIES)
 LOCAL_MODULE_TAGS             := optional
 LOCAL_C_INCLUDES              := $(common_includes) $(kernel_includes)
-LOCAL_SHARED_LIBRARIES        := $(common_libs)
+LOCAL_SHARED_LIBRARIES        := $(common_libs) libmedia
 LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"qdexternal\"
 LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
 LOCAL_SRC_FILES               := external.cpp