Merge "Fix warnings in hwiu test app"

libs/hwui/tests/Android.mk

@@ -20,6 +20,7 @@ include $(CLEAR_VARS)
 
 LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER -DEGL_EGLEXT_PROTOTYPES -DGL_GLEXT_PROTOTYPES
 LOCAL_CFLAGS += -DATRACE_TAG=ATRACE_TAG_VIEW -DLOG_TAG=\"OpenGLRenderer\"
+LOCAL_CFLAGS += -Wno-unused-parameter
 
 LOCAL_SRC_FILES:= \
 	TestContext.cpp \

libs/hwui/tests/main.cpp

@@ -111,7 +111,7 @@ int main(int argc, char* argv[]) {
 
     for (int i = 0; i < 150; i++) {
         ATRACE_NAME("UI-Draw Frame");
-        for (int ci = 0; ci < cards.size(); ci++) {
+        for (size_t ci = 0; ci < cards.size(); ci++) {
             cards[ci]->mutateStagingProperties().setTranslationX(i);
             cards[ci]->mutateStagingProperties().setTranslationY(i);
             cards[ci]->setPropertyFieldsDirty(RenderNode::X | RenderNode::Y);