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

Commit 9dd46279 authored by Wei Li's avatar Wei Li Committed by Automerger Merge Worker
Browse files

Merge "Convert packages/modules/Bluetooth/Android.mk to Android.bp." into main... 

Merge "Convert packages/modules/Bluetooth/Android.mk to Android.bp." into main am: 26f11872 am: 9295a738

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



Change-Id: Ia3c8ea625a319932a2717138d51815bfb298cbca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 047c0883 9295a738

system/Android.bp

+163 −0
Original line number Diff line number Diff line
@@ -160,3 +160,166 @@ cc_library_headers { 
    ],

    min_sdk_version: "30",

}



genrule {

    name: "bluetooth_cert_test_sources-zip",

    tools: [

        "soong_zip",

    ],

    srcs: [

        "blueberry/**/*.py",

        "blueberry/**/*.yaml",

        "setup.py",

    ],

    out: ["bluetooth_cert_test_sources.zip"],

    cmd: "echo $(in) > $(genDir)/file_list.txt && " +

        "$(location soong_zip) -C packages/modules/Bluetooth/system -l $(genDir)/file_list.txt -o $(out)",

}



genrule {

    name: "gd_hci_packets_python3_gen-zip",

    tools: [

        "soong_zip",

    ],

    srcs: [

        ":gd_hci_packets_python3_gen",

    ],

    out: ["gd_hci_packets_python3_gen.zip"],

    cmd: "echo $(in) > $(genDir)/file_list.txt && " +

        "$(location soong_zip) -j -l $(genDir)/file_list.txt -o $(out)",

}



genrule {

    name: "gd_smp_packets_python3_gen-zip",

    tools: [

        "soong_zip",

    ],

    srcs: [

        ":gd_smp_packets_python3_gen",

    ],

    out: ["gd_smp_packets_python3_gen.zip"],

    cmd: "echo $(in) > $(genDir)/file_list.txt && " +

        "$(location soong_zip) -j -l $(genDir)/file_list.txt -o $(out)",

}



cc_genrule {

    name: "bluetooth_cert_test_host_deps-zip",

    host_supported: true,

    device_supported: false,

    compile_multilib: "first",

    tools: [

        "bluetooth_stack_with_facade",

        "bt_topshim_facade",

        "root-canal",

        "soong_zip",

    ],

    srcs: [

        ":libbase",

        ":libbinder",

        ":libbinder_ndk",

        ":libbluetooth",

        ":libbluetooth_gd",

        ":libc++",

        ":libchrome",

        ":libcrypto",

        ":libcutils",

        ":libevent",

        ":libflatbuffers-cpp",

        ":libgrpc++",

        ":libgrpc_wrap",

        ":liblog",

        ":liblzma",

        ":libprotobuf-cpp-full",

        ":libssl",

        ":libunwindstack",

        ":libutils",

        ":libz",

        ":server_configurable_flags",

    ],

    out: ["bluetooth_cert_test_host_deps.zip"],

    cmd: "echo $(in) > $(genDir)/file_list.txt && " +

        "$(location soong_zip) -j -f $(location bluetooth_stack_with_facade) -f $(location bt_topshim_facade) -f $(location root-canal) -P lib64 -l $(genDir)/file_list.txt -o $(out)",

}



cc_genrule {

    name: "bluetooth_cert_test_target_deps-zip",

    compile_multilib: "first",

    tools: [

        "soong_zip",

    ],

    srcs: [

        // executables

        ":bluetooth_stack_with_facade",

        // libs

        ":android.hardware.bluetooth@1.0",

        ":android.hardware.bluetooth@1.1",

        ":libandroid_runtime_lazy",

        ":libbase",

        ":libbinder",

        ":libbinder_ndk",

        ":libc++",

        ":libcrypto",

        ":libcutils",

        ":libgrpc++",

        ":libgrpc_wrap",

        ":libhidlbase",

        ":liblog",

        ":liblzma",

        ":libprotobuf-cpp-full",

        ":libssl",

        ":libunwindstack",

        ":libutils",

        ":libz",

        ":server_configurable_flags",

    ],

    out: ["bluetooth_cert_test_target_deps.zip"],

    cmd: "echo $(in) > $(genDir)/file_list.txt && " +

        "$(location soong_zip) -j -P target -l $(genDir)/file_list.txt -o $(out)",

}



genrule {

    name: "llvm-tools-zip",

    tools: [

        "soong_zip",

    ],

    srcs: [

        ":llvm-tools",

    ],

    out: ["llvm-tools.zip"],

    cmd: "mkdir -p $(genDir)/llvm_binutils/bin && mkdir -p $(genDir)/llvm_binutils/lib/x86_64-unknown-linux-gnu && " +

        "cp prebuilts/clang/host/linux-x86/*/bin/llvm-cov $(genDir)/llvm_binutils/bin && " +

        "cp prebuilts/clang/host/linux-x86/*/bin/llvm-profdata $(genDir)/llvm_binutils/bin && " +

        "cp prebuilts/clang/host/linux-x86/*/bin/llvm-symbolizer $(genDir)/llvm_binutils/bin && " +

        "cp prebuilts/clang/host/linux-x86/*/lib/x86_64-unknown-linux-gnu/libc++.so $(genDir)/llvm_binutils/lib/x86_64-unknown-linux-gnu && " +

        "$(location soong_zip) -C $(genDir) -D $(genDir)/llvm_binutils -o $(out)",

}



