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

Commit 8086a123 authored by Roshan Pius's avatar Roshan Pius
Browse files

base_system.mk: Switch to wifi mainline apex 

Also, explicitly include the cacerts_wfa in builds. This used to be
included via the "required" tag in wifi-service build rule. We probably don't
want to deliver CA certificates to OEM devices via mainline updates. So,
leaving it out of the wifi mainline module & explicitly including it in
the base makefile.

Bug: 144722612
Test: Device boots up & connects to wifi networks.
Change-Id: I3e4487f9fad765e442bf8335ec1f21de3a47674d
parent 2cea7f94

target/product/base_system.mk

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ PRODUCT_PACKAGES += \ 
    bu \

    bugreport \

    bugreportz \

    cacerts_wfa \

    cgroups.json \

    charger \

    cmd \
@@ -60,6 +61,7 @@ PRODUCT_PACKAGES += \ 
    com.android.resolv \

    com.android.neuralnetworks \

    com.android.tzdata \

    com.android.wifi \

    ContactsProvider \

    content \

    crash_dump \
@@ -267,7 +269,6 @@ PRODUCT_PACKAGES += \ 
    vold \

    WallpaperBackup \

    watchdogd \

    wifi-service \

    wificond \

    wm \

target/product/media_system.mk

+1 −2
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ endif 
# The order here is the same order they end up on the classpath, so it matters.

PRODUCT_SYSTEM_SERVER_JARS := \

    services \

    wifi-service \

    ethernet-service \

    com.android.location.provider \

    service-jobscheduler \
@@ -63,7 +62,7 @@ PRODUCT_SYSTEM_SERVER_JARS := \ 
# system server jars which are updated via apex modules.

# The values should be of the format <apex name>:<jar name>

PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \

    # Ex: com.android.wifi:wifi-service

    com.android.wifi:wifi-service



PRODUCT_COPY_FILES += \

    system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt