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

* changes:
  Move framework-wifi into the Wifi APEX
  Add framework-wifi to bootclasspath
This commit is contained in:
David Su 2019-12-17 07:35:27 +00:00 committed by Android (Google) Code Review
commit d880e49d44
1 changed files with 4 additions and 2 deletions

View File

@ -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 \