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

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

Merge "Cert: Add directory structure to genrule"

parents da9c4af0 7ba4b19f

system/gd/Android.bp

+9 −8
Original line number Diff line number Diff line
@@ -459,14 +459,15 @@ genrule { 
        "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)/l2cap/classic/__init__.py; " +

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

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

    cmd: "mkdir -p $(genDir)/packages/modules/Bluetooth/system/gd && " +

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

        "touch $(genDir)/packages/modules/Bluetooth/system/gd/facade/__init__.py && " +

        "touch $(genDir)/packages/modules/Bluetooth/system/gd/hal/__init__.py && " +

        "touch $(genDir)/packages/modules/Bluetooth/system/gd/hci/__init__.py && " +

        "touch $(genDir)/packages/modules/Bluetooth/system/gd/hci/facade/__init__.py && " +

        "touch $(genDir)/packages/modules/Bluetooth/system/gd/l2cap/classic/__init__.py && " +

        "touch $(genDir)/packages/modules/Bluetooth/system/gd/neighbor/facade/__init__.py && " +

        "touch $(genDir)/packages/modules/Bluetooth/system/gd/security/__init__.py && " +

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

    srcs: [

        ":BluetoothFacadeProto",

system/gd/cert/python3.8-gd

+1 −1
Original line number Diff line number Diff line 
#! /bin/bash

PYTHONPATH=$PYTHONPATH:$ANDROID_BUILD_TOP/out/host/linux-x86/lib64:$ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd:$ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py python3.8 "$@"
 
PYTHONPATH=$PYTHONPATH:$ANDROID_BUILD_TOP/out/host/linux-x86/lib64:$ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd:$ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py/packages/modules/Bluetooth/system/gd python3.8 "$@"

system/gd/cert/run

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ set -- "${POSITIONAL[@]}" # restore positional parameters 
unzip -o -q $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py.zip \

   -d $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py



PYTHONPATH=$PYTHONPATH:$ANDROID_BUILD_TOP/out/host/linux-x86/lib64:$ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd:$ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py \

PYTHONPATH=$PYTHONPATH:$ANDROID_BUILD_TOP/out/host/linux-x86/lib64:$ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd:$ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py/packages/modules/Bluetooth/system/gd \

    python3.8 `which act.py`\

      -c $TEST_CONFIG \

      $TEST_FILTER \

system/gd/cert/run_pts_l2cap.sh

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ 
unzip -u $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py.zip -d $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py



# For bluetooth_packets_python3

PYTHONPATH=$PYTHONPATH:$ANDROID_BUILD_TOP/out/host/linux-x86/lib64:$ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd:$ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py python3.8 `which act.py` -c $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd/cert/pts.json -tf $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd/cert/pts_l2cap_testcase -tp $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd
 
python3.8-gd `which act.py` -c $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd/cert/pts.json -tf $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd/cert/pts_l2cap_testcase -tp $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd

system/gd/cert/set_up_virtualenv.sh

+7 −7
Original line number Diff line number Diff line
@@ -161,13 +161,13 @@ pushd . 
cd $ANDROID_BUILD_TOP/packages/modules/Bluetooth/system/gd/gd_cert_venv/lib/python3.8/site-packages

# Python generated code

ln -sfT $ANDROID_BUILD_TOP/tools/test/connectivity/acts/framework/acts acts

ln -sfT $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py/cert cert

ln -sfT $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py/facade facade

ln -sfT $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py/hal hal

ln -sfT $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py/hci hci

ln -sfT $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py/l2cap l2cap

ln -sfT $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py/neighbor neighbor

ln -sfT $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py/security security

ln -sfT $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py/packages/modules/Bluetooth/system/gd/cert cert

ln -sfT $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py/packages/modules/Bluetooth/system/gd/facade facade

ln -sfT $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py/packages/modules/Bluetooth/system/gd/hal hal

ln -sfT $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py/packages/modules/Bluetooth/system/gd/hci hci

ln -sfT $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py/packages/modules/Bluetooth/system/gd/l2cap l2cap

ln -sfT $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py/packages/modules/Bluetooth/system/gd/neighbor neighbor

ln -sfT $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_generated_py/packages/modules/Bluetooth/system/gd/security security

# Native libraries

ln -sfT $ANDROID_BUILD_TOP/out/dist/bluetooth_cert_test/out/host/linux-x86/lib64/bluetooth_packets_python3.so bluetooth_packets_python3.so

# Per systrace, Python only load from python3.8/lib64 directory for plugin imported native libraries