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

Commit 0f68f48b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "PerftestMultiuserDummyApp > MultiUserPerfDummyApp"

parents 2151e647 8bdf3a63
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@
    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
        <option name="cleanup-apks" value="true" />
        <option name="test-file-name" value="MultiUserPerfTests.apk" />
        <option name="test-file-name" value="PerftestMultiuserDummyApp.apk" />
        <option name="test-file-name" value="MultiUserPerfDummyApp.apk" />
    </target_preparer>

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+0 −20
Original line number Diff line number Diff line
# Copyright (C) 2019 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#      http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

# Build the test APKs using their own makefiles
include $(call all-makefiles-under,$(LOCAL_PATH))
+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@
// limitations under the License.

android_test_helper_app {
    name: "PerftestMultiuserDummyApp",
    name: "MultiUserPerfDummyApp",

    srcs: ["src/**/*.java"],