diff --git a/Android.bp b/Android.bp index 2a74255..e9fd34b 100644 --- a/Android.bp +++ b/Android.bp @@ -3,6 +3,8 @@ // This file is generated by device/realme/RM6785-common/setup-makefiles.sh soong_namespace { + imports: [ + ], } cc_prebuilt_library_shared { @@ -13657,23 +13659,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libwapi", - owner: "realme", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libwapi.so"], - }, - }, - compile_multilib: "64", - check_elf_files: false, - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libwifi-hal-mtk", owner: "realme", @@ -13708,23 +13693,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libwpa_client", - owner: "realme", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/libwpa_client.so"], - }, - }, - compile_multilib: "64", - check_elf_files: false, - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libmtkcam_streaminfo_plugin-p1stt", owner: "realme", @@ -14508,74 +14476,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.mediatek.hardware.wifi.supplicant@2.0", - owner: "realme", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.0.so"], - }, - }, - compile_multilib: "64", - check_elf_files: false, - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "vendor.mediatek.hardware.wifi.supplicant@2.1", - owner: "realme", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.1.so"], - }, - }, - compile_multilib: "64", - check_elf_files: false, - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "vendor.mediatek.hardware.wifi.supplicant@2.2", - owner: "realme", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.2.so"], - }, - }, - compile_multilib: "64", - check_elf_files: false, - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "vendor.oplus.hardware.wifi.supplicant@2.0", - owner: "realme", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/vendor.oplus.hardware.wifi.supplicant@2.0.so"], - }, - }, - compile_multilib: "64", - check_elf_files: false, - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "vendor.trustonic.tee.tui@1.0", owner: "realme", @@ -15235,7 +15135,12 @@ prebuilt_etc_xml { cc_prebuilt_binary { name: "atcid", owner: "realme", - srcs: ["proprietary/vendor/bin/atcid"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/atcid"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15247,7 +15152,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "audiocmdservice_atci", owner: "realme", - srcs: ["proprietary/vendor/bin/audiocmdservice_atci"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/audiocmdservice_atci"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -15259,7 +15169,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "autobt", owner: "realme", - srcs: ["proprietary/vendor/bin/autobt"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/autobt"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15271,7 +15186,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "bip", owner: "realme", - srcs: ["proprietary/vendor/bin/bip"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/bip"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -15283,7 +15203,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "ccci_fsd", owner: "realme", - srcs: ["proprietary/vendor/bin/ccci_fsd"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/ccci_fsd"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -15295,7 +15220,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "ccci_mdinit", owner: "realme", - srcs: ["proprietary/vendor/bin/ccci_mdinit"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/ccci_mdinit"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -15307,7 +15237,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "ccci_rpcd", owner: "realme", - srcs: ["proprietary/vendor/bin/ccci_rpcd"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/ccci_rpcd"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -15319,7 +15254,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "charon", owner: "realme", - srcs: ["proprietary/vendor/bin/charon"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/charon"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15331,7 +15271,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "dconfig", owner: "realme", - srcs: ["proprietary/vendor/bin/dconfig"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/dconfig"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15343,7 +15288,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "dexecutor", owner: "realme", - srcs: ["proprietary/vendor/bin/dexecutor"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/dexecutor"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15355,7 +15305,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "doeapp-memtester", owner: "realme", - srcs: ["proprietary/vendor/bin/doeapp-memtester"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/doeapp-memtester"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15367,7 +15322,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "doeapp-sat", owner: "realme", - srcs: ["proprietary/vendor/bin/doeapp-sat"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/doeapp-sat"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15379,7 +15339,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "dtc_vendor", owner: "realme", - srcs: ["proprietary/vendor/bin/dtc_vendor"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/dtc_vendor"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15391,7 +15356,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "em_hidl", owner: "realme", - srcs: ["proprietary/vendor/bin/em_hidl"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/em_hidl"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15403,7 +15373,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "epdg_wod", owner: "realme", - srcs: ["proprietary/vendor/bin/epdg_wod"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/epdg_wod"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15415,7 +15390,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "factory", owner: "realme", - srcs: ["proprietary/vendor/bin/factory"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/factory"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15427,7 +15407,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "fuelgauged", owner: "realme", - srcs: ["proprietary/vendor/bin/fuelgauged"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/fuelgauged"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -15439,7 +15424,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "fuelgauged_nvram", owner: "realme", - srcs: ["proprietary/vendor/bin/fuelgauged_nvram"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/fuelgauged_nvram"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -15451,7 +15441,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "gsm0710muxd", owner: "realme", - srcs: ["proprietary/vendor/bin/gsm0710muxd"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/gsm0710muxd"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -15463,7 +15458,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "android.hardware.bluetooth@1.0-service-mediatek", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-mediatek"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-mediatek"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15476,7 +15476,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "android.hardware.drm@1.3-service.widevine", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -15489,7 +15494,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "android.hardware.gnss@2.1-service-mediatek", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/android.hardware.gnss@2.1-service-mediatek"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/android.hardware.gnss@2.1-service-mediatek"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15502,7 +15512,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "android.hardware.graphics.allocator@4.0-service-mediatek", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/android.hardware.graphics.allocator@4.0-service-mediatek"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/android.hardware.graphics.allocator@4.0-service-mediatek"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15515,7 +15530,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "android.hardware.keymaster@4.0-service.trustonic", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service.trustonic"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service.trustonic"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15528,7 +15548,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "android.hardware.neuralnetworks@1.3-service-mtk-neuron", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-mtk-neuron"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-mtk-neuron"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15541,7 +15566,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "android.hardware.secure_element@1.2-service-mediatek", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/android.hardware.secure_element@1.2-service-mediatek"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/android.hardware.secure_element@1.2-service-mediatek"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15554,7 +15584,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "android.hardware.sensors@2.0-service-mediatek", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/android.hardware.sensors@2.0-service-mediatek"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/android.hardware.sensors@2.0-service-mediatek"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15567,7 +15602,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "camerahalserver", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/camerahalserver"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/camerahalserver"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15580,7 +15620,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "mtkfusionrild", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/mtkfusionrild"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/mtkfusionrild"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15593,7 +15638,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vendor.mediatek.hardware.dfps@1.0-service", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.dfps@1.0-service"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.dfps@1.0-service"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15606,7 +15656,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vendor.mediatek.hardware.dplanner@2.0-service", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.dplanner@2.0-service"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.dplanner@2.0-service"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15619,7 +15674,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vendor.mediatek.hardware.gpu@1.0-service", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.gpu@1.0-service"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.gpu@1.0-service"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15632,7 +15692,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vendor.mediatek.hardware.keyinstall@1.0-service", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.keyinstall@1.0-service"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.keyinstall@1.0-service"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15645,7 +15710,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vendor.mediatek.hardware.keymaster_attestation@1.1-service", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.keymaster_attestation@1.1-service"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.keymaster_attestation@1.1-service"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15658,7 +15728,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vendor.mediatek.hardware.mms@1.5-service", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.mms@1.5-service"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.mms@1.5-service"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15671,7 +15746,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vendor.mediatek.hardware.mtkcodecservice@1.1-service", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.mtkcodecservice@1.1-service"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.mtkcodecservice@1.1-service"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -15684,7 +15764,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vendor.mediatek.hardware.nvram@1.1-service", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.nvram@1.1-service"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.nvram@1.1-service"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15697,7 +15782,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vendor.mediatek.hardware.pq@2.2-service", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.pq@2.2-service"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/vendor.mediatek.hardware.pq@2.2-service"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15710,7 +15800,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vendor.trustonic.tee@1.1-service", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/vendor.trustonic.tee@1.1-service"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/vendor.trustonic.tee@1.1-service"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15723,20 +15818,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vtservice_hidl", owner: "realme", - srcs: ["proprietary/vendor/bin/hw/vtservice_hidl"], - check_elf_files: false, - strip: { - none: true, + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/hw/vtservice_hidl"], + }, }, - prefer: true, - relative_install_path: "hw", - soc_specific: true, -} - -cc_prebuilt_binary { - name: "wpa_supplicant", - owner: "realme", - srcs: ["proprietary/vendor/bin/hw/wpa_supplicant"], + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15749,7 +15836,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "ipsec_mon", owner: "realme", - srcs: ["proprietary/vendor/bin/ipsec_mon"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/ipsec_mon"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15761,7 +15853,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "jpegtool", owner: "realme", - srcs: ["proprietary/vendor/bin/jpegtool"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/jpegtool"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15773,7 +15870,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "lbs_hidl_service", owner: "realme", - srcs: ["proprietary/vendor/bin/lbs_hidl_service"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/lbs_hidl_service"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15785,7 +15887,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "mcDriverDaemon", owner: "realme", - srcs: ["proprietary/vendor/bin/mcDriverDaemon"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/mcDriverDaemon"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15797,7 +15904,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "md_monitor", owner: "realme", - srcs: ["proprietary/vendor/bin/md_monitor"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/md_monitor"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15809,7 +15921,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "md_monitor_ctrl", owner: "realme", - srcs: ["proprietary/vendor/bin/md_monitor_ctrl"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/md_monitor_ctrl"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15821,7 +15938,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "mnld", owner: "realme", - srcs: ["proprietary/vendor/bin/mnld"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/mnld"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -15833,7 +15955,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "mtk_agpsd", owner: "realme", - srcs: ["proprietary/vendor/bin/mtk_agpsd"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/mtk_agpsd"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -15845,7 +15972,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "muxreport", owner: "realme", - srcs: ["proprietary/vendor/bin/muxreport"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/muxreport"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15857,7 +15989,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "netdagent", owner: "realme", - srcs: ["proprietary/vendor/bin/netdagent"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/netdagent"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15869,7 +16006,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "netdc", owner: "realme", - srcs: ["proprietary/vendor/bin/netdc"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/netdc"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15881,7 +16023,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "nvram_daemon", owner: "realme", - srcs: ["proprietary/vendor/bin/nvram_daemon"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/nvram_daemon"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -15893,7 +16040,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "ppl_agent", owner: "realme", - srcs: ["proprietary/vendor/bin/ppl_agent"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/ppl_agent"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15905,7 +16057,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "starter", owner: "realme", - srcs: ["proprietary/vendor/bin/starter"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/starter"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15917,7 +16074,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "stp_dump3", owner: "realme", - srcs: ["proprietary/vendor/bin/stp_dump3"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/stp_dump3"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15929,7 +16091,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "stroke", owner: "realme", - srcs: ["proprietary/vendor/bin/stroke"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/stroke"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15941,7 +16108,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "thermal", owner: "realme", - srcs: ["proprietary/vendor/bin/thermal"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/thermal"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -15953,7 +16125,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "thermal_manager", owner: "realme", - srcs: ["proprietary/vendor/bin/thermal_manager"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/thermal_manager"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -15965,7 +16142,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "thermalloadalgod", owner: "realme", - srcs: ["proprietary/vendor/bin/thermalloadalgod"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/thermalloadalgod"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -15977,7 +16159,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "volte_imcb", owner: "realme", - srcs: ["proprietary/vendor/bin/volte_imcb"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/volte_imcb"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -15989,7 +16176,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "volte_imsm_93", owner: "realme", - srcs: ["proprietary/vendor/bin/volte_imsm_93"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/volte_imsm_93"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -16001,7 +16193,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "volte_md_status", owner: "realme", - srcs: ["proprietary/vendor/bin/volte_md_status"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/volte_md_status"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -16013,7 +16210,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "volte_stack", owner: "realme", - srcs: ["proprietary/vendor/bin/volte_stack"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/volte_stack"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -16025,7 +16227,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "volte_ua", owner: "realme", - srcs: ["proprietary/vendor/bin/volte_ua"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/volte_ua"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -16037,7 +16244,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vpud", owner: "realme", - srcs: ["proprietary/vendor/bin/vpud"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/vpud"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -16049,7 +16261,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "wfca", owner: "realme", - srcs: ["proprietary/vendor/bin/wfca"], + target: { + android_arm: { + srcs: ["proprietary/vendor/bin/wfca"], + }, + }, + compile_multilib: "32", check_elf_files: false, strip: { none: true, @@ -16061,7 +16278,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "wlan_assistant", owner: "realme", - srcs: ["proprietary/vendor/bin/wlan_assistant"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/wlan_assistant"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -16073,7 +16295,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "wmt_launcher", owner: "realme", - srcs: ["proprietary/vendor/bin/wmt_launcher"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/wmt_launcher"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -16085,19 +16312,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "wmt_loader", owner: "realme", - srcs: ["proprietary/vendor/bin/wmt_loader"], - check_elf_files: false, - strip: { - none: true, + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/wmt_loader"], + }, }, - prefer: true, - soc_specific: true, -} - -cc_prebuilt_binary { - name: "wpa_cli", - owner: "realme", - srcs: ["proprietary/vendor/bin/wpa_cli"], + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -16109,7 +16329,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "xcap", owner: "realme", - srcs: ["proprietary/vendor/bin/xcap"], + target: { + android_arm64: { + srcs: ["proprietary/vendor/bin/xcap"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -16121,7 +16346,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vtservice", owner: "realme", - srcs: ["proprietary/system_ext/bin/vtservice"], + target: { + android_arm64: { + srcs: ["proprietary/system_ext/bin/vtservice"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -16133,7 +16363,12 @@ cc_prebuilt_binary { cc_prebuilt_binary { name: "vendor.oplus.hardware.biometrics.fingerprint@2.1-service", owner: "realme", - srcs: ["proprietary/odm/bin/hw/vendor.oplus.hardware.biometrics.fingerprint@2.1-service"], + target: { + android_arm64: { + srcs: ["proprietary/odm/bin/hw/vendor.oplus.hardware.biometrics.fingerprint@2.1-service"], + }, + }, + compile_multilib: "64", check_elf_files: false, strip: { none: true, @@ -16143,3 +16378,31 @@ cc_prebuilt_binary { device_specific: true, } +install_symlink { + name: "libGLES_mali_vulkan.mt6785_symlink64", + soc_specific: true, + installed_location: "lib64/hw/vulkan.mt6785.so", + symlink_target: "/vendor/lib64/egl/libGLES_mali.so", +} + +install_symlink { + name: "kmsetkey.trustonic_kmsetkey.default_symlink64", + soc_specific: true, + installed_location: "lib64/hw/kmsetkey.default.so", + symlink_target: "/vendor/lib64/hw/kmsetkey.trustonic.so", +} + +install_symlink { + name: "libMcGatekeeper_gatekeeper.mt6785_symlink64", + soc_specific: true, + installed_location: "lib64/hw/gatekeeper.mt6785.so", + symlink_target: "/vendor/lib64/hw/libMcGatekeeper.so", +} + +install_symlink { + name: "libSoftGatekeeper_gatekeeper.default_symlink64", + soc_specific: true, + installed_location: "lib64/hw/gatekeeper.default.so", + symlink_target: "/vendor/lib64/hw/libSoftGatekeeper.so", +} + diff --git a/RM6785-common-vendor.mk b/RM6785-common-vendor.mk index e8e86b3..eaf9762 100644 --- a/RM6785-common-vendor.mk +++ b/RM6785-common-vendor.mk @@ -513,7 +513,6 @@ PRODUCT_COPY_FILES += \ vendor/realme/RM6785-common/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-mtk-neuron.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks@1.3-service-mtk-neuron.rc \ vendor/realme/RM6785-common/proprietary/vendor/etc/init/android.hardware.secure_element@1.2-service-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.secure_element@1.2-service-mediatek.rc \ vendor/realme/RM6785-common/proprietary/vendor/etc/init/android.hardware.sensors@2.0-service-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.sensors@2.0-service-mediatek.rc \ - vendor/realme/RM6785-common/proprietary/vendor/etc/init/android.hardware.wifi.supplicant-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.wifi.supplicant-service.rc \ vendor/realme/RM6785-common/proprietary/vendor/etc/init/atcid.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/atcid.rc \ vendor/realme/RM6785-common/proprietary/vendor/etc/init/audiocmdservice_atci.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/audiocmdservice_atci.rc \ vendor/realme/RM6785-common/proprietary/vendor/etc/init/bootperf.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/bootperf.rc \ @@ -1584,10 +1583,8 @@ PRODUCT_PACKAGES += \ libtflite_mtk \ libtflite_mtk_static_R \ libudf \ - libwapi \ libwifi-hal-mtk \ libwifitest \ - libwpa_client \ libmtkcam_streaminfo_plugin-p1stt \ ov02b10_mipi_raw_IdxMgr \ ov02b10_mipi_raw_tuning \ @@ -1634,10 +1631,6 @@ PRODUCT_PACKAGES += \ vendor.mediatek.hardware.power@2.0 \ vendor.mediatek.hardware.pplagent@1.0 \ vendor.mediatek.hardware.videotelephony@1.0 \ - vendor.mediatek.hardware.wifi.supplicant@2.0 \ - vendor.mediatek.hardware.wifi.supplicant@2.1 \ - vendor.mediatek.hardware.wifi.supplicant@2.2 \ - vendor.oplus.hardware.wifi.supplicant@2.0 \ vendor.trustonic.tee.tui@1.0 \ vendor.trustonic.tee@1.0 \ vendor.trustonic.tee@1.1 \ @@ -1727,7 +1720,6 @@ PRODUCT_PACKAGES += \ vendor.mediatek.hardware.pq@2.2-service \ vendor.trustonic.tee@1.1-service \ vtservice_hidl \ - wpa_supplicant \ ipsec_mon \ jpegtool \ lbs_hidl_service \ @@ -1757,7 +1749,12 @@ PRODUCT_PACKAGES += \ wlan_assistant \ wmt_launcher \ wmt_loader \ - wpa_cli \ xcap \ vtservice \ vendor.oplus.hardware.biometrics.fingerprint@2.1-service + +PRODUCT_PACKAGES += \ + libGLES_mali_vulkan.mt6785_symlink64 \ + kmsetkey.trustonic_kmsetkey.default_symlink64 \ + libMcGatekeeper_gatekeeper.mt6785_symlink64 \ + libSoftGatekeeper_gatekeeper.default_symlink64 diff --git a/proprietary/vendor/bin/hw/wpa_supplicant b/proprietary/vendor/bin/hw/wpa_supplicant deleted file mode 100644 index 243f24f..0000000 Binary files a/proprietary/vendor/bin/hw/wpa_supplicant and /dev/null differ diff --git a/proprietary/vendor/bin/wpa_cli b/proprietary/vendor/bin/wpa_cli deleted file mode 100755 index ee27328..0000000 Binary files a/proprietary/vendor/bin/wpa_cli and /dev/null differ diff --git a/proprietary/vendor/etc/init/android.hardware.wifi.supplicant-service.rc b/proprietary/vendor/etc/init/android.hardware.wifi.supplicant-service.rc deleted file mode 100644 index c12b7c3..0000000 --- a/proprietary/vendor/etc/init/android.hardware.wifi.supplicant-service.rc +++ /dev/null @@ -1,19 +0,0 @@ -service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ - -O/data/vendor/wifi/wpa/sockets -dd \ - -g@android:wpa_wlan0 - # we will start as root and wpa_supplicant will switch to user wifi - # after setting up the capabilities required for WEXT - # user wifi - # group wifi inet keystore - interface android.hardware.wifi.supplicant@1.0::ISupplicant default - interface android.hardware.wifi.supplicant@1.1::ISupplicant default - interface android.hardware.wifi.supplicant@1.2::ISupplicant default - interface android.hardware.wifi.supplicant@1.3::ISupplicant default - interface vendor.mediatek.hardware.wifi.supplicant@2.0::ISupplicant default - #ifdef OPLUS_FEATURE_SUPPLICANT_HIDL - interface vendor.oplus.hardware.wifi.supplicant@2.0::IOplusSupplicant default - #endif /* OPLUS_FEATURE_SUPPLICANT_HIDL */ - class main - socket wpa_wlan0 dgram 660 wifi wifi - disabled - oneshot diff --git a/proprietary/vendor/lib64/libwapi.so b/proprietary/vendor/lib64/libwapi.so deleted file mode 100644 index 781362d..0000000 Binary files a/proprietary/vendor/lib64/libwapi.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libwpa_client.so b/proprietary/vendor/lib64/libwpa_client.so deleted file mode 100644 index 9b79f2f..0000000 Binary files a/proprietary/vendor/lib64/libwpa_client.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.0.so b/proprietary/vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.0.so deleted file mode 100644 index e50e0a6..0000000 Binary files a/proprietary/vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.0.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.1.so b/proprietary/vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.1.so deleted file mode 100644 index b3a627c..0000000 Binary files a/proprietary/vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.1.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.2.so b/proprietary/vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.2.so deleted file mode 100644 index b808609..0000000 Binary files a/proprietary/vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.2.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.oplus.hardware.wifi.supplicant@2.0.so b/proprietary/vendor/lib64/vendor.oplus.hardware.wifi.supplicant@2.0.so deleted file mode 100644 index 01a7805..0000000 Binary files a/proprietary/vendor/lib64/vendor.oplus.hardware.wifi.supplicant@2.0.so and /dev/null differ