cc_genrule {

    name: "bluetooth_cert_tests.zip",

    host_supported: true,

    device_supported: false,

    compile_multilib: "first",

    tools: [

        "merge_zips",

        "soong_zip",

    ],

    srcs: [

        ":BlueberryFacadeAndCertGeneratedStub_py",

        ":bluetooth_cert_test_host_deps-zip",

        ":bluetooth_cert_test_sources-zip",

        ":bluetooth_cert_test_target_deps-zip",

        ":gd_hci_packets_python3_gen-zip",

        ":gd_smp_packets_python3_gen-zip",

        ":llvm-tools-zip",

    ],

    out: ["bluetooth_cert_tests.zip"],

    cmd: "$(location merge_zips) $(genDir)/temp.zip $(in) && " +

        "unzip -q -d $(genDir)/files $(genDir)/temp.zip && " +

        "for d in $$(find $(genDir)/files/blueberry -type d -name '*'); do touch -a $$d/__init__.py; done && " +

        "$(location soong_zip) -C $(genDir)/files -D $(genDir)/files -o $(out)",

    dist: {

        targets: [

            "bluetooth_stack_with_facade",

        ],

    },

}

system/Android.mk

deleted100644 → 0
+0 −157
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)



#LINT.IfChange

LOCAL_bluetooth_project_dir := $(LOCAL_PATH)



LOCAL_cert_test_sources := \

	$(call all-named-files-under,*.py,blueberry) \

	$(call all-named-files-under,*.yaml,blueberry) \

	setup.py

LOCAL_cert_test_sources := \

	$(filter-out gd_cert_venv% venv%, $(LOCAL_cert_test_sources))

LOCAL_cert_test_sources := \

	$(addprefix $(LOCAL_PATH)/, $(LOCAL_cert_test_sources))



LOCAL_host_executables := \

	$(HOST_OUT_EXECUTABLES)/bluetooth_stack_with_facade \

	$(HOST_OUT_EXECUTABLES)/bt_topshim_facade \

	$(HOST_OUT_EXECUTABLES)/root-canal



LOCAL_host_python_hci_packets_library := \

	$(SOONG_OUT_DIR)/.intermediates/packages/modules/Bluetooth/system/pdl/hci/gd_hci_packets_python3_gen/gen/hci_packets.py



LOCAL_host_python_smp_packets_library := \

	$(SOONG_OUT_DIR)/.intermediates/packages/modules/Bluetooth/system/pdl/security/gd_smp_packets_python3_gen/gen/smp_packets.py



LOCAL_host_libraries := \

	$(HOST_OUT_SHARED_LIBRARIES)/libbase.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libbinder.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libbinder_ndk.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libbluetooth.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libbluetooth_gd.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libc++.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libchrome.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libcrypto-host.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libcutils.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libevent-host.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libflatbuffers-cpp.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libgrpc++.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libgrpc_wrap.so \

	$(HOST_OUT_SHARED_LIBRARIES)/liblog.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libssl-host.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libz-host.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libprotobuf-cpp-full.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libunwindstack.so \

	$(HOST_OUT_SHARED_LIBRARIES)/libutils.so \

	$(HOST_OUT_SHARED_LIBRARIES)/liblzma.so \

	$(HOST_OUT_SHARED_LIBRARIES)/server_configurable_flags.so



LOCAL_target_executables := \

	$(TARGET_OUT_EXECUTABLES)/bluetooth_stack_with_facade



