diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-22 05:32:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-22 05:32:58 +0000 |
| commit | 7d1f25b8ca7cfae83163d3dbbb9541ae473208a3 (patch) | |
| tree | 0ee1efbbc150d8fb6ba1a29d2814ccbf4f6988a2 | |
| parent | 6c28f1ff6c3b356ad2e5fb446632dc8c054faf18 (diff) | |
| parent | e525bae92591932e32e84da31532fdd34945ea1d (diff) | |
Merge "Fix multiuser.UserLifecycleTests dummy app"
| -rw-r--r-- | apct-tests/perftests/multiuser/apps/dummyapp/Android.bp | 21 | ||||
| -rw-r--r-- | apct-tests/perftests/multiuser/apps/dummyapp/Android.mk | 26 |
2 files changed, 21 insertions, 26 deletions
diff --git a/apct-tests/perftests/multiuser/apps/dummyapp/Android.bp b/apct-tests/perftests/multiuser/apps/dummyapp/Android.bp new file mode 100644 index 000000000000..73b2a0143e5b --- /dev/null +++ b/apct-tests/perftests/multiuser/apps/dummyapp/Android.bp @@ -0,0 +1,21 @@ +// 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. + +android_test_helper_app { + name: "PerftestMultiuserDummyApp", + + srcs: ["src/**/*.java"], + + sdk_version: "test_current", +} diff --git a/apct-tests/perftests/multiuser/apps/dummyapp/Android.mk b/apct-tests/perftests/multiuser/apps/dummyapp/Android.mk deleted file mode 100644 index 31e799ede3c7..000000000000 --- a/apct-tests/perftests/multiuser/apps/dummyapp/Android.mk +++ /dev/null @@ -1,26 +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) - -LOCAL_SDK_VERSION := current -LOCAL_MIN_SDK_VERSION := 19 - -LOCAL_PACKAGE_NAME := PerftestMultiuserDummyApp - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -include $(BUILD_PACKAGE)
\ No newline at end of file |