diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-06-03 18:57:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-03 18:57:01 +0000 |
| commit | 0f68f48b8239fec958feecd0aec863e6bab84a93 (patch) | |
| tree | 2ac1e937c56bdc30e5673073e7ec7c4ed5c90c56 /apct-tests/perftests/multiuser | |
| parent | 2151e647507d81ac0aae665270a0a6539c463d60 (diff) | |
| parent | 8bdf3a63a7561ae91e93eb15c8fd53347fb257f1 (diff) | |
Merge "PerftestMultiuserDummyApp > MultiUserPerfDummyApp"
Diffstat (limited to 'apct-tests/perftests/multiuser')
| -rw-r--r-- | apct-tests/perftests/multiuser/AndroidTest.xml | 2 | ||||
| -rw-r--r-- | apct-tests/perftests/multiuser/apps/Android.mk | 20 | ||||
| -rw-r--r-- | apct-tests/perftests/multiuser/apps/dummyapp/Android.bp | 2 |
3 files changed, 2 insertions, 22 deletions
diff --git a/apct-tests/perftests/multiuser/AndroidTest.xml b/apct-tests/perftests/multiuser/AndroidTest.xml index d8e3f0102c35..9117561fe1e5 100644 --- a/apct-tests/perftests/multiuser/AndroidTest.xml +++ b/apct-tests/perftests/multiuser/AndroidTest.xml @@ -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" > diff --git a/apct-tests/perftests/multiuser/apps/Android.mk b/apct-tests/perftests/multiuser/apps/Android.mk deleted file mode 100644 index e01225bfc4fa..000000000000 --- a/apct-tests/perftests/multiuser/apps/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -# 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)) diff --git a/apct-tests/perftests/multiuser/apps/dummyapp/Android.bp b/apct-tests/perftests/multiuser/apps/dummyapp/Android.bp index 73b2a0143e5b..08c54a60a290 100644 --- a/apct-tests/perftests/multiuser/apps/dummyapp/Android.bp +++ b/apct-tests/perftests/multiuser/apps/dummyapp/Android.bp @@ -13,7 +13,7 @@ // limitations under the License. android_test_helper_app { - name: "PerftestMultiuserDummyApp", + name: "MultiUserPerfDummyApp", srcs: ["src/**/*.java"], |