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

Commit 793075b3 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Add misc apct perf tests"

parents d3ca5980 51dd1e51

apct-tests/perftests/core/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

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



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

LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    apct-perftests-utils



LOCAL_PACKAGE_NAME := CorePerfTests

apct-tests/perftests/core/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.core.frameworks.perftests">

    package="android.core.perftests">



    <application>

        <uses-library android:name="android.test.runner" />
@@ -8,6 +8,6 @@ 
    </application>



    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.android.core.frameworks.perftests"/>

        android:targetPackage="android.core.perftests"/>



</manifest>

apct-tests/perftests/core/src/android/widget/LayoutPerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.support.test.rule.ActivityTestRule; 
import android.view.View;

import android.view.ViewGroup;



import com.android.core.frameworks.perftests.R;

import android.core.perftests.R;



import org.junit.Rule;

import org.junit.Test;

apct-tests/perftests/graphics/Android.mk

+4 −2
Original line number Diff line number Diff line
@@ -3,11 +3,13 @@ include $(CLEAR_VARS) 


LOCAL_MODULE_TAGS := tests



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



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

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



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    apct-perftests-utils



LOCAL_PACKAGE_NAME := GraphicsPerfTests



include $(BUILD_PACKAGE)

apct-tests/perftests/graphics/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.frameworks.perftests">

    package="android.graphics.perftests">



    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -16,6 +16,6 @@ 
    </application>



    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.android.frameworks.perftests"/>

        android:targetPackage="android.graphics.perftests"/>



</manifest>