LOCAL_target_libraries := \

	$(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.bluetooth@1.0.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/android.hardware.bluetooth@1.1.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libandroid_runtime_lazy.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libbase.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libbinder_ndk.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libbinder.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libc++.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libcrypto.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libcutils.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libgrpc_wrap.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libgrpc++.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libhidlbase.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/liblog.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/liblzma.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libprotobuf-cpp-full.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libssl.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libunwindstack.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libutils.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/libz.so \

	$(TARGET_OUT_SHARED_LIBRARIES)/server_configurable_flags.so

	# libclang_rt.asan-aarch64-android.so is only generated for ASAN build and included automatically

	# on devices

	# $(TARGET_OUT_SHARED_LIBRARIES)/libclang_rt.asan-aarch64-android.so \

	# libc.so, libdl_android.so, libdl.so, and libm.so are provided by com.android.runtime APEX

	# Hence we cannot manually add them here

	# $(TARGET_OUT_SHARED_LIBRARIES)/libc.so \

	# $(TARGET_OUT_SHARED_LIBRARIES)/libdl_android.so \

	# $(TARGET_OUT_SHARED_LIBRARIES)/libdl.so \

	# $(TARGET_OUT_SHARED_LIBRARIES)/libm.so \

	# libstatssocket.so is provided by co.android.os.statsd APEX

	# $(TARGET_OUT_SHARED_LIBRARIES)/libstatssocket.so

	# linux-vdso.so.1 is always provided by OS

	# $(TARGET_OUT_SHARED_LIBRARIES)/linux-vdso.so.1

#LINT.ThenChange(blueberry/tests/gd/cert/gd_device.py)



bluetooth_cert_src_and_bin_zip := \

	$(call intermediates-dir-for,PACKAGING,bluetooth_cert_src_and_bin,HOST)/bluetooth_cert_src_and_bin.zip



# Assume 64-bit OS

$(bluetooth_cert_src_and_bin_zip): PRIVATE_bluetooth_project_dir := $(LOCAL_bluetooth_project_dir)

$(bluetooth_cert_src_and_bin_zip): PRIVATE_cert_test_sources := $(LOCAL_cert_test_sources)

$(bluetooth_cert_src_and_bin_zip): PRIVATE_host_executables := $(LOCAL_host_executables)

$(bluetooth_cert_src_and_bin_zip): PRIVATE_host_libraries := $(LOCAL_host_libraries)

$(bluetooth_cert_src_and_bin_zip): PRIVATE_host_python_hci_packets_library := $(LOCAL_host_python_hci_packets_library)

$(bluetooth_cert_src_and_bin_zip): PRIVATE_host_python_smp_packets_library := $(LOCAL_host_python_smp_packets_library)

$(bluetooth_cert_src_and_bin_zip): PRIVATE_target_executables := $(LOCAL_target_executables)

$(bluetooth_cert_src_and_bin_zip): PRIVATE_target_libraries := $(LOCAL_target_libraries)

$(bluetooth_cert_src_and_bin_zip): $(SOONG_ZIP) $(LOCAL_cert_test_sources) \

		$(LOCAL_host_executables) $(LOCAL_host_libraries) \

		$(LOCAL_host_python_hci_packets_library) \

		$(LOCAL_host_python_smp_packets_library) \

		$(LOCAL_target_executables) $(LOCAL_target_libraries)

	$(hide) $(SOONG_ZIP) -d -o $@ \

		-C $(PRIVATE_bluetooth_project_dir) $(addprefix -f ,$(PRIVATE_cert_test_sources)) \

		-C $(dir $(PRIVATE_host_python_hci_packets_library)) -f $(PRIVATE_host_python_hci_packets_library) \

		-C $(dir $(PRIVATE_host_python_smp_packets_library)) -f $(PRIVATE_host_python_smp_packets_library) \

		-C $(HOST_OUT_EXECUTABLES) $(addprefix -f ,$(PRIVATE_host_executables)) \

		-P lib64 \

		-C $(HOST_OUT_SHARED_LIBRARIES) $(addprefix -f ,$(PRIVATE_host_libraries)) \

		-P target \

		-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_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



bluetooth_cert_tests_py_package_zip := \

	$(call intermediates-dir-for,PACKAGING,bluetooth_cert_tests_py_package,HOST)/bluetooth_cert_tests.zip



$(bluetooth_cert_tests_py_package_zip): PRIVATE_bluetooth_project_dir := $(LOCAL_bluetooth_project_dir)

$(bluetooth_cert_tests_py_package_zip): PRIVATE_cert_src_and_bin_zip := $(bluetooth_cert_src_and_bin_zip)

$(bluetooth_cert_tests_py_package_zip): PRIVATE_facade_generated_py_zip := $(LOCAL_facade_generated_py_zip)

$(bluetooth_cert_tests_py_package_zip): $(SOONG_ZIP) \

		$(bluetooth_cert_src_and_bin_zip) $(bluetooth_cert_generated_py_zip)

	@echo "Packaging Bluetooth Cert Tests into $@"

	@rm -rf $(dir $@)bluetooth_cert_tests

	@mkdir -p $(dir $@)bluetooth_cert_tests

	$(hide) unzip -o -q $(PRIVATE_cert_src_and_bin_zip) -d $(dir $@)bluetooth_cert_tests

	$(hide) unzip -o -q $(PRIVATE_facade_generated_py_zip) -d $(dir $@)bluetooth_cert_tests

	# Make all subdirectory Python packages except lib64 and target

	$(hide) for f in `find $(dir $@)bluetooth_cert_tests -type d -name "*" \

					-not -path "$(dir $@)bluetooth_cert_tests/target*" \

					-not -path "$(dir $@)bluetooth_cert_tests/lib64*"` \

			; do (touch -a $$f/__init__.py) ; done

	$(hide) $(SOONG_ZIP) -d -o $@ -C $(dir $@)bluetooth_cert_tests -D $(dir $@)bluetooth_cert_tests \

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

    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)

system/gd/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -310,9 +310,6 @@ cc_binary { 
        "BlueberryFacadeGeneratedStub_h",

        "BluetoothGeneratedBundlerSchema_h_bfbs",

        "BluetoothGeneratedDumpsysDataSchema_h",

        // Needed here to guarantee that generated zip file is created before

        // bluetooth_cert_tests.zip is packaged

        "BlueberryFacadeAndCertGeneratedStub_py",

    ],

    generated_sources: [

        "BlueberryFacadeGeneratedStub_cc",