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

Commit 3cf5de48 authored by David Srbecky's avatar David Srbecky Committed by Automerger Merge Worker
Browse files

Merge changes from topic "revert-2508278-NYSMMYRTQW" am: e92e1147 am: a5c7c8e0 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2510997



Change-Id: Idcfe94fc65865ce16bdd09772b5b325b7187c53d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e7ed88d3 a5c7c8e0

Android.bp

+2 −21
Original line number Diff line number Diff line
@@ -69,25 +69,6 @@ filegroup { 
}



filegroup {

    name: "BluetoothGTestForce32ConfigTemplate",

    srcs: [

        "AndroidGTestForce32Template.xml",

    ],

}



// Address Sanitizer is flaky on Android x86_64 binaries but it's not on x86

// binaries.

// This default workaround the x86_64 ASAN flakyness by running 32bit binaries

// on 64bit targets.

// TODO(b/154347133): Remove this workaround

cc_defaults {

    name: "bluetooth_gtest_x86_asan_workaround",

    target: {

        android_x86: {

            test_config_template: ":BluetoothGTestForce32ConfigTemplate",

        },

        android_x86_64: {

            enabled: false,

        },

    },

    name: "BluetoothGTestNotShardableConfigTemplate",

    srcs: ["AndroidGtestNotShardableTemplate.xml"],

}

AndroidGTestForce32Template.xml→AndroidGtestNotShardableTemplate.xml

+4 −1
Original line number Diff line number Diff line
@@ -14,12 +14,15 @@ 
     limitations under the License.

-->

<configuration description="Runs {MODULE}.">

  <option name="not-shardable" value="true" />



  <option name="test-suite-tag" value="apct" />

  <option name="test-suite-tag" value="apct-native" />

  <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />

  <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

        <option name="cleanup" value="true" />

        <option name="push" value="{MODULE}32->/data/local/tmp/{MODULE}" />

        <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />

        <option name="append-bitness" value="true" />

    </target_preparer>

  <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">

    <option name="run-command" value="settings put global ble_scan_always_enabled 0" />

system/audio_a2dp_hw/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ cc_test { 
    defaults: [

        "audio_a2dp_hw_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    srcs: [

        "test/audio_a2dp_hw_test.cc",

system/audio_hearing_aid_hw/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ cc_test { 
    defaults: [

        "audio_hearing_aid_hw_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    srcs: [

        "test/audio_hearing_aid_hw_test.cc",

system/bta/Android.bp

+5 −11
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ cc_test { 
    defaults: [

        "fluoride_bta_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    test_suites: ["device-tests"],

    srcs: [
@@ -268,7 +267,6 @@ cc_test { 
    defaults: [

        "fluoride_bta_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    test_suites: ["device-tests"],

    host_supported: true,
@@ -361,7 +359,6 @@ cc_test { 
        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    host_supported: true,

    include_dirs: [
@@ -416,7 +413,6 @@ cc_test { 
        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    host_supported: true,

    include_dirs: [
@@ -459,7 +455,6 @@ cc_test { 
        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    host_supported: true,

    include_dirs: [
@@ -579,7 +574,6 @@ cc_test { 
        "fluoride_defaults",

        "clang_coverage_bin",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    host_supported: true,

    target: {
@@ -668,7 +662,6 @@ cc_test { 
        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    host_supported: true,

    // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below
@@ -762,7 +755,6 @@ cc_test { 
        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    host_supported: true,

    // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below
@@ -814,7 +806,6 @@ cc_test { 
        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    host_supported: true,

    include_dirs: [
@@ -886,7 +877,6 @@ cc_test { 
        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    host_supported: true,

    // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below
@@ -943,7 +933,6 @@ cc_test { 
        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    host_supported: true,

    // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below
@@ -1005,4 +994,9 @@ cc_test { 
            undefined: true,

        },

    },

    target: {

        android: {

            test_config_template: ":BluetoothGTestNotShardableConfigTemplate",

        },

    },

}