Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dbad030 authored by Tenghui Zhu's avatar Tenghui Zhu Committed by Android (Google) Code Review
Browse files

Merge "Refactor the java side APCT perf test"

parents 623c48cc 23d1fdde

core/tests/perftests/Android.mk→apct-tests/perftests/core/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := tests 


LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_STATIC_JAVA_LIBRARIES := android-support-test

LOCAL_STATIC_JAVA_LIBRARIES := android-support-test apct-perftests-utils



LOCAL_PACKAGE_NAME := CorePerfTests

core/tests/perftests/src/android/widget/TextViewSetTextLocalePerfTest.java→apct-tests/perftests/core/src/android/widget/TextViewSetTextLocalePerfTest.java

+2 −6
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ import android.app.Activity; 
import android.os.Bundle;

import android.util.Log;



import android.perftest.BenchmarkState;



import android.perftests.utils.BenchmarkState;

import android.support.test.filters.LargeTest;

import android.support.test.runner.AndroidJUnit4;

import android.support.test.rule.ActivityTestRule;
@@ -74,9 +73,6 @@ public class TextViewSetTextLocalePerfTest { 
            textView.setTextLocale(mSecondLocale);

        }



        Log.i("TextViewSetTextLocalePerfTest", mMetricKey + ": " + state.summaryLine());

        final Bundle status = new Bundle();

        status.putLong(mMetricKey, state.median());

        InstrumentationRegistry.getInstrumentation().sendStatus(Activity.RESULT_OK, status);

        state.sendFullStatusReport(InstrumentationRegistry.getInstrumentation(), mMetricKey);

    }

}

graphics/tests/perftests/Android.mk→apct-tests/perftests/graphics/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ include $(CLEAR_VARS) 


LOCAL_MODULE_TAGS := tests



LOCAL_STATIC_JAVA_LIBRARIES := apct-perftests-utils



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

LOCAL_SRC_FILES := $(call all-java-files-under, src)