From 92f8820c4b44ae2b37f74643eef2323bbb2dec69 Mon Sep 17 00:00:00 2001 From: Max Weffers Date: Fri, 4 Oct 2019 19:43:13 +0200 Subject: [PATCH] sdm660-common: Cleanup Vendor for future Q Changes --- Android.bp | 210 ++++++++++++++++-- Android.mk | 176 --------------- BoardConfigVendor.mk | 2 - .../lib/hw/sound_trigger.primary.sdm660.so | Bin 190904 -> 199156 bytes .../lib64/hw/sound_trigger.primary.sdm660.so | Bin 215088 -> 223368 bytes proprietary/vendor/lib64/libmlipay.so | Bin 68576 -> 68576 bytes proprietary/vendor/lib64/libmlipay@1.1.so | Bin 68664 -> 68664 bytes sdm660-common-vendor.mk | 7 +- 8 files changed, 196 insertions(+), 199 deletions(-) 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 fef458efbb1c9ad964d8f0b97810feee51c47960..b9df12df45c634a0a31e1b346b86d876605ab067 100644 GIT binary patch delta 214 zcmdmSnfuFRo(Zx7AD9>>oMd8PU}9i3VNhV;YSeAjW!$REq<@yv;Ug0R2zyLVJE67X+D0X0EU~rh| zsXg7{0@DFEAO|i3Qt?HS0gTx|;sPK?098Y61=|eN-~q%Sc@`iB=?@j3E_abB4(uE* TAU|_^>qRC5iRlYpGKm8Kj*mAq delta 91 zcmew|nPadkdTMaAhrX81p`;3WveA)t0mJ`OXl|~f(A}3AQ=XOAc(RF z(=An*^#u>OK!gv3K!lHOuT*8O=h<8+F-LfFgTz#(?TT-huCq@wVCGbWTEyT0(E_6l zn7{@z7%*+uGGLy@sL2TAvw_5LXy}lDXy}-}(U4i(3g#lX3!yHZ05umzb3k-4fQ$!$ ujl$DE88YvKdw~lg%y4x3K_li2QSqG2q=KUSkC$>K!htyAi^8BSE@4C^Gr7gV&<6c5yZR!u7V4!oq=KFcFtht3{iF{7XWy& B7OMaN diff --git a/proprietary/vendor/lib64/libmlipay.so b/proprietary/vendor/lib64/libmlipay.so index 6d157bd4e302b7183c9d4e453f885c3f759f157e..68fc8f1eac3049c8f47273ef0a4c8f5af9dfb8c4 100644 GIT binary patch delta 34 ocmaDbo#nxFmJK@th09X&Qu2%R(=v;4%M*)I8GvB(nLv?U001rxd;kCd delta 34 qcmaDbo#nxFmJK@tg^MeTOHy<7Q%jQd(=v;4%M*)IH=hX<*#!U#DGvSs diff --git a/proprietary/vendor/lib64/libmlipay@1.1.so b/proprietary/vendor/lib64/libmlipay@1.1.so index 4e19cc2d37c78ae2976dc7c983b456a94cb92b99..5a926dee28bc7d0bd1245b182bd9ceb2307d33e7 100644 GIT binary patch delta 34 ocmdlngJs7ImJJ?R!eyy>DfvbEX_-a2<%vb93_!3sI_vI20PNKbE&u=k delta 34 qcmdlngJs7ImJJ?R!o`)vC8@dksU^w!X_-a2<%vb9o1?StE(8Gg&