commit d880e49d4454d434eef2ee7259add4605e43bd78
author David Su <dysu@google.com> Tue Dec 17 07:35:27 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 17 07:35:27 2019 +0000
tree 06ca8eef2672bfa9dcb29f3004b84c7bbf6a4a3a
parent 7aefdb1da173f55e5388c4cf04e93810fea73104
parent b6d5b76624c28fc28eabd26f8a737f8b9a62aea2

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

* changes:
  Move framework-wifi into the Wifi APEX
  Add framework-wifi to bootclasspath

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index c9a50a8..5c803ee 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -333,7 +333,8 @@
     framework-sdkext \
     framework-statsd \
     ike \
-    updatable-media
+    updatable-media \
+    framework-wifi
 
 PRODUCT_UPDATABLE_BOOT_JARS := \
     com.android.conscrypt:conscrypt \
@@ -342,7 +343,8 @@
     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 \