diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-08 01:11:43 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-08 01:11:43 +0000 |
| commit | 39e3c5ef53dcbf34349bf393a0ec0e2ca8e6f3c0 (patch) | |
| tree | 7d6f6580740270c9475a45f56fa146d681049593 | |
| parent | 2b6f49e57d34a5af817856e9f7965253339ea464 (diff) | |
| parent | 76ed84a0977402a420a509f2b5ddead3c9049c6b (diff) | |
| download | platform_testing-39e3c5ef53dcbf34349bf393a0ec0e2ca8e6f3c0.tar.gz | |
Snap for 7529640 from 76ed84a0977402a420a509f2b5ddead3c9049c6b to sc-d1-release
Change-Id: I71ae0b5f51c27f3e829ca549d3ca47c541fa26a5
| -rw-r--r-- | build/tasks/tests/instrumentation_metric_test_list.mk | 1 | ||||
| -rw-r--r-- | scripts/perfetto-setup/Android.mk | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/build/tasks/tests/instrumentation_metric_test_list.mk b/build/tasks/tests/instrumentation_metric_test_list.mk index d6d8fe4a8..a9185f89d 100644 --- a/build/tasks/tests/instrumentation_metric_test_list.mk +++ b/build/tasks/tests/instrumentation_metric_test_list.mk @@ -86,6 +86,7 @@ instrumentation_metric_tests := \ WmPerfTests \ ImePerfTests \ trace_config_detailed.textproto \ + trace_config_multi_user.textproto \ perfetto_trace_processor_shell # TODO(b/72332760): Uncomment when fixed diff --git a/scripts/perfetto-setup/Android.mk b/scripts/perfetto-setup/Android.mk index 02544e142..ffbc51e56 100644 --- a/scripts/perfetto-setup/Android.mk +++ b/scripts/perfetto-setup/Android.mk @@ -55,6 +55,16 @@ LOCAL_PREBUILT_MODULE_FILE := prebuilts/tools/linux-x86_64/perfetto/configs/trac include $(BUILD_PREBUILT) include $(CLEAR_VARS) +LOCAL_MODULE := trace_config_multi_user.textproto +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/local/tmp +LOCAL_PREBUILT_MODULE_FILE := frameworks/base/apct-tests/perftests/multiuser/trace_configs/trace_config_multi_user.textproto +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) LOCAL_MODULE := perfetto_trace_processor_shell LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice |