commit 2bee0dd94418c8d6f48dbd9d83af7dd67717d3ff
author John Reck <jreck@google.com> Wed Mar 09 08:01:37 2016 -0800
committer John Reck <jreck@google.com> Wed Mar 09 08:01:37 2016 -0800
tree 0012999776ee637b910d8c7ae9a6f19331ca49f8
parent 2e52ac1ecca2227849fbf19b7e8abfbb9fdd0e9c
parent 77bf1bb928a448ca44a03026b2c8c1539691b70c

resolve merge conflicts of 77bf1bb928 to nyc-dev-plus-aosp

Change-Id: Ia876298e41f42af1fd0c3f9832468e03ea9129bc

libs/hwui/Android.mk

diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index 70d4344..e248780 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -304,15 +304,15 @@
 LOCAL_CFLAGS := \
         $(hwui_cflags) \
         -DHWUI_NULL_GPU
-LOCAL_C_INCLUDES += \
-        bionic/benchmarks/ \
-        $(hwui_c_includes)
+
+LOCAL_C_INCLUDES := $(hwui_c_includes)
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libhwui_static_null_gpu
-LOCAL_STATIC_LIBRARIES := libbenchmark libbase
+LOCAL_STATIC_LIBRARIES := libgoogle-benchmark
 
 LOCAL_SRC_FILES += \
     $(hwui_test_common_src_files) \
+    tests/microbench/main.cpp \
     tests/microbench/DisplayListCanvasBench.cpp \
     tests/microbench/LinearAllocatorBench.cpp \
     tests/microbench/PathParserBench.cpp \