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

Commit d880e49d authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge changes from topics "framework-wifi-apex", "split-framework-wifi"

* changes:
  Move framework-wifi into the Wifi APEX
  Add framework-wifi to bootclasspath
parents 7aefdb1d b6d5b766
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -333,7 +333,8 @@ PRODUCT_BOOT_JARS := \
    framework-sdkext \
    framework-statsd \
    ike \
    updatable-media
    updatable-media \
    framework-wifi

PRODUCT_UPDATABLE_BOOT_JARS := \
    com.android.conscrypt:conscrypt \
@@ -342,7 +343,8 @@ PRODUCT_UPDATABLE_BOOT_JARS := \
    com.android.os.statsd:framework-statsd \
    com.android.sdkext:framework-sdkext \
    com.android.telephony:telephony-common \
    com.android.telephony:ims-common
    com.android.telephony:ims-common \
    com.android.wifi:framework-wifi

PRODUCT_COPY_FILES += \
    system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \