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

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

Merge "Cleanup Bluetooth build files" into main am: ba474ab7 

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



Change-Id: I01be200f98e47113c363dce22dd235200e129e2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1e7723e9 ba474ab7

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)