From ae1f27b0b6f49aa9eae3c8137a66fd94447f9701 Mon Sep 17 00:00:00 2001 From: Omkar Chandorkar Date: Wed, 21 Sep 2022 15:59:47 +0900 Subject: [PATCH] kona: fix compile Change-Id: I18270f41c2d53ce2b3628ab4bc843e8560557ba3 Signed-off-by: Omkar Chandorkar --- .../generic/vendor/kona/hal_rcsservice.te | 34 --------------- sepolicy/generic/vendor/kona/te_macros | 43 ------------------- sepolicy/qva/vendor/kona/qcc_trd.te | 3 -- sepolicy/qva/vendor/kona/qvrd_vndr.te | 3 -- sepolicy/qva/vendor/kona/vndservice.te | 34 --------------- sepolicy/qva/vendor/kona/vndservice_contexts | 35 --------------- 6 files changed, 152 deletions(-) delete mode 100644 sepolicy/generic/vendor/kona/hal_rcsservice.te delete mode 100644 sepolicy/generic/vendor/kona/te_macros delete mode 100644 sepolicy/qva/vendor/kona/vndservice.te delete mode 100644 sepolicy/qva/vendor/kona/vndservice_contexts diff --git a/sepolicy/generic/vendor/kona/hal_rcsservice.te b/sepolicy/generic/vendor/kona/hal_rcsservice.te deleted file mode 100644 index a8c22c35..00000000 --- a/sepolicy/generic/vendor/kona/hal_rcsservice.te +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of The Linux Foundation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# To register imsrcsd to hwBinder -hwbinder_use(vendor_hal_rcsservice) -# add IUceSerive and IService to Hidl interface -add_hwservice(vendor_hal_rcsservice, vendor_hal_imsrcsd_hwservice) -add_hwservice(vendor_hal_rcsservice, vendor_hal_imscallinfo_hwservice) -#add imsfactory to HIDl interface -add_hwservice(vendor_hal_rcsservice, vendor_hal_imsfactory_hwservice) diff --git a/sepolicy/generic/vendor/kona/te_macros b/sepolicy/generic/vendor/kona/te_macros deleted file mode 100644 index 1d892a6f..00000000 --- a/sepolicy/generic/vendor/kona/te_macros +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted (subject to the limitations in the -# disclaimer below) provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# -# * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE -# GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT -# HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -####################################### -# Allow domains to use QTR SDK for metric collection -# syntax: qtr_sdk_use(clientdomain) -define(`qtr_sdk_use', -# qtrsdkservice client for registering & start/stop campaign -allow $1 vendor_qtrsdkservice_service:service_manager find; -binder_call($1, vendor_qcc_trd) -binder_call(vendor_qcc_trd, $1) -# qccsyshal client for sending data -hal_client_domain($1, vendor_qccsyshal); -') diff --git a/sepolicy/qva/vendor/kona/qcc_trd.te b/sepolicy/qva/vendor/kona/qcc_trd.te index ee02b4a9..d027ab26 100644 --- a/sepolicy/qva/vendor/kona/qcc_trd.te +++ b/sepolicy/qva/vendor/kona/qcc_trd.te @@ -30,9 +30,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# allow qcc-trd to add and find vendor service -add_service(vendor_qcc_trd, vendor_qtrsdkservice_service) - # allow qcc-trd to add qccvndhal service to hwservicemanager hal_server_domain(vendor_qcc_trd, vendor_hal_qccvndhal) hal_attribute_hwservice(vendor_hal_qccvndhal, vendor_hal_qccvndhal_hwservice) diff --git a/sepolicy/qva/vendor/kona/qvrd_vndr.te b/sepolicy/qva/vendor/kona/qvrd_vndr.te index 367531aa..4a680a46 100644 --- a/sepolicy/qva/vendor/kona/qvrd_vndr.te +++ b/sepolicy/qva/vendor/kona/qvrd_vndr.te @@ -31,6 +31,3 @@ # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. vndbinder_use(vendor_qvrd_vndr) -# Use QTR SDK for DCM -# -qtr_sdk_use(vendor_qvrd_vndr) diff --git a/sepolicy/qva/vendor/kona/vndservice.te b/sepolicy/qva/vendor/kona/vndservice.te deleted file mode 100644 index 148ed3a3..00000000 --- a/sepolicy/qva/vendor/kona/vndservice.te +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted (subject to the limitations in the -# disclaimer below) provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# -# * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE -# GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT -# HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -type vendor_qtrsdkservice_service, vndservice_manager_type; - diff --git a/sepolicy/qva/vendor/kona/vndservice_contexts b/sepolicy/qva/vendor/kona/vndservice_contexts deleted file mode 100644 index ed2a12f9..00000000 --- a/sepolicy/qva/vendor/kona/vndservice_contexts +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted (subject to the limitations in the -# disclaimer below) provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# -# * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE -# GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT -# HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#QTR SDK -vendor_qtrsdkservice u:object_r:vendor_qtrsdkservice_service:s0 -