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

Commit 299a9ade authored by Yabin Cui's avatar Yabin Cui Committed by Automerger Merge Worker
Browse files

Merge "Replace libc++.so.1 with libc++.so" into main am: d234df56 

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



Change-Id: I93684b001ce3aa13ddb696c40f9827fe04b2b668
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 11ecf0e7 d234df56

system/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ $(bluetooth_cert_tests_py_package_zip): $(SOONG_ZIP) \ 
		-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)/lib/x86_64-unknown-linux-gnu/libc++.so.1

		-f $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION)/lib/x86_64-unknown-linux-gnu/libc++.so



$(call declare-container-license-metadata,$(bluetooth_cert_tests_py_package_zip),\

    SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT legacy_unencumbered,\