diff --git a/Android.bp b/Android.bp index 8dffc79..9a193a3 100644 --- a/Android.bp +++ b/Android.bp @@ -1,223 +1,228 @@ +// // Automatically generated file. DO NOT MODIFY // -// This file is generated by device/xiaomi/sdm660-common/setup-makefiles.sh soong_namespace { - imports: [ - ], } android_app_import { - name: "SoterService", - owner: "xiaomi", - apk: "proprietary/app/SoterService/SoterService.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, + name: "SoterService", + owner: "xiaomi", + apk: "proprietary/system/app/SoterService/SoterService.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, } android_app_import { - name: "CneApp", - owner: "xiaomi", - apk: "proprietary/vendor/app/CneApp/CneApp.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - soc_specific: true, + name: "CneApp", + owner: "xiaomi", + apk: "proprietary/vendor/app/CneApp/CneApp.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + soc_specific: true, } android_app_import { - name: "IWlanService", - owner: "xiaomi", - apk: "proprietary/vendor/app/IWlanService/IWlanService.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - soc_specific: true, + name: "IWlanService", + owner: "xiaomi", + apk: "proprietary/vendor/app/IWlanService/IWlanService.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + soc_specific: true, } android_app_import { - name: "TimeService", - owner: "xiaomi", - apk: "proprietary/vendor/app/TimeService/TimeService.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - soc_specific: true, + name: "TimeService", + owner: "xiaomi", + apk: "proprietary/vendor/app/TimeService/TimeService.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + soc_specific: true, } android_app_import { - name: "PowerOffAlarm", - owner: "xiaomi", - apk: "proprietary/system_ext/app/PowerOffAlarm/PowerOffAlarm.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - system_ext_specific: true, + name: "PowerOffAlarm", + owner: "xiaomi", + apk: "proprietary/system_ext/app/PowerOffAlarm/PowerOffAlarm.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + system_ext_specific: true, } android_app_import { - name: "QtiTelephonyService", - owner: "xiaomi", - apk: "proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - system_ext_specific: true, + name: "QtiTelephonyService", + owner: "xiaomi", + apk: "proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + system_ext_specific: true, } android_app_import { - name: "embms", - owner: "xiaomi", - apk: "proprietary/system_ext/app/embms/embms.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - system_ext_specific: true, + name: "embms", + owner: "xiaomi", + apk: "proprietary/system_ext/app/embms/embms.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + system_ext_specific: true, } android_app_import { - name: "dpmserviceapp", - owner: "xiaomi", - apk: "proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - privileged: true, - system_ext_specific: true, + name: "dpmserviceapp", + owner: "xiaomi", + apk: "proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + privileged: true, + system_ext_specific: true, } android_app_import { - name: "ims", - owner: "xiaomi", - apk: "proprietary/system_ext/priv-app/ims/ims.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - privileged: true, - system_ext_specific: true, + name: "ims", + owner: "xiaomi", + apk: "proprietary/system_ext/priv-app/ims/ims.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + privileged: true, + system_ext_specific: true, } android_app_import { - name: "qcrilmsgtunnel", - owner: "xiaomi", - apk: "proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - privileged: true, - system_ext_specific: true, + name: "qcrilmsgtunnel", + owner: "xiaomi", + apk: "proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + privileged: true, + system_ext_specific: true, } dex_import { - name: "com.qti.dpmframework", - owner: "xiaomi", - jars: ["proprietary/system_ext/framework/com.qti.dpmframework.jar"], - system_ext_specific: true, + name: "com.qti.dpmframework", + owner: "xiaomi", + jars: [ + "proprietary/system_ext/framework/com.qti.dpmframework.jar", + ], + system_ext_specific: true, } dex_import { - name: "dpmapi", - owner: "xiaomi", - jars: ["proprietary/system_ext/framework/dpmapi.jar"], - system_ext_specific: true, + name: "dpmapi", + owner: "xiaomi", + jars: [ + "proprietary/system_ext/framework/dpmapi.jar", + ], + system_ext_specific: true, } dex_import { - name: "embmslibrary", - owner: "xiaomi", - jars: ["proprietary/system_ext/framework/embmslibrary.jar"], - system_ext_specific: true, + name: "embmslibrary", + owner: "xiaomi", + jars: [ + "proprietary/system_ext/framework/embmslibrary.jar", + ], + system_ext_specific: true, } dex_import { - name: "qcrilhook", - owner: "xiaomi", - jars: ["proprietary/system_ext/framework/qcrilhook.jar"], - system_ext_specific: true, + name: "qcrilhook", + owner: "xiaomi", + jars: [ + "proprietary/system_ext/framework/qcrilhook.jar", + ], + system_ext_specific: true, } prebuilt_etc_xml { - name: "manifest_android.hardware.drm@1.3-service.widevine.xml", - owner: "xiaomi", - src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml", - filename_from_src: true, - sub_dir: "vintf/manifest", - soc_specific: true, + name: "manifest_android.hardware.drm@1.3-service.widevine.xml", + owner: "xiaomi", + src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml", + filename_from_src: true, + sub_dir: "vintf/manifest", + soc_specific: true, } prebuilt_etc_xml { - name: "vendor.qti.gnss@3.0-service.xml", - owner: "xiaomi", - src: "proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@3.0-service.xml", - filename_from_src: true, - sub_dir: "vintf/manifest", - soc_specific: true, + name: "vendor.qti.gnss@3.0-service.xml", + owner: "xiaomi", + src: "proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@3.0-service.xml", + filename_from_src: true, + sub_dir: "vintf/manifest", + soc_specific: true, } install_symlink { - name: "libimscamera_jni_libimscamera_jni_symlink64", - system_ext_specific: true, - installed_location: "priv-app/ims/lib/arm64/libimscamera_jni.so", - symlink_target: "/system_ext/lib64/libimscamera_jni.so", + name: "system_ext_priv-app_ims_lib_arm64_libimscamera_jni_so", + system_ext_specific: true, + installed_location: "priv-app/ims/lib/arm64/libimscamera_jni.so", + symlink_target: "/system_ext/lib64/libimscamera_jni.so", } install_symlink { - name: "libimsmedia_jni_libimsmedia_jni_symlink64", - system_ext_specific: true, - installed_location: "priv-app/ims/lib/arm64/libimsmedia_jni.so", - symlink_target: "/system_ext/lib64/libimsmedia_jni.so", + name: "system_ext_priv-app_ims_lib_arm64_libimsmedia_jni_so", + system_ext_specific: true, + installed_location: "priv-app/ims/lib/arm64/libimsmedia_jni.so", + symlink_target: "/system_ext/lib64/libimsmedia_jni.so", } install_symlink { - name: "libEGL_adreno_libEGL_adreno_symlink32", - soc_specific: true, - installed_location: "lib/libEGL_adreno.so", - symlink_target: "/vendor/lib/egl/libEGL_adreno.so", + name: "vendor_lib_libEGL_adreno_so", + soc_specific: true, + installed_location: "lib/libEGL_adreno.so", + symlink_target: "/vendor/lib/egl/libEGL_adreno.so", } install_symlink { - name: "libGLESv2_adreno_libGLESv2_adreno_symlink32", - soc_specific: true, - installed_location: "lib/libGLESv2_adreno.so", - symlink_target: "/vendor/lib/egl/libGLESv2_adreno.so", + name: "vendor_lib_libGLESv2_adreno_so", + soc_specific: true, + installed_location: "lib/libGLESv2_adreno.so", + symlink_target: "/vendor/lib/egl/libGLESv2_adreno.so", } install_symlink { - name: "libq3dtools_adreno_libq3dtools_adreno_symlink32", - soc_specific: true, - installed_location: "lib/libq3dtools_adreno.so", - symlink_target: "/vendor/lib/egl/libq3dtools_adreno.so", + name: "vendor_lib_libq3dtools_adreno_so", + soc_specific: true, + installed_location: "lib/libq3dtools_adreno.so", + symlink_target: "/vendor/lib/egl/libq3dtools_adreno.so", } install_symlink { - name: "libEGL_adreno_libEGL_adreno_symlink64", - soc_specific: true, - installed_location: "lib64/libEGL_adreno.so", - symlink_target: "/vendor/lib64/egl/libEGL_adreno.so", + name: "vendor_lib64_libEGL_adreno_so", + soc_specific: true, + installed_location: "lib64/libEGL_adreno.so", + symlink_target: "/vendor/lib64/egl/libEGL_adreno.so", } install_symlink { - name: "libGLESv2_adreno_libGLESv2_adreno_symlink64", - soc_specific: true, - installed_location: "lib64/libGLESv2_adreno.so", - symlink_target: "/vendor/lib64/egl/libGLESv2_adreno.so", + name: "vendor_lib64_libGLESv2_adreno_so", + soc_specific: true, + installed_location: "lib64/libGLESv2_adreno.so", + symlink_target: "/vendor/lib64/egl/libGLESv2_adreno.so", } install_symlink { - name: "libq3dtools_adreno_libq3dtools_adreno_symlink64", - soc_specific: true, - installed_location: "lib64/libq3dtools_adreno.so", - symlink_target: "/vendor/lib64/egl/libq3dtools_adreno.so", + name: "vendor_lib64_libq3dtools_adreno_so", + soc_specific: true, + installed_location: "lib64/libq3dtools_adreno.so", + symlink_target: "/vendor/lib64/egl/libq3dtools_adreno.so", } - diff --git a/Android.mk b/Android.mk index e923f41..362133d 100644 --- a/Android.mk +++ b/Android.mk @@ -1,9 +1,5 @@ +# # Automatically generated file. DO NOT MODIFY # -# This file is generated by device/xiaomi/sdm660-common/setup-makefiles.sh LOCAL_PATH := $(call my-dir) - -ifneq ($(filter jasmine_sprout jason lavender platina twolip wayne whyred,$(TARGET_DEVICE)),) - -endif diff --git a/BoardConfigVendor.mk b/BoardConfigVendor.mk index 86ae5df..18ed0ae 100644 --- a/BoardConfigVendor.mk +++ b/BoardConfigVendor.mk @@ -1,4 +1,3 @@ +# # Automatically generated file. DO NOT MODIFY # -# This file is generated by device/xiaomi/sdm660-common/setup-makefiles.sh - diff --git a/proprietary/app/SoterService/SoterService.apk b/proprietary/app/SoterService/SoterService.apk deleted file mode 100644 index 6d1dd0a..0000000 Binary files a/proprietary/app/SoterService/SoterService.apk and /dev/null differ diff --git a/proprietary/system/app/SoterService/SoterService.apk b/proprietary/system/app/SoterService/SoterService.apk new file mode 100644 index 0000000..d01ff70 Binary files /dev/null and b/proprietary/system/app/SoterService/SoterService.apk differ diff --git a/proprietary/lib/libFileMux.so b/proprietary/system/lib/libFileMux.so similarity index 100% rename from proprietary/lib/libFileMux.so rename to proprietary/system/lib/libFileMux.so diff --git a/proprietary/lib/libOmxMux.so b/proprietary/system/lib/libOmxMux.so similarity index 100% rename from proprietary/lib/libOmxMux.so rename to proprietary/system/lib/libOmxMux.so diff --git a/proprietary/lib/libmmosal.so b/proprietary/system/lib/libmmosal.so similarity index 100% rename from proprietary/lib/libmmosal.so rename to proprietary/system/lib/libmmosal.so diff --git a/proprietary/lib/libmmparser_lite.so b/proprietary/system/lib/libmmparser_lite.so similarity index 100% rename from proprietary/lib/libmmparser_lite.so rename to proprietary/system/lib/libmmparser_lite.so diff --git a/proprietary/lib64/libmmosal.so b/proprietary/system/lib64/libmmosal.so similarity index 100% rename from proprietary/lib64/libmmosal.so rename to proprietary/system/lib64/libmmosal.so diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service b/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service old mode 100644 new mode 100755 diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti b/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti old mode 100644 new mode 100755 diff --git a/proprietary/vendor/bin/pm-service b/proprietary/vendor/bin/pm-service index 69eeb99..32cc569 100755 Binary files a/proprietary/vendor/bin/pm-service and b/proprietary/vendor/bin/pm-service differ diff --git a/proprietary/vendor/lib64/libwvhidl.so b/proprietary/vendor/lib64/libwvhidl.so index c5cacc2..5b28416 100644 Binary files a/proprietary/vendor/lib64/libwvhidl.so and b/proprietary/vendor/lib64/libwvhidl.so differ diff --git a/sdm660-common-vendor.mk b/sdm660-common-vendor.mk index 03fbe2e..c7569e9 100644 --- a/sdm660-common-vendor.mk +++ b/sdm660-common-vendor.mk @@ -1,16 +1,16 @@ +# # Automatically generated file. DO NOT MODIFY # -# This file is generated by device/xiaomi/sdm660-common/setup-makefiles.sh PRODUCT_SOONG_NAMESPACES += \ vendor/xiaomi/sdm660-common PRODUCT_COPY_FILES += \ - vendor/xiaomi/sdm660-common/proprietary/lib/libFileMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libFileMux.so \ - vendor/xiaomi/sdm660-common/proprietary/lib/libOmxMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libOmxMux.so \ - vendor/xiaomi/sdm660-common/proprietary/lib/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmosal.so \ - vendor/xiaomi/sdm660-common/proprietary/lib/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmparser_lite.so \ - vendor/xiaomi/sdm660-common/proprietary/lib64/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libmmosal.so \ + vendor/xiaomi/sdm660-common/proprietary/system/lib/libFileMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libFileMux.so \ + vendor/xiaomi/sdm660-common/proprietary/system/lib/libOmxMux.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libOmxMux.so \ + vendor/xiaomi/sdm660-common/proprietary/system/lib/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmosal.so \ + vendor/xiaomi/sdm660-common/proprietary/system/lib/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libmmparser_lite.so \ + vendor/xiaomi/sdm660-common/proprietary/system/lib64/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libmmosal.so \ vendor/xiaomi/sdm660-common/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \ vendor/xiaomi/sdm660-common/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \ vendor/xiaomi/sdm660-common/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \ @@ -481,25 +481,29 @@ PRODUCT_PACKAGES += \ vendor.qti.gnss@3.0-service.xml PRODUCT_PACKAGES += \ - libimscamera_jni_libimscamera_jni_symlink64 \ - libimsmedia_jni_libimsmedia_jni_symlink64 \ - libEGL_adreno_libEGL_adreno_symlink32 \ - libGLESv2_adreno_libGLESv2_adreno_symlink32 \ - libq3dtools_adreno_libq3dtools_adreno_symlink32 \ - libEGL_adreno_libEGL_adreno_symlink64 \ - libGLESv2_adreno_libGLESv2_adreno_symlink64 \ - libq3dtools_adreno_libq3dtools_adreno_symlink64 + system_ext_priv-app_ims_lib_arm64_libimscamera_jni_so \ + system_ext_priv-app_ims_lib_arm64_libimsmedia_jni_so \ + vendor_lib_libEGL_adreno_so \ + vendor_lib_libGLESv2_adreno_so \ + vendor_lib_libq3dtools_adreno_so \ + vendor_lib64_libEGL_adreno_so \ + vendor_lib64_libGLESv2_adreno_so \ + vendor_lib64_libq3dtools_adreno_so ifeq ($(BOARD_HAVE_QCOM_FM),true) + PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm660-common/proprietary/system_ext/lib64/fm_helium.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/fm_helium.so \ vendor/xiaomi/sdm660-common/proprietary/system_ext/lib64/libfm-hci.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libfm-hci.so \ vendor/xiaomi/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.fm@1.0.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so + endif ifeq ($(BOARD_HAVE_IR),true) + PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/consumerir.lirc.sdm660.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/consumerir.lirc.sdm660.so \ vendor/xiaomi/sdm660-common/proprietary/vendor/lib64/hw/consumerir.spi.sdm660.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/consumerir.spi.sdm660.so + endif