diff options
author | Gaurav Shah <gauravsh@google.com> | 2015-09-04 13:21:40 -0700 |
---|---|---|
committer | Gaurav Shah <gauravsh@google.com> | 2015-09-04 13:24:13 -0700 |
commit | 10fa959ae12f4232e0ff23dada1c566e5b07c8f3 (patch) | |
tree | a59788044c168750fe9aa1f125a2afa809e583a7 | |
parent | f6301f918c0785775ef723d11f07f2d4fba3c8e4 (diff) | |
download | qcom-10fa959ae12f4232e0ff23dada1c566e5b07c8f3.tar.gz |
qcom bsp: Remove audio prebuilt-related
These are being moved to live under the vendor/bsp/qcom
directory with other prebuild binaries.
BUG: 23754697
Change-Id: I809b99a12b70aa6a63e37930215f4ec7def57d58
-rw-r--r-- | common/prebuilts/Android.mk | 24 | ||||
-rw-r--r-- | common/prebuilts/audio_prebuilts.mk | 38 | ||||
-rw-r--r-- | common/prebuilts/init.audio.rc | 46 | ||||
-rw-r--r-- | common/prebuilts/sepolicy/device.te | 8 | ||||
-rw-r--r-- | common/prebuilts/sepolicy/file.te | 9 | ||||
-rw-r--r-- | common/prebuilts/sepolicy/file_contexts | 29 | ||||
-rw-r--r-- | common/prebuilts/sepolicy/qmux.te | 30 | ||||
-rw-r--r-- | common/prebuilts/sepolicy/rmt.te | 29 | ||||
-rw-r--r-- | common/prebuilts/sepolicy/te_macros | 11 | ||||
-rw-r--r-- | common/prebuilts/sepolicy/ueventd.te | 3 |
10 files changed, 0 insertions, 227 deletions
diff --git a/common/prebuilts/Android.mk b/common/prebuilts/Android.mk deleted file mode 100644 index 9ed9da8..0000000 --- a/common/prebuilts/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright 2015 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) - -# Audio init -include $(CLEAR_VARS) -LOCAL_MODULE := init.audio.rc -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_INITRCD) -LOCAL_SRC_FILES := init.audio.rc -include $(BUILD_PREBUILT) diff --git a/common/prebuilts/audio_prebuilts.mk b/common/prebuilts/audio_prebuilts.mk deleted file mode 100644 index bcfcf6a..0000000 --- a/common/prebuilts/audio_prebuilts.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright 2015 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -PRODUCT_PACKAGES += \ - init.audio.rc - -# Audio daemons -PRODUCT_COPY_FILES += \ - $(TOP)/hardware/bsp/qcom/common/prebuilts/daemons/rmt_storage:/system/bin/rmt_storage \ - $(TOP)/hardware/bsp/qcom/common/prebuilts/daemons/qmuxd:/system/bin/qmuxd \ - -# Audio libs -PRODUCT_COPY_FILES += \ - $(TOP)/hardware/bsp/qcom/common/prebuilts/libs/libqmi_common_so.so:/system/lib/libqmi_common_so.so \ - $(TOP)/hardware/bsp/qcom/common/prebuilts/libs/libqmi_csi.so:/system/lib/libqmi_csi.so \ - $(TOP)/hardware/bsp/qcom/common/prebuilts/libs/libsmemlog.so:/system/lib/libsmemlog.so \ - $(TOP)/hardware/bsp/qcom/common/prebuilts/libs/libqmi_encdec.so:/system/lib/libqmi_encdec.so \ - $(TOP)/hardware/bsp/qcom/common/prebuilts/libs/libconfigdb.so:/system/lib/libconfigdb.so \ - $(TOP)/hardware/bsp/qcom/common/prebuilts/libs/libdiag.so:/system/lib/libdiag.so \ - $(TOP)/hardware/bsp/qcom/common/prebuilts/libs/libdsutils.so:/system/lib/libdsutils.so \ - $(TOP)/hardware/bsp/qcom/common/prebuilts/libs/libqmi.so:/system/lib/libqmi.so \ - $(TOP)/hardware/bsp/qcom/common/prebuilts/libs/libxml.so:/system/lib/libxml.so \ - $(TOP)/hardware/bsp/qcom/common/prebuilts/libs/libidl.so:/system/lib/libidl.so \ - $(TOP)/hardware/bsp/qcom/common/prebuilts/libs/libmdmdetect.so:/system/lib/libmdmdetect.so \ - $(TOP)/hardware/bsp/qcom/common/prebuilts/libs/libqmi_client_qmux.so:/system/lib/libqmi_client_qmux.so \ - $(TOP)/hardware/bsp/qcom/common/prebuilts/libs/libqmiservices.so:/system/lib/libqmiservices.so \ diff --git a/common/prebuilts/init.audio.rc b/common/prebuilts/init.audio.rc deleted file mode 100644 index c734696..0000000 --- a/common/prebuilts/init.audio.rc +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright 2015 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -on early-init - mkdir /firmware 0771 system system - -on fs - wait /dev/block/mmcblk0p1 - mount vfat /dev/block/mmcblk0p1 /firmware ro context=u:object_r:firmware_file:s0,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337 - -on post-fs - mkdir /dev/block/bootdevice - mkdir /dev/block/bootdevice/by-name - symlink /dev/block/mmcblk0p1 /dev/block/bootdevice/by-name/modem - symlink /dev/block/mmcblk0p12 /dev/block/bootdevice/by-name/modemst1 - symlink /dev/block/mmcblk0p13 /dev/block/bootdevice/by-name/modemst2 - symlink /dev/block/mmcblk0p2 /dev/block/bootdevice/by-name/fsg - symlink /dev/block/mmcblk0p15 /dev/block/bootdevice/by-name/fsc - - start rmt_storage - start qmuxd - - write /sys/kernel/boot_adsp/boot 1 - - -service rmt_storage /system/bin/rmt_storage - class core - user root - disabled - -service qmuxd /system/bin/qmuxd - class main - user root - disabled diff --git a/common/prebuilts/sepolicy/device.te b/common/prebuilts/sepolicy/device.te deleted file mode 100644 index 8efe124..0000000 --- a/common/prebuilts/sepolicy/device.te +++ /dev/null @@ -1,8 +0,0 @@ -type diag_device, dev_type; -type mhi_device, dev_type; -type mmc_block_device, dev_type; -type modem_block_device, dev_type; -type modem_efs_partition_device, dev_type; -type shared_log_device, dev_type; -type smem_log_device, dev_type; -type ssd_block_device, dev_type; diff --git a/common/prebuilts/sepolicy/file.te b/common/prebuilts/sepolicy/file.te deleted file mode 100644 index 2ee4199..0000000 --- a/common/prebuilts/sepolicy/file.te +++ /dev/null @@ -1,9 +0,0 @@ -type firmware_file, fs_type, contextmount_type; -type modem_config_file, file_type, data_file_type; -type qmuxd_socket, file_type; -type sysfs_esoc, sysfs_type, fs_type; -type sysfs_hsic, sysfs_type, fs_type; -type sysfs_hsic_host_rdy, sysfs_type, file_type; -type sysfs_hsic_modem_wait, sysfs_type, fs_type; -type sysfs_msm_subsys, sysfs_type, fs_type; -type sysfs_smdcntl_open_timeout, fs_type, sysfs_type; diff --git a/common/prebuilts/sepolicy/file_contexts b/common/prebuilts/sepolicy/file_contexts deleted file mode 100644 index 101e346..0000000 --- a/common/prebuilts/sepolicy/file_contexts +++ /dev/null @@ -1,29 +0,0 @@ -# Qualcomm daemons for audio -/system/bin/qmuxd u:object_r:qmux_exec:s0 -/system/bin/rmt_storage u:object_r:rmt_exec:s0 - -# Files and symlinks used by qmuxd and rmt_storage. -/dev/block/mmcblk0p1 u:object_r:modem_efs_partition_device:s0 -/dev/block/mmcblk0p12 u:object_r:modem_efs_partition_device:s0 -/dev/block/mmcblk0p13 u:object_r:modem_efs_partition_device:s0 -/dev/block/mmcblk0p15 u:object_r:modem_efs_partition_device:s0 -/dev/block/mmcblk0p2 u:object_r:modem_efs_partition_device:s0 -/dev/block/bootdevice/by-name/modemst1 u:object_r:modem_efs_partition_device:s0 -/dev/block/bootdevice/by-name/modemst2 u:object_r:modem_efs_partition_device:s0 -/dev/block/bootdevice/by-name/fsg u:object_r:modem_efs_partition_device:s0 -/dev/block/bootdevice/by-name/fsc u:object_r:modem_efs_partition_device:s0 - -/data/misc/modem_config(/.*)? u:object_r:modem_config_file:s0 - -/dev/block/mmcblk0 u:object_r:mmc_block_device:s0 - -/sys/bus/esoc(/.*)? u:object_r:sysfs_esoc:s0 - -sys/devices/virtual/hsicctl/hsicctl1[0-9]/modem_wait u:object_r:sysfs_hsic_modem_wait:s0 -/sys/devices/virtual/hsicctl/hsicctl[0-9]/modem_wait u:object_r:sysfs_hsic_modem_wait:s0 -/sys/bus/platform/drivers/xhci_msm_hsic(/.*)? u:object_r:sysfs_hsic:s0 -/sys/devices/msm_hsic_host/host_ready u:object_r:sysfs_hsic_host_rdy:s0 - -/dev/mhi_pipe_.* u:object_r:mhi_device:s0 -/dev/diag u:object_r:diag_device:s0 -/dev/smem_log u:object_r:smem_log_device:s0 diff --git a/common/prebuilts/sepolicy/qmux.te b/common/prebuilts/sepolicy/qmux.te deleted file mode 100644 index 7235ea2..0000000 --- a/common/prebuilts/sepolicy/qmux.te +++ /dev/null @@ -1,30 +0,0 @@ -# Qualcomm Management Interface Multiplexer -type qmux, domain; -type qmux_exec, exec_type, file_type; - -init_daemon_domain(qmux) -net_domain(qmux) - -wakelock_use(qmux) -allow qmux sysfs_msm_subsys:dir r_dir_perms; -allow qmux sysfs_msm_subsys:lnk_file r_file_perms; - -allow qmux qmuxd_socket:dir w_dir_perms; -allow qmux qmuxd_socket:sock_file create_file_perms; - -allow qmux radio_device:chr_file rw_file_perms; - -# Access to /sys/devices/virtual/smdpkt/smdcntl*/open_timeout -allow qmux sysfs_smdcntl_open_timeout:file rw_file_perms; - -allow qmux self:capability { setuid setgid setpcap dac_override }; - -#Allow qmux to have the CAP_BLOCK_SUSPEND capability -allow qmux qmux:capability2 { block_suspend }; - -allow qmux sysfs_esoc:dir r_dir_perms; -allow qmux sysfs_hsic_modem_wait:file w_file_perms; -allow qmux sysfs_esoc:lnk_file read; - -allow qmux mhi_device:chr_file rw_file_perms; -allow qmux diag_device:chr_file { rw_file_perms }; diff --git a/common/prebuilts/sepolicy/rmt.te b/common/prebuilts/sepolicy/rmt.te deleted file mode 100644 index 9e78e22..0000000 --- a/common/prebuilts/sepolicy/rmt.te +++ /dev/null @@ -1,29 +0,0 @@ -# remote storage process -type rmt, domain; -type rmt_exec, exec_type, file_type; - -init_daemon_domain(rmt) - -allow rmt shared_log_device:chr_file rw_file_perms; - -wakelock_use(rmt) -allow rmt self:capability { setuid setgid setpcap net_raw sys_admin dac_override }; - -allow rmt modem_efs_partition_device:blk_file rw_file_perms; -allow rmt block_device:dir r_dir_perms; -allow rmt cgroup:dir create_dir_perms; -allow rmt smem_log_device:chr_file rw_file_perms; - -# Allow access to /dev/uio0. -allow rmt uio_device:chr_file rw_file_perms; - -allow rmt mmc_block_device:blk_file r_file_perms; - -allow rmt self:socket create_socket_perms; - -allow rmt root_block_device:blk_file r_file_perms; -allow rmt modem_block_device:blk_file rw_file_perms; -allow rmt block_device:dir search; - -unix_socket_connect(rmt, property, init) -allow rmt ctl_default_prop:property_service set; diff --git a/common/prebuilts/sepolicy/te_macros b/common/prebuilts/sepolicy/te_macros deleted file mode 100644 index ba9c0ec..0000000 --- a/common/prebuilts/sepolicy/te_macros +++ /dev/null @@ -1,11 +0,0 @@ -# Allow client domain to connect to and send -# via a local socket to the qmux domain. -# Also allow the client domain to remove -# its own socket. -define(`qmux_socket', ` -type $1_qmuxd_socket, file_type; -file_type_auto_trans($1, qmuxd_socket, $1_qmuxd_socket) -allow $1 qmuxd_socket:dir remove_name; -unix_socket_connect($1, qmuxd, qmux) -allow qmux $1_qmuxd_socket:sock_file { getattr unlink }; -') diff --git a/common/prebuilts/sepolicy/ueventd.te b/common/prebuilts/sepolicy/ueventd.te deleted file mode 100644 index c4f2ad0..0000000 --- a/common/prebuilts/sepolicy/ueventd.te +++ /dev/null @@ -1,3 +0,0 @@ -# Allow firmware_file access to load Non-HLOS images -allow ueventd firmware_file:dir search; -allow ueventd firmware_file:file { read getattr open }; |