diff options
| author | 2016-06-21 00:16:34 +0000 | |
|---|---|---|
| committer | 2016-06-21 00:16:36 +0000 | |
| commit | 0e7b11f829a252d301e1e758c6370c346b24e15d (patch) | |
| tree | fd1daee1c185f032f114e26c6e17104b43083fa3 | |
| parent | 184f2e251e0feb5585bb34825bca6a02db7ea491 (diff) | |
| parent | 422e2b4829e28e422f0010e0e3ce04f45fb9efd8 (diff) | |
Merge "HWUI: move microbench to APCT infrastructure"
| -rw-r--r-- | libs/hwui/Android.mk | 8 | ||||
| -rwxr-xr-x | libs/hwui/tests/microbench/how_to_run.txt | 5 |
2 files changed, 3 insertions, 10 deletions
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk index 8ce5d4c851ae..12e46cd31554 100644 --- a/libs/hwui/Android.mk +++ b/libs/hwui/Android.mk @@ -323,13 +323,8 @@ include $(BUILD_EXECUTABLE) # --------------------- include $(CLEAR_VARS) -LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/local/tmp LOCAL_MODULE:= hwuimicro LOCAL_MODULE_TAGS := tests -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MULTILIB := both -LOCAL_MODULE_STEM_32 := hwuimicro -LOCAL_MODULE_STEM_64 := hwuimicro64 LOCAL_CFLAGS := \ $(hwui_cflags) \ -include debug/wrap_gles.h \ @@ -338,7 +333,6 @@ LOCAL_CFLAGS := \ LOCAL_C_INCLUDES := $(hwui_c_includes) LOCAL_WHOLE_STATIC_LIBRARIES := libhwui_static_debug -LOCAL_STATIC_LIBRARIES := libgoogle-benchmark LOCAL_SHARED_LIBRARIES := libmemunreachable LOCAL_SRC_FILES += \ @@ -357,4 +351,4 @@ ifeq (true, $(HWUI_NEW_OPS)) endif include $(LOCAL_PATH)/hwui_static_deps.mk -include $(BUILD_EXECUTABLE) +include $(BUILD_NATIVE_BENCHMARK) diff --git a/libs/hwui/tests/microbench/how_to_run.txt b/libs/hwui/tests/microbench/how_to_run.txt index e6f80b278276..915fe5d959f9 100755 --- a/libs/hwui/tests/microbench/how_to_run.txt +++ b/libs/hwui/tests/microbench/how_to_run.txt @@ -1,4 +1,3 @@ mmm -j8 frameworks/base/libs/hwui && -adb push $ANDROID_PRODUCT_OUT/data/local/tmp/hwuimicro \ - /data/local/tmp/hwuimicro && - adb shell /data/local/tmp/hwuimicro +adb push $OUT/data/benchmarktest/hwuimicro/hwuimicro /data/benchmarktest/hwuimicro/hwuimicro && +adb shell /data/benchmarktest/hwuimicro/hwuimicro |