Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9df6f1c5 authored by SzuWei Lin's avatar SzuWei Lin Committed by android-build-merger
Browse files

Merge "Add wificond to Android makefiles" into oc-dr1-dev 

am: b1cbbaf5

Change-Id: I584ad2a70099f1fb189766df79a1c19ac6927b73
parents 7a1615fb b1cbbaf5

target/product/core_base.mk

+5 −1
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ PRODUCT_PACKAGES += \ 
    libwebrtc_audio_preprocessing \

    mdnsd \

    requestsync \

    wifi-service



# Wifi modules

PRODUCT_PACKAGES += \

    wifi-service \

    wificond \



$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)

target/product/core_minimal.mk

+5 −1
Original line number Diff line number Diff line
@@ -88,7 +88,11 @@ PRODUCT_PACKAGES += \ 
    voip-common \

    webview \

    webview_zygote \

    wifi-service



# Wifi modules

PRODUCT_PACKAGES += \

    wifi-service \

    wificond \



PRODUCT_COPY_FILES += \

    frameworks/native/data/etc/android.software.webview.xml:system/etc/permissions/android.software.webview.xml

target/product/core_tiny.mk

+5 −1
Original line number Diff line number Diff line
@@ -83,7 +83,11 @@ PRODUCT_PACKAGES += \ 
    telephony-common \

    voip-common \

    logd \

    wifi-service



# Wifi modules

PRODUCT_PACKAGES += \

    wifi-service \

    wificond \



ifeq ($(TARGET_CORE_JARS),)

$(error TARGET_CORE_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)

target/product/treble_common.mk

+0 −6
Original line number Diff line number Diff line
@@ -189,12 +189,6 @@ PRODUCT_PACKAGES += \ 


PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/bootdevice/by-name/system



# Wifi:

#   Wifi HAL (android.hardware.wifi@1.0-service, wpa_supplicant,

#   and wpa_supplicant.conf) is not here. They are in vendor.img

PRODUCT_PACKAGES += \

    wificond \



# Audio:

USE_XML_AUDIO_POLICY_CONF := 1

# The following policy XML files are used as fallback for