diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-03-20 19:14:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-20 19:14:26 +0000 |
| commit | d69c950fa1d48f20d4f5d90ee1938d79c5b8ee52 (patch) | |
| tree | 1e30cf8522d065968c2d1f27c5f640bb27ddc3d3 | |
| parent | ee2bf19082d9da23affbaab7ae225cbc56ccf96c (diff) | |
| parent | 32f6a850b67b8462c326d9972f3d3b0b633b78f2 (diff) | |
| download | platform_testing-d69c950fa1d48f20d4f5d90ee1938d79c5b8ee52.tar.gz | |
Merge "DO NOT MERGE: Backport building perfetto artifacts." into qt-qpr1-dev
| -rw-r--r-- | build/tasks/tests/platform_test_list.mk | 4 | ||||
| -rw-r--r-- | scripts/perfetto-setup/Android.mk | 48 |
2 files changed, 52 insertions, 0 deletions
diff --git a/build/tasks/tests/platform_test_list.mk b/build/tasks/tests/platform_test_list.mk index e1a69943c..9fec33253 100644 --- a/build/tasks/tests/platform_test_list.mk +++ b/build/tasks/tests/platform_test_list.mk @@ -56,6 +56,7 @@ platform_tests += \ FrameworksUtilTests \ InternalLocTestApp \ JankMicroBenchmarkTests \ + long_trace_config.textproto \ LauncherRotationStressTest \ MemoryUsage \ MultiDexLegacyTestApp \ @@ -92,6 +93,9 @@ platform_tests += \ SmokeTestApp \ SysAppJankTestsWear \ TouchLatencyJankTestWear \ + trace_config.textproto \ + trace_config_detailed.textproto \ + trace_config_experimental.textproto \ UbSystemUiJankTests \ UbWebViewJankTests \ UiBench \ diff --git a/scripts/perfetto-setup/Android.mk b/scripts/perfetto-setup/Android.mk new file mode 100644 index 000000000..a742eea8d --- /dev/null +++ b/scripts/perfetto-setup/Android.mk @@ -0,0 +1,48 @@ +# +# 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_MODULE := trace_config_detailed.textproto +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/local/tmp +LOCAL_PREBUILT_MODULE_FILE := prebuilts/tools/linux-x86_64/perfetto/configs/trace_config_detailed.textproto +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := long_trace_config.textproto +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/local/tmp +LOCAL_PREBUILT_MODULE_FILE := prebuilts/tools/linux-x86_64/perfetto/configs/long_trace_config.textproto +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := trace_config.textproto +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/local/tmp +LOCAL_PREBUILT_MODULE_FILE := prebuilts/tools/linux-x86_64/perfetto/configs/trace_config.textproto +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := trace_config_experimental.textproto +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/local/tmp +LOCAL_PREBUILT_MODULE_FILE := prebuilts/tools/linux-x86_64/perfetto/configs/trace_config_experimental.textproto +include $(BUILD_PREBUILT) + |