From e8de4d12088dc053a7265a965d53f2360a3724a3 Mon Sep 17 00:00:00 2001 From: Vachounet Date: Tue, 15 May 2018 10:32:56 +0200 Subject: [PATCH] sanders: start that treble disaster --- Android.mk | 2 +- BoardConfig.mk | 9 ++- configs/manifest.xml | 27 ++++++++ device.mk | 67 ++++++++++--------- rootdir/etc/fstab.recovery | 2 +- sepolicy/{ => vendor}/adspd.te | 0 sepolicy/{ => vendor}/bootanim.te | 0 sepolicy/{ => vendor}/cameraserver.te | 0 sepolicy/{ => vendor}/charge_only.te | 0 sepolicy/{ => vendor}/cnd.te | 0 sepolicy/{ => vendor}/device.te | 0 sepolicy/{ => vendor}/energyawareness.te | 0 sepolicy/{ => vendor}/esepmdaemon.te | 0 sepolicy/{ => vendor}/file.te | 0 sepolicy/{ => vendor}/file_contexts | 0 sepolicy/{ => vendor}/fingerprintd.te | 0 sepolicy/{ => vendor}/firmware_file.te | 0 sepolicy/{ => vendor}/fsck.te | 0 sepolicy/{ => vendor}/hal_camera_default.te | 0 sepolicy/{ => vendor}/hal_drm_default.te | 0 .../{ => vendor}/hal_fingerprint_default.te | 0 sepolicy/{ => vendor}/hal_gnss_qti.te | 0 sepolicy/{ => vendor}/hal_light_default.te | 0 sepolicy/{ => vendor}/hal_power_default.te | 0 sepolicy/{ => vendor}/hal_sensors_default.te | 0 sepolicy/{ => vendor}/hwservicemanager.te | 0 sepolicy/{ => vendor}/ims.te | 0 sepolicy/{ => vendor}/init.te | 0 sepolicy/{ => vendor}/init_wifi.te | 0 sepolicy/{ => vendor}/installd.te | 0 sepolicy/{ => vendor}/kernel.te | 0 sepolicy/{ => vendor}/logd.te | 0 sepolicy/{ => vendor}/mediacodec.te | 0 sepolicy/{ => vendor}/mediadrmserver.te | 0 sepolicy/{ => vendor}/mediaextractor.te | 0 sepolicy/{ => vendor}/mediaserver.te | 0 sepolicy/{ => vendor}/mm-qcamerad.te | 0 sepolicy/{ => vendor}/mmi_boot.te | 0 sepolicy/{ => vendor}/netd.te | 0 sepolicy/{ => vendor}/netmgrd.te | 0 sepolicy/{ => vendor}/nfc.te | 0 sepolicy/{ => vendor}/per_mgr.te | 0 sepolicy/{ => vendor}/perfd.te | 0 sepolicy/{ => vendor}/peripheral_manager.te | 0 sepolicy/{ => vendor}/persist_file.te | 0 sepolicy/{ => vendor}/platform_app.te | 0 sepolicy/{ => vendor}/priv_app.te | 0 sepolicy/{ => vendor}/property.te | 0 sepolicy/{ => vendor}/property_contexts | 0 sepolicy/{ => vendor}/qseeproxy.te | 0 sepolicy/{ => vendor}/qtelephony.te | 0 sepolicy/{ => vendor}/qti.te | 0 sepolicy/{ => vendor}/qti_init_shell.te | 0 sepolicy/{ => vendor}/radio.te | 0 sepolicy/{ => vendor}/rfs_access.te | 0 sepolicy/{ => vendor}/rfs_file.te | 0 sepolicy/{ => vendor}/rild.te | 0 sepolicy/{ => vendor}/rmt_storage.te | 0 sepolicy/{ => vendor}/service.te | 0 sepolicy/{ => vendor}/service_contexts | 0 sepolicy/{ => vendor}/servicemanager.te | 0 sepolicy/{ => vendor}/surfaceflinger.te | 0 sepolicy/{ => vendor}/system_app.te | 0 sepolicy/{ => vendor}/system_server.te | 0 sepolicy/{ => vendor}/tee.te | 0 sepolicy/{ => vendor}/thermal-engine.te | 0 sepolicy/{ => vendor}/time_daemon.te | 0 sepolicy/{ => vendor}/toolbox.te | 0 sepolicy/{ => vendor}/ueventd.te | 0 sepolicy/{ => vendor}/untrusted_app.te | 0 sepolicy/{ => vendor}/untrusted_app_25.te | 0 sepolicy/{ => vendor}/vold.te | 0 sepolicy/{ => vendor}/wcnss_filter.te | 0 sepolicy/{ => vendor}/wcnss_service.te | 0 sepolicy/{ => vendor}/zygote.te | 0 75 files changed, 73 insertions(+), 34 deletions(-) rename sepolicy/{ => vendor}/adspd.te (100%) rename sepolicy/{ => vendor}/bootanim.te (100%) rename sepolicy/{ => vendor}/cameraserver.te (100%) rename sepolicy/{ => vendor}/charge_only.te (100%) rename sepolicy/{ => vendor}/cnd.te (100%) rename sepolicy/{ => vendor}/device.te (100%) rename sepolicy/{ => vendor}/energyawareness.te (100%) rename sepolicy/{ => vendor}/esepmdaemon.te (100%) rename sepolicy/{ => vendor}/file.te (100%) rename sepolicy/{ => vendor}/file_contexts (100%) rename sepolicy/{ => vendor}/fingerprintd.te (100%) rename sepolicy/{ => vendor}/firmware_file.te (100%) rename sepolicy/{ => vendor}/fsck.te (100%) rename sepolicy/{ => vendor}/hal_camera_default.te (100%) rename sepolicy/{ => vendor}/hal_drm_default.te (100%) rename sepolicy/{ => vendor}/hal_fingerprint_default.te (100%) rename sepolicy/{ => vendor}/hal_gnss_qti.te (100%) rename sepolicy/{ => vendor}/hal_light_default.te (100%) rename sepolicy/{ => vendor}/hal_power_default.te (100%) rename sepolicy/{ => vendor}/hal_sensors_default.te (100%) rename sepolicy/{ => vendor}/hwservicemanager.te (100%) rename sepolicy/{ => vendor}/ims.te (100%) rename sepolicy/{ => vendor}/init.te (100%) rename sepolicy/{ => vendor}/init_wifi.te (100%) rename sepolicy/{ => vendor}/installd.te (100%) rename sepolicy/{ => vendor}/kernel.te (100%) rename sepolicy/{ => vendor}/logd.te (100%) rename sepolicy/{ => vendor}/mediacodec.te (100%) rename sepolicy/{ => vendor}/mediadrmserver.te (100%) rename sepolicy/{ => vendor}/mediaextractor.te (100%) rename sepolicy/{ => vendor}/mediaserver.te (100%) rename sepolicy/{ => vendor}/mm-qcamerad.te (100%) rename sepolicy/{ => vendor}/mmi_boot.te (100%) rename sepolicy/{ => vendor}/netd.te (100%) rename sepolicy/{ => vendor}/netmgrd.te (100%) rename sepolicy/{ => vendor}/nfc.te (100%) rename sepolicy/{ => vendor}/per_mgr.te (100%) rename sepolicy/{ => vendor}/perfd.te (100%) rename sepolicy/{ => vendor}/peripheral_manager.te (100%) rename sepolicy/{ => vendor}/persist_file.te (100%) rename sepolicy/{ => vendor}/platform_app.te (100%) rename sepolicy/{ => vendor}/priv_app.te (100%) rename sepolicy/{ => vendor}/property.te (100%) rename sepolicy/{ => vendor}/property_contexts (100%) rename sepolicy/{ => vendor}/qseeproxy.te (100%) rename sepolicy/{ => vendor}/qtelephony.te (100%) rename sepolicy/{ => vendor}/qti.te (100%) rename sepolicy/{ => vendor}/qti_init_shell.te (100%) rename sepolicy/{ => vendor}/radio.te (100%) rename sepolicy/{ => vendor}/rfs_access.te (100%) rename sepolicy/{ => vendor}/rfs_file.te (100%) rename sepolicy/{ => vendor}/rild.te (100%) rename sepolicy/{ => vendor}/rmt_storage.te (100%) rename sepolicy/{ => vendor}/service.te (100%) rename sepolicy/{ => vendor}/service_contexts (100%) rename sepolicy/{ => vendor}/servicemanager.te (100%) rename sepolicy/{ => vendor}/surfaceflinger.te (100%) rename sepolicy/{ => vendor}/system_app.te (100%) rename sepolicy/{ => vendor}/system_server.te (100%) rename sepolicy/{ => vendor}/tee.te (100%) rename sepolicy/{ => vendor}/thermal-engine.te (100%) rename sepolicy/{ => vendor}/time_daemon.te (100%) rename sepolicy/{ => vendor}/toolbox.te (100%) rename sepolicy/{ => vendor}/ueventd.te (100%) rename sepolicy/{ => vendor}/untrusted_app.te (100%) rename sepolicy/{ => vendor}/untrusted_app_25.te (100%) rename sepolicy/{ => vendor}/vold.te (100%) rename sepolicy/{ => vendor}/wcnss_filter.te (100%) rename sepolicy/{ => vendor}/wcnss_service.te (100%) rename sepolicy/{ => vendor}/zygote.te (100%) diff --git a/Android.mk b/Android.mk index d25d932..25ed151 100644 --- a/Android.mk +++ b/Android.mk @@ -142,7 +142,7 @@ $(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @echo "IMS lib link: $@" @mkdir -p $(dir $@) @rm -rf $@ - $(hide) ln -sf /system/vendor/lib64/$(notdir $@) $@ + $(hide) ln -sf /vendor/lib64/$(notdir $@) $@ ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS) diff --git a/BoardConfig.mk b/BoardConfig.mk index 9dad24a..276d47c 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -215,11 +215,11 @@ USE_SENSOR_MULTI_HAL := true # Shim TARGET_LD_SHIM_LIBS := \ - /system/vendor/bin/adspd|libshim_adsp.so \ + /vendor/bin/adspd|libshim_adsp.so \ /system/lib/lib_motsensorlistener.so|libsensor.so \ /system/lib/libjustshoot.so|libshims_camera.so \ /system/vendor/lib/libguy.so|libshim_camera_hal.so \ - /system/vendor/lib64/libmdmcutback.so|libqsap_shim.so + /vendor/lib64/libmdmcutback.so|libqsap_shim.so # Wifi BOARD_HAS_QCOM_WLAN := true @@ -234,3 +234,8 @@ WIFI_DRIVER_FW_PATH_STA := "sta" WIFI_DRIVER_FW_PATH_P2P := "p2p" WPA_SUPPLICANT_VERSION := VER_0_8_X +# Split selinux policy + +TARGET_COPY_OUT_VENDOR := vendor +BOARD_VENDORIMAGE_PARTITION_SIZE := 805306368 +BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 diff --git a/configs/manifest.xml b/configs/manifest.xml index 95927d0..4636b75 100644 --- a/configs/manifest.xml +++ b/configs/manifest.xml @@ -1,4 +1,22 @@ + + android.hardware.audio + hwbinder + 2.0 + + IDevicesFactory + default + + + + android.hardware.audio.effect + hwbinder + 2.0 + + IEffectsFactory + default + + android.hardware.graphics.allocator hwbinder @@ -8,6 +26,15 @@ default + + android.hardware.graphics.composer + hwbinder + 2.1 + + IComposer + default + + android.hardware.graphics.mapper passthrough diff --git a/device.mk b/device.mk index 0973fdf..d2ab798 100644 --- a/device.mk +++ b/device.mk @@ -84,18 +84,20 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.audio@2.0-impl \ android.hardware.audio.effect@2.0-impl \ + android.hardware.audio@2.0-service \ + android.hardware.audio.effect@2.0-service \ android.hardware.broadcastradio@1.0-impl PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf \ - $(LOCAL_PATH)/audio/audio_policy.conf:system/vendor/etc/audio_policy.conf \ - $(LOCAL_PATH)/audio/audio_output_policy.conf:system/vendor/etc/audio_output_policy.conf \ - $(LOCAL_PATH)/audio/audio_platform_info_extcodec.xml:system/vendor/etc/audio_platform_info_extcodec.xml \ - $(LOCAL_PATH)/audio/mixer_paths.xml:system/vendor/etc/mixer_paths.xml \ - $(LOCAL_PATH)/audio/audio_ext_spkr.conf:system/vendor/etc/audio_ext_spkr.conf \ - $(LOCAL_PATH)/audio/audio_platform_info.xml:system/vendor/etc/audio_platform_info.xml \ - $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:system/vendor/etc/sound_trigger_mixer_paths.xml \ - $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:system/vendor/etc/sound_trigger_platform_info.xml + $(LOCAL_PATH)/audio/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \ + $(LOCAL_PATH)/audio/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \ + $(LOCAL_PATH)/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \ + $(LOCAL_PATH)/audio/audio_platform_info_extcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_extcodec.xml \ + $(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ + $(LOCAL_PATH)/audio/audio_ext_spkr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_ext_spkr.conf \ + $(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ + $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ + $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml # Bluetooth PRODUCT_PACKAGES += \ @@ -124,13 +126,13 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/camera/vfwconfig.json:system/etc/camera/vfwconfig.json PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/gps/etc/flp.conf:system/vendor/etc/flp.conf \ - $(LOCAL_PATH)/gps/etc/gps.conf:system/vendor/etc/gps.conf \ - $(LOCAL_PATH)/gps/etc/izat.conf:system/vendor/etc/izat.conf \ - $(LOCAL_PATH)/gps/etc/lowi.conf:system/vendor/etc/lowi.conf \ - $(LOCAL_PATH)/gps/etc/sap.conf:system/vendor/etc/sap.conf \ - $(LOCAL_PATH)/gps/etc/xtwifi.conf:system/vendor/etc/xtwifi.conf \ - $(LOCAL_PATH)/gps/etc/cacert_location.pem:system/vendor/etc/cacert_location.pem + $(LOCAL_PATH)/gps/etc/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \ + $(LOCAL_PATH)/gps/etc/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \ + $(LOCAL_PATH)/gps/etc/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \ + $(LOCAL_PATH)/gps/etc/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \ + $(LOCAL_PATH)/gps/etc/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \ + $(LOCAL_PATH)/gps/etc/xtwifi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/xtwifi.conf \ + $(LOCAL_PATH)/gps/etc/cacert_location.pem:$(TARGET_COPY_OUT_VENDOR)/etc/cacert_location.pem # MotoActions PRODUCT_PACKAGES += \ @@ -143,6 +145,7 @@ PRODUCT_PACKAGES += \ android.hardware.graphics.allocator@2.0-impl \ android.hardware.graphics.allocator@2.0-service \ android.hardware.graphics.composer@2.1-impl \ + android.hardware.graphics.composer@2.1-service \ android.hardware.graphics.mapper@2.0-impl \ android.hardware.memtrack@1.0-impl \ android.hardware.configstore@1.0-service \ @@ -209,7 +212,7 @@ PRODUCT_PACKAGES += \ # IRSC PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/sec_config:system/vendor/etc/sec_config + $(LOCAL_PATH)/configs/sec_config:$(TARGET_COPY_OUT_VENDOR)/etc/sec_config # Keylayouts PRODUCT_COPY_FILES += \ @@ -241,23 +244,23 @@ PRODUCT_PACKAGES += \ android.hardware.drm@1.0-service.widevine PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/qdcm_calib_data_mipi_mot_vid_djn_1080p_550.xml:system/vendor/etc/qdcm_calib_data_mipi_mot_vid_djn_1080p_550.xml \ - $(LOCAL_PATH)/configs/qdcm_calib_data_mipi_mot_vid_tianma_1080p_550.xml:system/vendor/etc/qdcm_calib_data_mipi_mot_vid_tianma_1080p_550.xml + $(LOCAL_PATH)/configs/qdcm_calib_data_mipi_mot_vid_djn_1080p_550.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_mipi_mot_vid_djn_1080p_550.xml \ + $(LOCAL_PATH)/configs/qdcm_calib_data_mipi_mot_vid_tianma_1080p_550.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_mipi_mot_vid_tianma_1080p_550.xml # Media PRODUCT_PACKAGES += \ libc2dcolorconvert PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/media_codecs.xml:system/vendor/etc/media_codecs.xml \ - $(LOCAL_PATH)/configs/media_codecs_performance.xml:system/vendor/etc/media_codecs_performance.xml \ - $(LOCAL_PATH)/configs/media_profiles.xml:system/vendor/etc/media_profiles_vendor.xml \ + $(LOCAL_PATH)/configs/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ + $(LOCAL_PATH)/configs/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ + $(LOCAL_PATH)/configs/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \ $(LOCAL_PATH)/configs/media_profiles.xml:system/etc/media_profiles.xml \ PRODUCT_COPY_FILES += \ - frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/vendor/etc/media_codecs_google_audio.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/vendor/etc/media_codecs_google_telephony.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/vendor/etc/media_codecs_google_video.xml + frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml # NFC PRODUCT_COPY_FILES += \ @@ -318,7 +321,7 @@ PRODUCT_PACKAGES += \ init.qcom.rc \ PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/rootdir/etc/ueventd.qcom.rc:system/vendor/ueventd.rc + $(LOCAL_PATH)/rootdir/etc/ueventd.qcom.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc # Powerhint configuration file PRODUCT_COPY_FILES += \ @@ -327,7 +330,7 @@ PRODUCT_COPY_FILES += \ # Releasetools script PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/check_features.sh:system/vendor/bin/check_features.sh + $(LOCAL_PATH)/configs/check_features.sh:$(TARGET_COPY_OUT_VENDOR)/bin/check_features.sh # RIL PRODUCT_PACKAGES += \ @@ -341,8 +344,8 @@ PRODUCT_PACKAGES += \ # Seccomp policy PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/seccomp_policy/mediacodec.policy:system/vendor/etc/seccomp_policy/mediacodec.policy \ - $(LOCAL_PATH)/seccomp_policy/mediaextractor.policy:system/vendor/etc/seccomp_policy/mediaextractor.policy + $(LOCAL_PATH)/seccomp_policy/mediacodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \ + $(LOCAL_PATH)/seccomp_policy/mediaextractor.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaextractor.policy # IMS PRODUCT_PACKAGES += \ @@ -364,7 +367,7 @@ PRODUCT_PACKAGES += \ # Thermal PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/thermal-engine-sanders.conf:system/vendor/etc/thermal-engine.conf + $(LOCAL_PATH)/configs/thermal-engine-sanders.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf # USB HAL PRODUCT_PACKAGES += \ @@ -424,3 +427,7 @@ PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0 PRODUCT_GMS_CLIENTID_BASE := android-motorola PRODUCT_VENDOR_KERNEL_HEADERS := hardware/qcom/msm8996/kernel-headers + +PRODUCT_VENDOR_MOVE_ENABLED := true +PRODUCT_FULL_TREBLE_OVERRIDE := true +PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE := 27 diff --git a/rootdir/etc/fstab.recovery b/rootdir/etc/fstab.recovery index 84a0c33..6669852 100644 --- a/rootdir/etc/fstab.recovery +++ b/rootdir/etc/fstab.recovery @@ -16,7 +16,7 @@ /dev/block/bootdevice/by-name/boot /boot emmc defaults recoveryonly /dev/block/bootdevice/by-name/recovery /recovery emmc defaults recoveryonly /dev/block/bootdevice/by-name/misc /misc emmc defaults defaults - +/dev/block/bootdevice/by-name/oem /vendor ext4 rw,barrier=1,discard wait /devices/soc/7864900.sdhci/mmc_host* auto auto nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=userdata /devices/*/xhci-hcd.*.auto/usb* auto auto defaults voldmanaged=usb:auto /dev/block/zram0 none swap defaults zramsize=536870912,max_comp_streams=4 diff --git a/sepolicy/adspd.te b/sepolicy/vendor/adspd.te similarity index 100% rename from sepolicy/adspd.te rename to sepolicy/vendor/adspd.te diff --git a/sepolicy/bootanim.te b/sepolicy/vendor/bootanim.te similarity index 100% rename from sepolicy/bootanim.te rename to sepolicy/vendor/bootanim.te diff --git a/sepolicy/cameraserver.te b/sepolicy/vendor/cameraserver.te similarity index 100% rename from sepolicy/cameraserver.te rename to sepolicy/vendor/cameraserver.te diff --git a/sepolicy/charge_only.te b/sepolicy/vendor/charge_only.te similarity index 100% rename from sepolicy/charge_only.te rename to sepolicy/vendor/charge_only.te diff --git a/sepolicy/cnd.te b/sepolicy/vendor/cnd.te similarity index 100% rename from sepolicy/cnd.te rename to sepolicy/vendor/cnd.te diff --git a/sepolicy/device.te b/sepolicy/vendor/device.te similarity index 100% rename from sepolicy/device.te rename to sepolicy/vendor/device.te diff --git a/sepolicy/energyawareness.te b/sepolicy/vendor/energyawareness.te similarity index 100% rename from sepolicy/energyawareness.te rename to sepolicy/vendor/energyawareness.te diff --git a/sepolicy/esepmdaemon.te b/sepolicy/vendor/esepmdaemon.te similarity index 100% rename from sepolicy/esepmdaemon.te rename to sepolicy/vendor/esepmdaemon.te diff --git a/sepolicy/file.te b/sepolicy/vendor/file.te similarity index 100% rename from sepolicy/file.te rename to sepolicy/vendor/file.te diff --git a/sepolicy/file_contexts b/sepolicy/vendor/file_contexts similarity index 100% rename from sepolicy/file_contexts rename to sepolicy/vendor/file_contexts diff --git a/sepolicy/fingerprintd.te b/sepolicy/vendor/fingerprintd.te similarity index 100% rename from sepolicy/fingerprintd.te rename to sepolicy/vendor/fingerprintd.te diff --git a/sepolicy/firmware_file.te b/sepolicy/vendor/firmware_file.te similarity index 100% rename from sepolicy/firmware_file.te rename to sepolicy/vendor/firmware_file.te diff --git a/sepolicy/fsck.te b/sepolicy/vendor/fsck.te similarity index 100% rename from sepolicy/fsck.te rename to sepolicy/vendor/fsck.te diff --git a/sepolicy/hal_camera_default.te b/sepolicy/vendor/hal_camera_default.te similarity index 100% rename from sepolicy/hal_camera_default.te rename to sepolicy/vendor/hal_camera_default.te diff --git a/sepolicy/hal_drm_default.te b/sepolicy/vendor/hal_drm_default.te similarity index 100% rename from sepolicy/hal_drm_default.te rename to sepolicy/vendor/hal_drm_default.te diff --git a/sepolicy/hal_fingerprint_default.te b/sepolicy/vendor/hal_fingerprint_default.te similarity index 100% rename from sepolicy/hal_fingerprint_default.te rename to sepolicy/vendor/hal_fingerprint_default.te diff --git a/sepolicy/hal_gnss_qti.te b/sepolicy/vendor/hal_gnss_qti.te similarity index 100% rename from sepolicy/hal_gnss_qti.te rename to sepolicy/vendor/hal_gnss_qti.te diff --git a/sepolicy/hal_light_default.te b/sepolicy/vendor/hal_light_default.te similarity index 100% rename from sepolicy/hal_light_default.te rename to sepolicy/vendor/hal_light_default.te diff --git a/sepolicy/hal_power_default.te b/sepolicy/vendor/hal_power_default.te similarity index 100% rename from sepolicy/hal_power_default.te rename to sepolicy/vendor/hal_power_default.te diff --git a/sepolicy/hal_sensors_default.te b/sepolicy/vendor/hal_sensors_default.te similarity index 100% rename from sepolicy/hal_sensors_default.te rename to sepolicy/vendor/hal_sensors_default.te diff --git a/sepolicy/hwservicemanager.te b/sepolicy/vendor/hwservicemanager.te similarity index 100% rename from sepolicy/hwservicemanager.te rename to sepolicy/vendor/hwservicemanager.te diff --git a/sepolicy/ims.te b/sepolicy/vendor/ims.te similarity index 100% rename from sepolicy/ims.te rename to sepolicy/vendor/ims.te diff --git a/sepolicy/init.te b/sepolicy/vendor/init.te similarity index 100% rename from sepolicy/init.te rename to sepolicy/vendor/init.te diff --git a/sepolicy/init_wifi.te b/sepolicy/vendor/init_wifi.te similarity index 100% rename from sepolicy/init_wifi.te rename to sepolicy/vendor/init_wifi.te diff --git a/sepolicy/installd.te b/sepolicy/vendor/installd.te similarity index 100% rename from sepolicy/installd.te rename to sepolicy/vendor/installd.te diff --git a/sepolicy/kernel.te b/sepolicy/vendor/kernel.te similarity index 100% rename from sepolicy/kernel.te rename to sepolicy/vendor/kernel.te diff --git a/sepolicy/logd.te b/sepolicy/vendor/logd.te similarity index 100% rename from sepolicy/logd.te rename to sepolicy/vendor/logd.te diff --git a/sepolicy/mediacodec.te b/sepolicy/vendor/mediacodec.te similarity index 100% rename from sepolicy/mediacodec.te rename to sepolicy/vendor/mediacodec.te diff --git a/sepolicy/mediadrmserver.te b/sepolicy/vendor/mediadrmserver.te similarity index 100% rename from sepolicy/mediadrmserver.te rename to sepolicy/vendor/mediadrmserver.te diff --git a/sepolicy/mediaextractor.te b/sepolicy/vendor/mediaextractor.te similarity index 100% rename from sepolicy/mediaextractor.te rename to sepolicy/vendor/mediaextractor.te diff --git a/sepolicy/mediaserver.te b/sepolicy/vendor/mediaserver.te similarity index 100% rename from sepolicy/mediaserver.te rename to sepolicy/vendor/mediaserver.te diff --git a/sepolicy/mm-qcamerad.te b/sepolicy/vendor/mm-qcamerad.te similarity index 100% rename from sepolicy/mm-qcamerad.te rename to sepolicy/vendor/mm-qcamerad.te diff --git a/sepolicy/mmi_boot.te b/sepolicy/vendor/mmi_boot.te similarity index 100% rename from sepolicy/mmi_boot.te rename to sepolicy/vendor/mmi_boot.te diff --git a/sepolicy/netd.te b/sepolicy/vendor/netd.te similarity index 100% rename from sepolicy/netd.te rename to sepolicy/vendor/netd.te diff --git a/sepolicy/netmgrd.te b/sepolicy/vendor/netmgrd.te similarity index 100% rename from sepolicy/netmgrd.te rename to sepolicy/vendor/netmgrd.te diff --git a/sepolicy/nfc.te b/sepolicy/vendor/nfc.te similarity index 100% rename from sepolicy/nfc.te rename to sepolicy/vendor/nfc.te diff --git a/sepolicy/per_mgr.te b/sepolicy/vendor/per_mgr.te similarity index 100% rename from sepolicy/per_mgr.te rename to sepolicy/vendor/per_mgr.te diff --git a/sepolicy/perfd.te b/sepolicy/vendor/perfd.te similarity index 100% rename from sepolicy/perfd.te rename to sepolicy/vendor/perfd.te diff --git a/sepolicy/peripheral_manager.te b/sepolicy/vendor/peripheral_manager.te similarity index 100% rename from sepolicy/peripheral_manager.te rename to sepolicy/vendor/peripheral_manager.te diff --git a/sepolicy/persist_file.te b/sepolicy/vendor/persist_file.te similarity index 100% rename from sepolicy/persist_file.te rename to sepolicy/vendor/persist_file.te diff --git a/sepolicy/platform_app.te b/sepolicy/vendor/platform_app.te similarity index 100% rename from sepolicy/platform_app.te rename to sepolicy/vendor/platform_app.te diff --git a/sepolicy/priv_app.te b/sepolicy/vendor/priv_app.te similarity index 100% rename from sepolicy/priv_app.te rename to sepolicy/vendor/priv_app.te diff --git a/sepolicy/property.te b/sepolicy/vendor/property.te similarity index 100% rename from sepolicy/property.te rename to sepolicy/vendor/property.te diff --git a/sepolicy/property_contexts b/sepolicy/vendor/property_contexts similarity index 100% rename from sepolicy/property_contexts rename to sepolicy/vendor/property_contexts diff --git a/sepolicy/qseeproxy.te b/sepolicy/vendor/qseeproxy.te similarity index 100% rename from sepolicy/qseeproxy.te rename to sepolicy/vendor/qseeproxy.te diff --git a/sepolicy/qtelephony.te b/sepolicy/vendor/qtelephony.te similarity index 100% rename from sepolicy/qtelephony.te rename to sepolicy/vendor/qtelephony.te diff --git a/sepolicy/qti.te b/sepolicy/vendor/qti.te similarity index 100% rename from sepolicy/qti.te rename to sepolicy/vendor/qti.te diff --git a/sepolicy/qti_init_shell.te b/sepolicy/vendor/qti_init_shell.te similarity index 100% rename from sepolicy/qti_init_shell.te rename to sepolicy/vendor/qti_init_shell.te diff --git a/sepolicy/radio.te b/sepolicy/vendor/radio.te similarity index 100% rename from sepolicy/radio.te rename to sepolicy/vendor/radio.te diff --git a/sepolicy/rfs_access.te b/sepolicy/vendor/rfs_access.te similarity index 100% rename from sepolicy/rfs_access.te rename to sepolicy/vendor/rfs_access.te diff --git a/sepolicy/rfs_file.te b/sepolicy/vendor/rfs_file.te similarity index 100% rename from sepolicy/rfs_file.te rename to sepolicy/vendor/rfs_file.te diff --git a/sepolicy/rild.te b/sepolicy/vendor/rild.te similarity index 100% rename from sepolicy/rild.te rename to sepolicy/vendor/rild.te diff --git a/sepolicy/rmt_storage.te b/sepolicy/vendor/rmt_storage.te similarity index 100% rename from sepolicy/rmt_storage.te rename to sepolicy/vendor/rmt_storage.te diff --git a/sepolicy/service.te b/sepolicy/vendor/service.te similarity index 100% rename from sepolicy/service.te rename to sepolicy/vendor/service.te diff --git a/sepolicy/service_contexts b/sepolicy/vendor/service_contexts similarity index 100% rename from sepolicy/service_contexts rename to sepolicy/vendor/service_contexts diff --git a/sepolicy/servicemanager.te b/sepolicy/vendor/servicemanager.te similarity index 100% rename from sepolicy/servicemanager.te rename to sepolicy/vendor/servicemanager.te diff --git a/sepolicy/surfaceflinger.te b/sepolicy/vendor/surfaceflinger.te similarity index 100% rename from sepolicy/surfaceflinger.te rename to sepolicy/vendor/surfaceflinger.te diff --git a/sepolicy/system_app.te b/sepolicy/vendor/system_app.te similarity index 100% rename from sepolicy/system_app.te rename to sepolicy/vendor/system_app.te diff --git a/sepolicy/system_server.te b/sepolicy/vendor/system_server.te similarity index 100% rename from sepolicy/system_server.te rename to sepolicy/vendor/system_server.te diff --git a/sepolicy/tee.te b/sepolicy/vendor/tee.te similarity index 100% rename from sepolicy/tee.te rename to sepolicy/vendor/tee.te diff --git a/sepolicy/thermal-engine.te b/sepolicy/vendor/thermal-engine.te similarity index 100% rename from sepolicy/thermal-engine.te rename to sepolicy/vendor/thermal-engine.te diff --git a/sepolicy/time_daemon.te b/sepolicy/vendor/time_daemon.te similarity index 100% rename from sepolicy/time_daemon.te rename to sepolicy/vendor/time_daemon.te diff --git a/sepolicy/toolbox.te b/sepolicy/vendor/toolbox.te similarity index 100% rename from sepolicy/toolbox.te rename to sepolicy/vendor/toolbox.te diff --git a/sepolicy/ueventd.te b/sepolicy/vendor/ueventd.te similarity index 100% rename from sepolicy/ueventd.te rename to sepolicy/vendor/ueventd.te diff --git a/sepolicy/untrusted_app.te b/sepolicy/vendor/untrusted_app.te similarity index 100% rename from sepolicy/untrusted_app.te rename to sepolicy/vendor/untrusted_app.te diff --git a/sepolicy/untrusted_app_25.te b/sepolicy/vendor/untrusted_app_25.te similarity index 100% rename from sepolicy/untrusted_app_25.te rename to sepolicy/vendor/untrusted_app_25.te diff --git a/sepolicy/vold.te b/sepolicy/vendor/vold.te similarity index 100% rename from sepolicy/vold.te rename to sepolicy/vendor/vold.te diff --git a/sepolicy/wcnss_filter.te b/sepolicy/vendor/wcnss_filter.te similarity index 100% rename from sepolicy/wcnss_filter.te rename to sepolicy/vendor/wcnss_filter.te diff --git a/sepolicy/wcnss_service.te b/sepolicy/vendor/wcnss_service.te similarity index 100% rename from sepolicy/wcnss_service.te rename to sepolicy/vendor/wcnss_service.te diff --git a/sepolicy/zygote.te b/sepolicy/vendor/zygote.te similarity index 100% rename from sepolicy/zygote.te rename to sepolicy/vendor/zygote.te