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

Commit ba474ab7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Cleanup Bluetooth build files" into main

parents 1853c14e 5deece0f

system/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ genrule { 
    ],

    cmd: "mkdir -p $(genDir)/files && " +

        "$(location aprotoc) -Ipackages/modules/Bluetooth/system -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-python-plugin) $(locations :BlueberryFacadeProto) --grpc_out=$(genDir)/files --python_out=$(genDir)/files && " +

        "find $(genDir)/files -type d -exec touch {}/__init__.py \\; &&" +

        "for dir in `find $(genDir)/files -type d`; do touch $$dir/__init__.py; done &&" +

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

    srcs: [

        ":BlueberryFacadeProto",

system/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ $(bluetooth_cert_src_and_bin_zip): PRIVATE_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_libraries) \

		$(LOCAL_host_executables) $(LOCAL_host_libraries) \

		$(LOCAL_host_python_hci_packets_library) \

		$(LOCAL_host_python_smp_packets_library) \

		$(LOCAL_target_executables) $(LOCAL_target_libraries)