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

Commit 400715d2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Move compiled grpc py to dist" am: 9408ae9c am: 60e1cf1b 

Change-Id: I576f233f3c1c44aaa2db17a99d7c874e7f0737e1
parents 612098a7 60e1cf1b

system/gd/Android.bp

+8 −40
Original line number Diff line number Diff line
@@ -495,59 +495,27 @@ genrule { 
    tools: [

        "aprotoc",

        "protoc-gen-grpc-python-plugin",

        "soong_zip",

    ],

    cmd: "$(location aprotoc) -Ipackages/modules/Bluetooth/system/gd -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-python-plugin) $(in) --grpc_out=$(genDir) --python_out=$(genDir); " +

        "touch $(genDir)/facade/__init__.py; " +

        "touch $(genDir)/hal/__init__.py; " +

        "touch $(genDir)/hci/__init__.py; " +

        "touch $(genDir)/hci/facade/__init__.py; " +

        "touch $(genDir)/hci/cert/__init__.py; " +

        "touch $(genDir)/l2cap/classic/__init__.py; " +

        "touch $(genDir)/l2cap/classic/cert/__init__.py; " +

        "touch $(genDir)/neighbor/facade/__init__.py; " +

        "touch $(genDir)/security/__init__.py; ",

        "touch $(genDir)/security/__init__.py; " +

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

    srcs: [

        ":BluetoothFacadeProto",

        ":BluetoothCertStackProto",

    ],

    out: [

        "cert/rootservice_pb2_grpc.py",

        "cert/rootservice_pb2.py",

        "facade/__init__.py",

        "facade/common_pb2_grpc.py",

        "facade/common_pb2.py",

        "facade/rootservice_pb2_grpc.py",

        "facade/rootservice_pb2.py",

        "hal/__init__.py",

        "hal/facade_pb2_grpc.py",

        "hal/facade_pb2.py",

        "hci/facade/__init__.py",

        "hci/facade/facade_pb2_grpc.py",

        "hci/facade/facade_pb2.py",

        "hci/facade/acl_manager_facade_pb2_grpc.py",

        "hci/facade/acl_manager_facade_pb2.py",

        "hci/facade/controller_facade_pb2_grpc.py",

        "hci/facade/controller_facade_pb2.py",

        "hci/facade/le_acl_manager_facade_pb2_grpc.py",

        "hci/facade/le_acl_manager_facade_pb2.py",

        "hci/facade/le_advertising_manager_facade_pb2_grpc.py",

        "hci/facade/le_advertising_manager_facade_pb2.py",

        "hci/facade/le_scanning_manager_facade_pb2_grpc.py",

        "hci/facade/le_scanning_manager_facade_pb2.py",

        "l2cap/classic/__init__.py",

        "l2cap/classic/facade_pb2_grpc.py",

        "l2cap/classic/facade_pb2.py",

        "neighbor/facade/__init__.py",

        "neighbor/facade/facade_pb2_grpc.py",

        "neighbor/facade/facade_pb2.py",

        "hci/cert/__init__.py",

        "l2cap/classic/cert/__init__.py",

        "l2cap/classic/cert/api_pb2_grpc.py",

        "l2cap/classic/cert/api_pb2.py",

        "security/__init__.py",

        "security/facade_pb2_grpc.py",

        "security/facade_pb2.py",

    ],

    out: ["bluetooth_cert_generated_py.zip"],

    dist: {

        targets: ["bluetooth_stack_with_facade"],

    },



}



filegroup {

system/gd/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ bluetooth_cert_test_file_list := \ 
    $(call all-named-files-under,*.py,cert) \

    $(call all-named-files-under,*.sh,cert) \

    $(call all-named-files-under,*.proto,cert facade hal hci/cert hci/facade l2cap/classic \

	    l2cap/classic/cert neighbor/facade) \

	    l2cap/classic/cert neighbor/facade security) \

    cert/cert_testcases \

    cert/cert_testcases_facade_only \

    cert/host_only_config.json \

system/gd/cert/gd_base_test.py

+0 −6
Original line number Diff line number Diff line
@@ -20,16 +20,10 @@ import importlib 
import logging

import os

import signal

import sys

import subprocess



ANDROID_BUILD_TOP = os.environ.get('ANDROID_BUILD_TOP')



sys.path.append(

    ANDROID_BUILD_TOP +

    '/out/soong/.intermediates/packages/modules/Bluetooth/system/gd/BluetoothFacadeAndCertGeneratedStub_py/gen'

)





class GdBaseTestClass(BaseTestClass):

system/gd/cert/gd_base_test_facade_only.py

+0 −6
Original line number Diff line number Diff line
@@ -20,16 +20,10 @@ import importlib 
import logging

import os

import signal

import sys

import subprocess



ANDROID_BUILD_TOP = os.environ.get('ANDROID_BUILD_TOP')



sys.path.append(

    ANDROID_BUILD_TOP +

    '/out/soong/.intermediates/packages/modules/Bluetooth/system/gd/BluetoothFacadeAndCertGeneratedStub_py/gen'

)





class GdFacadeOnlyBaseTestClass(BaseTestClass):

system/gd/cert/pts_base_test.py

+0 −8
Original line number Diff line number Diff line
@@ -20,16 +20,8 @@ import importlib 
import logging

import os

import signal

import sys

import subprocess



ANDROID_BUILD_TOP = os.environ.get('ANDROID_BUILD_TOP')



sys.path.append(

    ANDROID_BUILD_TOP +

    '/out/soong/.intermediates/packages/modules/Bluetooth/system/gd/BluetoothFacadeAndCertGeneratedStub_py/gen'

)





class PTSBaseTestClass(BaseTestClass):