release-request-ff422c3c-f322-4fd6-8018-3005297c3ce9-for-git_oc-mr1-iot-release-4351313 snap-temp-L99900000104754319
Change-Id: Ic603f7228748428bf4ecc7d4aa370122e49b8504
diff --git a/src/gallium/drivers/vc4/vc4_resource.c b/src/gallium/drivers/vc4/vc4_resource.c
index e4784ff..c18d1d6 100644
--- a/src/gallium/drivers/vc4/vc4_resource.c
+++ b/src/gallium/drivers/vc4/vc4_resource.c
@@ -22,6 +22,8 @@
* IN THE SOFTWARE.
*/
+#define LOG_TAG "vc4_resource"
+#include <cutils/log.h>
#include "util/u_blit.h"
#include "util/u_memory.h"
#include "util/u_format.h"
@@ -590,7 +592,7 @@
static bool warned = false;
if (!warned) {
warned = true;
- fprintf(stderr,
+ ALOGW(
"Attempting to import %dx%d %s with "
"unsupported stride %d instead of %d\n",
prsc->width0, prsc->height0,
@@ -598,7 +600,6 @@
handle->stride,
expected_stride);
}
- goto fail;
}
rsc->tiled = false;
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index 2ca708e..25d7f4b 100644
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -34,6 +34,7 @@
LOCAL_SHARED_LIBRARIES := \
libdl \
+ liblog \
libglapi \
libexpat \
