commit 202c10b7b54a7a344415b19d4c3f93266de4ad25
author sergeyv <sergeyv@google.com> Mon Jul 11 17:53:45 2016 -0700
committer sergeyv <sergeyv@google.com> Tue Jul 12 14:36:23 2016 -0700
tree aa4039c16fab171d9d64d05fe5b44fd4f9ab3813
parent 807cf8699a16085ffc9c060420b8d2175283be10

Move hwuimacro to common native benchmark infrastructure

Change-Id: I2d2b358d205b1ed950ddc9caa57360b68001893b

libs/hwui/Android.mk

diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index 95b28d3..eaea051 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -283,19 +283,15 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/local/tmp
-LOCAL_MODULE:= hwuitest
+LOCAL_MODULE:= hwuimacro
 LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_MULTILIB := both
-LOCAL_MODULE_STEM_32 := hwuitest
-LOCAL_MODULE_STEM_64 := hwuitest64
 LOCAL_CFLAGS := $(hwui_cflags)
 LOCAL_C_INCLUDES := $(hwui_c_includes)
 
 # set to libhwui_static_debug to skip actual GL commands
 LOCAL_WHOLE_STATIC_LIBRARIES := libhwui_static
 LOCAL_SHARED_LIBRARIES := libmemunreachable
-LOCAL_STATIC_LIBRARIES := libgoogle-benchmark
 
 LOCAL_SRC_FILES += \
     $(hwui_test_common_src_files) \
@@ -303,7 +299,7 @@
     tests/macrobench/main.cpp
 
 include $(LOCAL_PATH)/hwui_static_deps.mk
-include $(BUILD_EXECUTABLE)
+include $(BUILD_NATIVE_BENCHMARK)
 
 # ------------------------
 # Micro-bench app