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

Commit 7a78e38e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Non-module targets." am: 361057a1 am: 342c8e2f 

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



Change-Id: I59d904735285af6ce9ca6c5ca00cb28e2a873699
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f609ab57 342c8e2f

system/Android.mk

+12 −0
Original line number Diff line number Diff line
@@ -79,6 +79,12 @@ $(bluetooth_cert_src_and_bin_zip): $(SOONG_ZIP) $(LOCAL_cert_test_sources) \ 
		-C $(TARGET_OUT_EXECUTABLES) $(addprefix -f ,$(PRIVATE_target_executables)) \

		-C $(TARGET_OUT_SHARED_LIBRARIES) $(addprefix -f ,$(PRIVATE_target_libraries))



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

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

    notice, $(LOCAL_PATH)/../NOTICE,,packages/modules/Bluetooth)

$(call declare-container-license-deps,$(bluetooth_cert_src_and_bin_zip),\

    $(LOCAL_host_python_extension_libraries) $(LOCAL_target_executables) $(LOCAL_target_libraries),$(bluetooth_cert_src_and_bin_zip):)



# TODO: Find a better way to locate output from SOONG genrule()

LOCAL_facade_generated_py_zip := \

	$(SOONG_OUT_DIR)/.intermediates/packages/modules/Bluetooth/system/BlueberryFacadeAndCertGeneratedStub_py/gen/blueberry_facade_generated_py.zip
@@ -108,4 +114,10 @@ $(bluetooth_cert_tests_py_package_zip): $(SOONG_ZIP) \ 
		-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 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,\

    notice, $(LOCAL_PATH)/../NOTICE,,packages/modules/Bluetooth)

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

    $(bluetooth_cert_src_and_bin_zip) $(bluetooth_cert_generated_py_zip),$(bluetooth_cert_tests_py_package_zip):)



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