From dd6afcce511f3e3d6e19fe5dc9369b1eef030683 Mon Sep 17 00:00:00 2001 From: ivanmeler Date: Thu, 30 Mar 2023 23:10:50 +0200 Subject: [PATCH] source build hal components --- BoardConfigCommon.mk | 9 +++------ msm8996.mk | 3 +-- proprietary-files.txt | 6 ------ rootdir/etc/wifi_sec.rc | 2 +- shims/libbase/Android.mk | 28 ---------------------------- shims/libbase/logging.cpp | 12 ------------ 6 files changed, 5 insertions(+), 55 deletions(-) delete mode 100644 shims/libbase/Android.mk delete mode 100644 shims/libbase/logging.cpp diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 7e0b9ff..a4bfc6f 100755 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -19,8 +19,6 @@ BOARD_VENDOR := samsung COMMON_PATH := device/samsung/msm8996-common -BUILD_BROKEN_DUP_RULES := true - # Architecture TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-a @@ -191,11 +189,10 @@ TARGET_LD_SHIM_LIBS := \ /vendor/lib/libbauthserver.so|libbauthtzcommon_shim.so \ /vendor/lib64/libbauthserver.so|libbauthtzcommon_shim.so \ /vendor/lib/hw/audio.primary.msm8996.so|libaudioprimary_shim.so \ - /vendor/lib/hw/camera.msm8996.so|libshims_cameraclient.so \ - /vendor/lib/libwifi-hal.so|libbase_shim.so \ - /vendor/lib64/libwifi-hal.so|libbase_shim.so + /vendor/lib/hw/camera.msm8996.so|libshims_cameraclient.so # Wifi +BOARD_HAVE_SAMSUNG_WIFI := true TARGET_USES_64_BIT_BCMDHD := true BOARD_WLAN_DEVICE := bcmdhd WPA_SUPPLICANT_VERSION := VER_0_8_X @@ -206,7 +203,7 @@ BOARD_HOSTAPD_DRIVER := NL80211 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/dhd/parameters/firmware_path" WIFI_DRIVER_NVRAM_PATH_PARAM := "/sys/module/dhd/parameters/nvram_path" -WIFI_DRIVER_NVRAM_PATH := "/vendor/etc/wifi/nvram_mfg.txt" +WIFI_DRIVER_NVRAM_PATH := "/vendor/etc/wifi/nvram_net.txt" WIFI_DRIVER_FW_PATH_STA := "/vendor/etc/wifi/bcmdhd_sta.bin" WIFI_DRIVER_FW_PATH_AP := "/vendor/etc/wifi/bcmdhd_apsta.bin" WIFI_BAND := 802_11_ABG diff --git a/msm8996.mk b/msm8996.mk index 380a0b6..442b87c 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -413,12 +413,11 @@ PRODUCT_COPY_FILES += \ # WiFi PRODUCT_PACKAGES += \ + macloader \ hostapd \ - libbase_shim \ wificond \ wifilogd \ wlutil \ - libcld80211 \ libwpa_client \ TetheringConfigOverlay \ wpa_supplicant \ diff --git a/proprietary-files.txt b/proprietary-files.txt index 2ce4963..855167d 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -926,12 +926,6 @@ vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc lib64/vendor.qti.hardware.tui_comm@1.0.so lib/vendor.qti.hardware.tui_comm@1.0.so -# WiFi -vendor/bin/hw/macloader -vendor/bin/hw/mfgloader -vendor/lib/libwifi-hal.so -vendor/lib64/libwifi-hal.so - # WiFi (display) lib/libremotedisplay_wfd.so lib/libwfdavenhancements.so diff --git a/rootdir/etc/wifi_sec.rc b/rootdir/etc/wifi_sec.rc index 5a67f35..619069e 100644 --- a/rootdir/etc/wifi_sec.rc +++ b/rootdir/etc/wifi_sec.rc @@ -44,7 +44,7 @@ service mfgloader /system/vendor/bin/hw/mfgloader disabled oneshot -service macloader /system/vendor/bin/hw/macloader +service macloader /system/vendor/bin/macloader class main oneshot diff --git a/shims/libbase/Android.mk b/shims/libbase/Android.mk deleted file mode 100644 index 7216982..0000000 --- a/shims/libbase/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) 2023 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. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - logging.cpp - -LOCAL_SHARED_LIBRARIES := libbase - -LOCAL_MODULE := libbase_shim -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES - -include $(BUILD_SHARED_LIBRARY) diff --git a/shims/libbase/logging.cpp b/shims/libbase/logging.cpp deleted file mode 100644 index d2197c0..0000000 --- a/shims/libbase/logging.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include - -extern "C" void _ZN7android4base10LogMessageC1EPKcjNS0_5LogIdENS0_11LogSeverityES3_i( - const char* file, unsigned int line, android::base::LogId id, - android::base::LogSeverity severity, const char* tag, int error); - -extern "C" void _ZN7android4base10LogMessageC1EPKcjNS0_5LogIdENS0_11LogSeverityEi( - const char* file, unsigned int line, android::base::LogId id, - android::base::LogSeverity severity, int error) { - _ZN7android4base10LogMessageC1EPKcjNS0_5LogIdENS0_11LogSeverityES3_i(file, - line, id, severity, nullptr, error); -}