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

Commit 97f2c1ea authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes If9886370,I80a0fbce am: e7e54568 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1527803

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8993c4352dfb8a41742e0c6592345eabeea08bda
parents 81471811 e7e54568

system/gd/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -251,6 +251,10 @@ cc_binary { 
            ],

        },

    },

    sanitize: {

        address: true,

        cfi: true,

    }

}



cc_test {

system/gd/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ $(bluetooth_cert_tests_py_package_zip): $(SOONG_ZIP) $(LOCAL_acts_zip) \ 
		-P llvm_binutils -C $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION) \

		-f $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION)/bin/llvm-cov \

		-f $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION)/bin/llvm-profdata \

		-f $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION)/bin/llvm-symbolizer \

		-f $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION)/lib64/libc++.so.1



$(call dist-for-goals,bluetooth_stack_with_facade,$(bluetooth_cert_tests_py_package_zip):bluetooth_cert_tests.zip)

system/gd/cert/gd_device.py

+6 −0
Original line number Diff line number Diff line
@@ -301,6 +301,12 @@ class GdHostOnlyDevice(GdDeviceBase): 
        self.backing_process_profraw_path = pathlib.Path(self.log_path_base).joinpath(

            "%s_%s_backing_coverage.profraw" % (self.type_identifier, self.label))

        self.environment["LLVM_PROFILE_FILE"] = str(self.backing_process_profraw_path)

        llvm_binutils = pathlib.Path(get_gd_root()).joinpath("llvm_binutils").joinpath("bin")

        llvm_symbolizer = llvm_binutils.joinpath("llvm-symbolizer")

        if llvm_symbolizer.is_file():

            self.environment["ASAN_SYMBOLIZER_PATH"] = llvm_symbolizer

        else:

            logging.warning("[%s] Cannot find LLVM symbolizer at %s" % (self.label, str(llvm_symbolizer)))



    def teardown(self):

        super().teardown()

system/gd/facade/facade_main.cc

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ using ::bluetooth::StackManager; 
using ::bluetooth::hal::HciHalHostRootcanalConfig;

using ::bluetooth::os::Thread;



extern "C" const char* __asan_default_options() {

  return "detect_container_overflow=0";

}



namespace {

::bluetooth::facade::GrpcRootServer grpc_root_server;

system/vendor_libs/test_vendor_lib/desktop/root_canal_main.cc

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ constexpr uint16_t kTestPort = 6401; 
constexpr uint16_t kHciServerPort = 6402;

constexpr uint16_t kLinkServerPort = 6403;



extern "C" const char* __asan_default_options() {

  return "detect_container_overflow=0";

}



bool crash_callback(const void* crash_context, size_t crash_context_size,

                    __attribute__((unused)) void* context) {

  pid_t tid = BACKTRACE_CURRENT_THREAD;