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

Commit b383b36f authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge "Remove ASAN workaround" into main am: 09fbd9cd 

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



Change-Id: I793df86826700ad50f4eb8a0227eec2ae03d7436
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c999bb35 09fbd9cd

Android.bp

+0 −24
Original line number Diff line number Diff line
@@ -38,13 +38,6 @@ filegroup { 
    ],

}



filegroup {

    name: "BluetoothGTestForce32ConfigTemplate",

    srcs: [

        "AndroidGTestForce32Template.xml",

    ],

}



// This default contains properties that should be common to all the cc targets

// developed by the Bluetooth team.

//
@@ -79,20 +72,3 @@ cc_defaults { 
    c_std: "c99",

    cpp_std: "c++17",

}
 


// 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,

        },

    },

}

AndroidGTestForce32Template.xml

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 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.

-->

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

  <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}" />

    </target_preparer>

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

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

    <option name="run-command" value="cmd bluetooth_manager disable" />

    <option name="run-command" value="cmd bluetooth_manager wait-for-state:STATE_OFF" />

  </target_preparer>

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

    <option name="device-path" value="/data/vendor/ssrdump" />

  </target_preparer>

  <test class="com.android.tradefed.testtype.GTest" >

    <option name="native-test-device-path" value="/data/local/tmp" />

    <option name="module-name" value="{MODULE}" />

    <option name="run-test-as" value="0" />

  </test>



  <!-- Only run tests in MTS if the Bluetooth Mainline module is installed. -->

  <object type="module_controller"

          class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

      <option name="mainline-module-package-name" value="com.android.btservices" />

      <option name="mainline-module-package-name" value="com.google.android.btservices" />

  </object>

</configuration>

system/audio_a2dp_hw/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ cc_test { 
    test_suites: ["general-tests"],

    defaults: [

        "audio_a2dp_hw_defaults",

        "bluetooth_gtest_x86_asan_workaround",

        "mts_defaults",

    ],

    srcs: [

system/audio_hearing_aid_hw/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ cc_test { 
    test_suites: ["general-tests"],

    defaults: [

        "audio_hearing_aid_hw_defaults",

        "bluetooth_gtest_x86_asan_workaround",

        "mts_defaults",

    ],

    srcs: [

system/bta/Android.bp

+0 −13
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ cc_library_static { 
cc_test {

    name: "net_test_bta",

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -273,7 +272,6 @@ cc_test { 
cc_test {

    name: "net_test_bta_gatt",

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -365,7 +363,6 @@ cc_test { 
cc_test {

    name: "bt_host_test_bta",

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -501,7 +498,6 @@ cc_test { 
cc_test {

    name: "bt_host_test_bta_scn",

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -567,7 +563,6 @@ cc_test { 
    name: "bluetooth_csis_test",

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -628,7 +623,6 @@ cc_test { 
    name: "bluetooth_groups_test",

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -676,7 +670,6 @@ cc_test { 
    name: "bluetooth_vc_test",

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -802,7 +795,6 @@ cc_test { 
    name: "bluetooth_le_audio_codec_manager_test",

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_defaults",

        "mts_defaults",

    ],
@@ -878,7 +870,6 @@ cc_test { 
    name: "bluetooth_le_audio_test",

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_defaults",

        "mts_defaults",

    ],
@@ -1088,7 +1079,6 @@ cc_test { 
    name: "bluetooth_test_broadcaster_state_machine",

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -1146,7 +1136,6 @@ cc_test { 
    name: "bluetooth_test_broadcaster",

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -1216,7 +1205,6 @@ cc_test { 
    name: "bluetooth_has_test",

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],
@@ -1278,7 +1266,6 @@ cc_test { 
    name: "bluetooth_hh_test",

    test_suites: ["general-tests"],

    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_bta_defaults",

        "mts_defaults",

    ],