commit 0418afa362630e69bd853121770b115750ee46a4
author John Reck <jreck@google.com> Mon Mar 07 13:24:25 2016 -0800
committer John Reck <jreck@google.com> Mon Mar 07 13:42:11 2016 -0800
tree cd403e93f5369c0118d3abd5753754ddb6faa347
parent cea711916d8c59de7174ec949360f0331c6e98ce

Switch hwui to google-benchmark

Change-Id: Ia2b24b8288cb8dc4f9176f4132a24ddcae9b6edd

libs/hwui/Android.mk

diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index 70995ac..1430709 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -303,13 +303,13 @@
 LOCAL_CFLAGS := \
         $(hwui_cflags) \
         -DHWUI_NULL_GPU
-LOCAL_C_INCLUDES += bionic/benchmarks/
 
 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 \