diff --git a/Android.bp b/Android.bp index 2ae1846..f0db31f 100644 --- a/Android.bp +++ b/Android.bp @@ -1,24 +1,196 @@ -// Copyright (C) 2018-2019 The LineageOS 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. - -// This file is generated by device/xiaomi/msm8998-common/setup-makefiles.sh +/** + * Copyright (C) 2019 The LineageOS 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. + * + * This file is generated by device/xiaomi/sdm660-common/setup-makefiles.sh + */ soong_namespace { } -dex_import { - name: "WfdCommon", - owner: "xiaomi", - jars: ["proprietary/framework/WfdCommon.jar"], +cc_prebuilt_library_shared { + name: "libantradio", + owner: "xiaomi", + strip: { + none:true, + }, + target: { + android_arm: { + srcs: ["proprietary/lib/libantradio.so"], + }, + android_arm64: { + srcs: ["proprietary/lib64/libantradio.so"], + }, + }, + compile_multilib: "both", } + +cc_prebuilt_library_shared { + name: "libgpustats", + owner: "xiaomi", + strip: { + none:true, + }, + target: { + android_arm: { + srcs: ["proprietary/vendor/lib/libgpustats.so"], + }, + android_arm64: { + srcs: ["proprietary/vendor/lib64/libgpustats.so"], + }, + }, + compile_multilib: "both", + soc_specific: true, +} + +android_app_import { + name: "SoterService", + owner: "xiaomi", + apk: "proprietary/app/SoterService/SoterService.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, +} + +android_app_import { + name: "HotwordEnrollmentOKGoogleWCD9340", + owner: "xiaomi", + apk: "proprietary/priv-app/HotwordEnrollmentOKGoogleWCD9340/HotwordEnrollmentOKGoogleWCD9340.apk", + certificate: "PRESIGNED", + dex_preopt: { + enabled: false, + }, + privileged: true, +} + +android_app_import { + name: "HotwordEnrollmentXGoogleWCD9340", + owner: "xiaomi", + apk: "proprietary/priv-app/HotwordEnrollmentXGoogleWCD9340/HotwordEnrollmentXGoogleWCD9340.apk", + certificate: "PRESIGNED", + dex_preopt: { + enabled: false, + }, + privileged: true, +} + +android_app_import { + name: "WfdService", + owner: "xiaomi", + apk: "proprietary/priv-app/WfdService/WfdService.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + privileged: true, +} + +android_app_import { + name: "PowerOffAlarm", + owner: "xiaomi", + apk: "proprietary/vendor/app/PowerOffAlarm/PowerOffAlarm.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, +} + +android_app_import { + name: "QtiTelephonyService", + owner: "xiaomi", + apk: "proprietary/product/app/QtiTelephonyService/QtiTelephonyService.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + product_specific: true, +} + +android_app_import { + name: "datastatusnotification", + owner: "xiaomi", + apk: "proprietary/product/app/datastatusnotification/datastatusnotification.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + product_specific: true, +} + +android_app_import { + name: "imssettings", + owner: "xiaomi", + apk: "proprietary/product/app/imssettings/imssettings.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + product_specific: true, +} + +android_app_import { + name: "ims", + owner: "xiaomi", + apk: "proprietary/product/priv-app/ims/ims.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + privileged: true, + product_specific: true, +} + +android_app_import { + name: "qcrilmsgtunnel", + owner: "xiaomi", + apk: "proprietary/product/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + privileged: true, + product_specific: true, +} + +dex_import { + name: "QPerformance", + owner: "xiaomi", + jars: ["proprietary/framework/QPerformance.jar"], +} + +dex_import { + name: "UxPerformance", + owner: "xiaomi", + jars: ["proprietary/framework/UxPerformance.jar"], +} + +dex_import { + name: "WfdCommon", + owner: "xiaomi", + jars: ["proprietary/framework/WfdCommon.jar"], +} + diff --git a/Android.mk b/Android.mk index 0619861..308a788 100644 --- a/Android.mk +++ b/Android.mk @@ -18,182 +18,6 @@ LOCAL_PATH := $(call my-dir) ifneq ($(filter jasmine_sprout wayne clover,$(TARGET_DEVICE)),) -include $(CLEAR_VARS) -LOCAL_MODULE := libantradio -LOCAL_MODULE_OWNER := xiaomi -LOCAL_SRC_FILES_64 := proprietary/lib64/libantradio.so -LOCAL_SRC_FILES_32 := proprietary/lib/libantradio.so -LOCAL_MULTILIB := both -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_SUFFIX := .so -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := libgpustats -LOCAL_MODULE_OWNER := xiaomi -LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libgpustats.so -LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libgpustats.so -LOCAL_MULTILIB := both -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_SUFFIX := .so -LOCAL_VENDOR_MODULE := true -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := SoterService -LOCAL_MODULE_OWNER := xiaomi -LOCAL_SRC_FILES := proprietary/app/SoterService/SoterService.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := HotwordEnrollmentOKGoogleWCD9340 -LOCAL_MODULE_OWNER := xiaomi -LOCAL_SRC_FILES := proprietary/priv-app/HotwordEnrollmentOKGoogleWCD9340/HotwordEnrollmentOKGoogleWCD9340.apk -LOCAL_CERTIFICATE := PRESIGNED -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_PRIVILEGED_MODULE := true -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := HotwordEnrollmentXGoogleWCD9340 -LOCAL_MODULE_OWNER := xiaomi -LOCAL_SRC_FILES := proprietary/priv-app/HotwordEnrollmentXGoogleWCD9340/HotwordEnrollmentXGoogleWCD9340.apk -LOCAL_CERTIFICATE := PRESIGNED -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_PRIVILEGED_MODULE := true -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := WfdService -LOCAL_MODULE_OWNER := xiaomi -LOCAL_SRC_FILES := proprietary/priv-app/WfdService/WfdService.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_PRIVILEGED_MODULE := true -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := PowerOffAlarm -LOCAL_MODULE_OWNER := xiaomi -LOCAL_SRC_FILES := proprietary/vendor/app/PowerOffAlarm/PowerOffAlarm.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_VENDOR_MODULE := true -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := TimeService -LOCAL_MODULE_OWNER := xiaomi -LOCAL_SRC_FILES := proprietary/vendor/app/TimeService/TimeService.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_VENDOR_MODULE := true -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := QtiTelephonyService -LOCAL_MODULE_OWNER := xiaomi -LOCAL_SRC_FILES := proprietary/product/app/QtiTelephonyService/QtiTelephonyService.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_PRODUCT_MODULE := true -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := datastatusnotification -LOCAL_MODULE_OWNER := xiaomi -LOCAL_SRC_FILES := proprietary/product/app/datastatusnotification/datastatusnotification.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_PRODUCT_MODULE := true -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := imssettings -LOCAL_MODULE_OWNER := xiaomi -LOCAL_SRC_FILES := proprietary/product/app/imssettings/imssettings.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_PRODUCT_MODULE := true -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := ims -LOCAL_MODULE_OWNER := xiaomi -LOCAL_SRC_FILES := proprietary/product/priv-app/ims/ims.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_PRIVILEGED_MODULE := true -LOCAL_PRODUCT_MODULE := true -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := qcrilmsgtunnel -LOCAL_MODULE_OWNER := xiaomi -LOCAL_SRC_FILES := proprietary/product/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_PRIVILEGED_MODULE := true -LOCAL_PRODUCT_MODULE := true -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := QPerformance -LOCAL_MODULE_OWNER := xiaomi -LOCAL_SRC_FILES := proprietary/framework/QPerformance.jar -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_MODULE_SUFFIX := .jar -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := UxPerformance -LOCAL_MODULE_OWNER := xiaomi -LOCAL_SRC_FILES := proprietary/framework/UxPerformance.jar -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_MODULE_SUFFIX := .jar -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := chargeonlymode LOCAL_MODULE_OWNER := xiaomi diff --git a/BoardConfigVendor.mk b/BoardConfigVendor.mk index 8c2861c..ecc03be 100644 --- a/BoardConfigVendor.mk +++ b/BoardConfigVendor.mk @@ -14,5 +14,3 @@ # This file is generated by device/xiaomi/sdm660-common/setup-makefiles.sh -PRODUCT_SOONG_NAMESPACES += \ - vendor/xiaomi/sdm660-common diff --git a/proprietary/vendor/lib/hw/sound_trigger.primary.sdm660.so b/proprietary/vendor/lib/hw/sound_trigger.primary.sdm660.so index fef458e..b9df12d 100644 Binary files a/proprietary/vendor/lib/hw/sound_trigger.primary.sdm660.so and b/proprietary/vendor/lib/hw/sound_trigger.primary.sdm660.so differ diff --git a/proprietary/vendor/lib64/hw/sound_trigger.primary.sdm660.so b/proprietary/vendor/lib64/hw/sound_trigger.primary.sdm660.so index 79aceb2..615666e 100644 Binary files a/proprietary/vendor/lib64/hw/sound_trigger.primary.sdm660.so and b/proprietary/vendor/lib64/hw/sound_trigger.primary.sdm660.so differ diff --git a/proprietary/vendor/lib64/libmlipay.so b/proprietary/vendor/lib64/libmlipay.so index 6d157bd..68fc8f1 100644 Binary files a/proprietary/vendor/lib64/libmlipay.so and b/proprietary/vendor/lib64/libmlipay.so differ diff --git a/proprietary/vendor/lib64/libmlipay@1.1.so b/proprietary/vendor/lib64/libmlipay@1.1.so index 4e19cc2..5a926de 100644 Binary files a/proprietary/vendor/lib64/libmlipay@1.1.so and b/proprietary/vendor/lib64/libmlipay@1.1.so differ diff --git a/sdm660-common-vendor.mk b/sdm660-common-vendor.mk index 2b9bf75..f615fb8 100644 --- a/sdm660-common-vendor.mk +++ b/sdm660-common-vendor.mk @@ -14,6 +14,9 @@ # 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/bin/wfdservice:system/bin/wfdservice \ vendor/xiaomi/sdm660-common/proprietary/etc/init/wfdservice.rc:system/etc/init/wfdservice.rc \ @@ -31,9 +34,9 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm660-common/proprietary/framework/tcmclient.jar:system/framework/tcmclient.jar \ vendor/xiaomi/sdm660-common/proprietary/lib/com.qualcomm.qti.wifidisplayhal@1.0.so:system/lib/com.qualcomm.qti.wifidisplayhal@1.0.so \ vendor/xiaomi/sdm660-common/proprietary/lib/extractors/libmmparser.so:system/lib/extractors/libmmparser.so \ - vendor/xiaomi/sdm660-common/proprietary/lib/libdiag_system.so:system/lib/libdiag_system.so \ vendor/xiaomi/sdm660-common/proprietary/lib/libFileMux.so:system/lib/libFileMux.so \ vendor/xiaomi/sdm660-common/proprietary/lib/libOmxMux.so:system/lib/libOmxMux.so \ + vendor/xiaomi/sdm660-common/proprietary/lib/libdiag_system.so:system/lib/libdiag_system.so \ vendor/xiaomi/sdm660-common/proprietary/lib/libmmosal.so:system/lib/libmmosal.so \ vendor/xiaomi/sdm660-common/proprietary/lib/libmmparser_lite.so:system/lib/libmmparser_lite.so \ vendor/xiaomi/sdm660-common/proprietary/lib/libmmrtpdecoder.so:system/lib/libmmrtpdecoder.so \ @@ -63,9 +66,9 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm660-common/proprietary/lib/vendor.qti.hardware.perf@1.0.so:system/lib/vendor.qti.hardware.perf@1.0.so \ vendor/xiaomi/sdm660-common/proprietary/lib64/com.qualcomm.qti.ant@1.0.so:system/lib64/com.qualcomm.qti.ant@1.0.so \ vendor/xiaomi/sdm660-common/proprietary/lib64/extractors/libmmparser.so:system/lib64/extractors/libmmparser.so \ - vendor/xiaomi/sdm660-common/proprietary/lib64/libdiag_system.so:system/lib64/libdiag_system.so \ vendor/xiaomi/sdm660-common/proprietary/lib64/libFileMux.so:system/lib64/libFileMux.so \ vendor/xiaomi/sdm660-common/proprietary/lib64/libOmxMux.so:system/lib64/libOmxMux.so \ + vendor/xiaomi/sdm660-common/proprietary/lib64/libdiag_system.so:system/lib64/libdiag_system.so \ vendor/xiaomi/sdm660-common/proprietary/lib64/liblocationservice_jni.so:system/lib64/liblocationservice_jni.so \ vendor/xiaomi/sdm660-common/proprietary/lib64/libmmosal.so:system/lib64/libmmosal.so \ vendor/xiaomi/sdm660-common/proprietary/lib64/libmmparser_lite.so:system/lib64/libmmparser_lite.so \