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

Commit 5deece0f authored by Jim Tang's avatar Jim Tang
Browse files

Cleanup Bluetooth build files 

This commit cleans up:
- find command does not support bracket {} in a genrule command, resulting
build noise. Use a for loop to mitigate the message.
- LOCAL_host_python_libraries is a remaining variable and not defined at all.

Bug: 338000376
Test: m bluetooth_stack_with_facade
Change-Id: Iee665089281d93d02ea0b67e2f2acdae438e2ecf
parent eee44c7d

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)