From af505d5f2f485b4e91c1c3bec0f9aa41b4c0a2e0 Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Mon, 19 Jun 2017 15:20:10 +0800 Subject: [PATCH] Add wificond to Android makefiles wificond is part of the framework, and shouldn't be modified by vendor. The patch adds wificond to PRODUCT_PACKAGES list of Android makefile, and removes it from treble_common.mk. Bug: 62646878 Test: Build and check the file existance in system image Change-Id: I92f2b64c1912ed5106a72a56e831bc989a70979e --- target/product/core_base.mk | 6 +++++- target/product/core_minimal.mk | 6 +++++- target/product/core_tiny.mk | 6 +++++- target/product/treble_common.mk | 6 ------ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/target/product/core_base.mk b/target/product/core_base.mk index 03d33e1b6..e0a20b887 100644 --- a/target/product/core_base.mk +++ b/target/product/core_base.mk @@ -60,6 +60,10 @@ PRODUCT_PACKAGES += \ libwebrtc_audio_preprocessing \ mdnsd \ requestsync \ - wifi-service + +# Wifi modules +PRODUCT_PACKAGES += \ + wifi-service \ + wificond \ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk) diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index 5a18c7093..9ea9a5a0a 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -88,7 +88,11 @@ PRODUCT_PACKAGES += \ voip-common \ webview \ webview_zygote \ - wifi-service + +# Wifi modules +PRODUCT_PACKAGES += \ + wifi-service \ + wificond \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.webview.xml:system/etc/permissions/android.software.webview.xml diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk index e9920f2a7..f19009cad 100644 --- a/target/product/core_tiny.mk +++ b/target/product/core_tiny.mk @@ -83,7 +83,11 @@ PRODUCT_PACKAGES += \ telephony-common \ voip-common \ logd \ - wifi-service + +# Wifi modules +PRODUCT_PACKAGES += \ + wifi-service \ + wificond \ # The order matters PRODUCT_BOOT_JARS := \ diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk index 0405abb36..accc2dc54 100644 --- a/target/product/treble_common.mk +++ b/target/product/treble_common.mk @@ -189,12 +189,6 @@ PRODUCT_PACKAGES += \ PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/bootdevice/by-name/system -# Wifi: -# Wifi HAL (android.hardware.wifi@1.0-service, wpa_supplicant, -# and wpa_supplicant.conf) is not here. They are in vendor.img -PRODUCT_PACKAGES += \ - wificond \ - # Audio: USE_XML_AUDIO_POLICY_CONF := 1 # The following policy XML files are used as fallback for