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

* changes: Move framework-wifi into the Wifi APEX Add framework-wifi to bootclasspath
LineageOS · Dec 17, 2019 · d880e49 · d880e49
2 parents 7aefdb1 + b6d5b76
commit d880e49
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
@@ -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 \