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

Commit b1cbbaf5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents b2d7fa3d af505d5f

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 \



# The order matters

PRODUCT_BOOT_JARS := \

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