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

Commit 6557342b authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Cleanup perfetto proto config" into main

parents ed2069c4 07979bd7

tests/FlickerTests/ActivityEmbedding/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ android_test { 
    manifest: "AndroidManifest.xml",

    package_name: "com.android.server.wm.flicker",

    instrumentation_target_package: "com.android.server.wm.flicker",

    test_config_template: "AndroidTestTemplate.xml",

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

    static_libs: ["FlickerTestsBase"],

    data: ["trace_config/*"],

}

tests/FlickerTests/ActivityEmbedding/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          xmlns:tools="http://schemas.android.com/tools"

          package="com.android.server.wm.flick">

          package="com.android.server.wm.flicker">



    <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29"/>

    <!-- Read and write traces from external storage -->

tests/FlickerTests/ActivityEmbedding/trace_config/trace_config.textproto

+0 −6
Original line number Diff line number Diff line
@@ -62,12 +62,6 @@ data_sources: { 
      atrace_categories: "binder_driver"

      atrace_categories: "sched_process_exit"

      atrace_apps: "com.android.server.wm.flicker"

      atrace_apps: "com.android.server.wm.flicker.other"

      atrace_apps: "com.android.server.wm.flicker.close"

      atrace_apps: "com.android.server.wm.flicker.ime"

      atrace_apps: "com.android.server.wm.flicker.launch"

      atrace_apps: "com.android.server.wm.flicker.quickswitch"

      atrace_apps: "com.android.server.wm.flicker.rotation"

      atrace_apps: "com.android.server.wm.flicker.testapp"

      atrace_apps: "com.android.systemui"

      atrace_apps: "com.google.android.apps.nexuslauncher"

tests/FlickerTests/Android.bp

+1 −11
Original line number Diff line number Diff line
@@ -23,13 +23,6 @@ package { 
    default_applicable_licenses: ["frameworks_base_license"],

}



filegroup {

    name: "FlickerServiceTests-src",

    srcs: [

        "src/**/*",

    ],

}



java_defaults {

    name: "FlickerTestsDefault",

    platform_apis: true,
@@ -49,10 +42,7 @@ java_defaults { 
        "wm-flicker-common-app-helpers",

        "wm-shell-flicker-utils",

    ],

    data: [

        ":FlickerTestApp",

        "trace_config/*",

    ],

    data: [":FlickerTestApp"],

}



java_library {

tests/FlickerTests/AppClose/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -30,4 +30,5 @@ android_test { 
    test_config_template: "AndroidTestTemplate.xml",

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

    static_libs: ["FlickerTestsBase"],

    data: ["trace_config/*"],

}