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

Commit 8b5cb50d authored by David Duarte's avatar David Duarte
Browse files

Remove bluetooth hack for host coverage 

Android only supports on device coverage, Bluetooth made
something to circuvent that by adding the coverage flags
to the host targets.
As this is not supported by Android we should not roll our
own solution.

Bug: 279502784
Test: TreeHugger
Change-Id: I5bd893c0b04086ba747563d804b4cbe45e045a73
parent af6d814a

system/bta/Android.bp

+0 −9
Original line number Diff line number Diff line
@@ -373,7 +373,6 @@ cc_test { 
    test_suites: ["device-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "clang_coverage_bin",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -429,7 +428,6 @@ cc_test { 
    test_suites: ["device-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "clang_coverage_bin",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -473,7 +471,6 @@ cc_test { 
    test_suites: ["device-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "clang_coverage_bin",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -594,7 +591,6 @@ cc_test { 
    test_suites: ["device-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "clang_coverage_bin",

        "fluoride_defaults",

        "mts_defaults",

    ],
@@ -689,7 +685,6 @@ cc_test { 
    test_suites: ["device-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "clang_coverage_bin",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -789,7 +784,6 @@ cc_test { 
    test_suites: ["device-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "clang_coverage_bin",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -842,7 +836,6 @@ cc_test { 
    test_suites: ["device-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "clang_coverage_bin",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -916,7 +909,6 @@ cc_test { 
    test_suites: ["device-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "clang_coverage_bin",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -974,7 +966,6 @@ cc_test { 
    test_suites: ["device-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "clang_coverage_bin",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],

system/build/Android.bp

+0 −33
Original line number Diff line number Diff line
@@ -298,36 +298,3 @@ cc_defaults { 
        },

    },

}
 


// Enables code coverage for a set of source files. Must be combined with

// "clang_coverage_bin" in order to work. See //test/gen_coverage.py for more information

// on generating code coverage.

cc_defaults {

    name: "clang_file_coverage",

    target: {

        glibc: {

            cflags: [

                "-fcoverage-mapping",

                "-fprofile-instr-generate",

            ],

        },

    },

}



// Enabled code coverage on a binary. These flags allow libraries that were

// compiled with "clang_file_coverage" to be properly linked together in

// order to create a binary that will create a profraw file when ran. Note

// these flags themselves don't enable code coverage for the source files

// compiled in the binary. See //test/gen_coverage.py for more information

// on generating code coverage.

cc_defaults {

    name: "clang_coverage_bin",

    target: {

        glibc: {

            ldflags: [

                "-fcoverage-mapping",

                "-fprofile-instr-generate",

            ],

        },

    },

}

system/common/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ package { 
cc_library_static {

    name: "libbt-common",

    defaults: [

        "clang_file_coverage",

        "fluoride_basic_defaults",

    ],

    host_supported: true,
@@ -46,7 +45,6 @@ cc_test { 
    test_suites: ["device-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "clang_coverage_bin",

        "fluoride_defaults",

        "mts_defaults",

    ],

system/gd/Android.bp

+0 −37
Original line number Diff line number Diff line
@@ -53,39 +53,6 @@ cc_defaults { 
    header_libs: ["jni_headers"],

}



// Enables code coverage for a set of source files. Must be combined with

// "clang_coverage_bin" in order to work. See //test/gen_coverage.py for more information

// on generating code coverage.

cc_defaults {

    name: "gd_clang_file_coverage",

    target: {

        glibc: {

            cflags: [

                "-fcoverage-mapping",

                "-fprofile-instr-generate",

            ],

        },

    },

}



// Enabled code coverage on a binary. These flags allow libraries that were

// compiled with "clang_file_coverage" to be properly linked together in

// order to create a binary that will create a profraw file when ran. Note

// these flags themselves don't enable code coverage for the source files

// compiled in the binary. See //test/gen_coverage.py for more information

// on generating code coverage.

cc_defaults {

    name: "gd_clang_coverage_bin",

    target: {

        glibc: {

            ldflags: [

                "-fcoverage-mapping",

                "-fprofile-instr-generate",

            ],

        },

    },

}



cc_defaults {

    name: "gd_clang_tidy",

    tidy: true,
@@ -139,7 +106,6 @@ cc_defaults { 
cc_defaults {

    name: "libbluetooth_gd_defaults",

    defaults: [

        "gd_clang_file_coverage",

        "gd_defaults",

        "libchrome_support_defaults",

    ],
@@ -270,7 +236,6 @@ cc_library { 
cc_binary {

    name: "bluetooth_stack_with_facade",

    defaults: [

        "gd_clang_coverage_bin",

        "gd_defaults",

        "libchrome_support_defaults",

    ],
@@ -352,7 +317,6 @@ cc_test { 
    test_suites: ["device-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "gd_clang_coverage_bin",

        "gd_defaults",

        "libchrome_support_defaults",

        "mts_defaults",
@@ -450,7 +414,6 @@ cc_test { 
    test_suites: ["device-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "gd_clang_coverage_bin",

        "gd_defaults",

        "libchrome_support_defaults",

        "mts_defaults",

system/gd/dumpsys/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ cc_library { 
    name: "libbluetooth-dumpsys",

    host_supported: true,

    defaults: [

        "gd_clang_file_coverage",

        "gd_clang_tidy",

        "gd_defaults",

    ],
@@ -153,7 +152,6 @@ cc_library { 
    name: "libbluetooth-dumpsys-test",

    host_supported: true,

    defaults: [

        "gd_clang_file_coverage",

        "gd_clang_tidy",

        "gd_defaults",

    ],
@@ -166,7 +164,6 @@ cc_library { 
    name: "libbluetooth-dumpsys-unittest",

    host_supported: true,

    defaults: [

        "gd_clang_file_coverage",

        "gd_clang_tidy",

        "gd_defaults",

    ],