| author | Tellen Yu <tellen.yu@amlogic.com> | 2017-09-08 06:08:06 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2017-09-08 06:08:06 (GMT) |
| commit | 1c2364c944cf73d46d36fdcbd879f11b2afc8e21 (patch) | |
| tree | 28754ce6374e4677a3bf25a90e842581ea4f808c | |
| parent | dbde7a2ebd2582ec75ca158eee8745f297886c3b (diff) | |
| parent | 0a8f17aeb1f1060a87a57a4eae8af566619c1adc (diff) | |
| download | amlogic-o-1c2364c944cf73d46d36fdcbd879f11b2afc8e21.zip amlogic-o-1c2364c944cf73d46d36fdcbd879f11b2afc8e21.tar.gz amlogic-o-1c2364c944cf73d46d36fdcbd879f11b2afc8e21.tar.bz2 | |
Merge "wifi: fix wifi insmod issue[1/3]" into o-amlogic
| -rw-r--r-- | common/core_amlogic.mk | 1 | ||||
| -rw-r--r-- | common/wifi.mk | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/common/core_amlogic.mk b/common/core_amlogic.mk index de1f076..4c5f73c 100644 --- a/common/core_amlogic.mk +++ b/common/core_amlogic.mk @@ -330,7 +330,6 @@ PRODUCT_PACKAGES += \ android.hardware.light@2.0-impl \ android.hardware.drm@1.0-impl \ android.hardware.soundtrigger@2.0-impl \ - android.hardware.wifi@1.0-service \ android.hardware.camera.provider@2.4-impl \ android.hardware.thermal@1.0-impl \ android.hardware.usb@1.0-service \ diff --git a/common/wifi.mk b/common/wifi.mk index 50dcf2f..fbffccd 100644 --- a/common/wifi.mk +++ b/common/wifi.mk @@ -44,8 +44,8 @@ PRODUCT_PACKAGES += wpa_supplicant.conf PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml - + frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \ + hardware/amlogic/wifi/multi_wifi/android.hardware.wifi@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.wifi@1.0-service.rc PRODUCT_PROPERTY_OVERRIDES += \ ro.carrier=wifi-only |