ae0e8ef2fb
1. Add supplicant service init
2. Add p2p and aware interface property
3. Force softap use wlan1 interface
4. verbose logging always on for userdebug build
Bug: 235906179
Test: 1. check supplicant can be started
2. check property ro.vendor.wifi.sap.interface
3. check property wifi.direct.interface
4. check property wifi.aware.interface
Change-Id: I92d83db81e5260b8bb781e9263c0bef62fbf8d7a
163 lines
6.6 KiB
Makefile
163 lines
6.6 KiB
Makefile
#
|
|
# Copyright (C) 2021 The Android Open-Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
TARGET_KERNEL_DIR ?= device/google/tangorpro-kernel
|
|
TARGET_BOARD_KERNEL_HEADERS := device/google/tangorpro-kernel/kernel-headers
|
|
|
|
$(call inherit-product-if-exists, vendor/google_devices/tangorpro/prebuilts/device-vendor-tangorpro.mk)
|
|
$(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
|
|
$(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
|
|
$(call inherit-product-if-exists, vendor/google_devices/tangorpro/proprietary/tangorpro/device-vendor-tangorpro.mk)
|
|
|
|
include device/google/gs201/device-shipping-common.mk
|
|
include device/google/tangorpro/audio/tangorpro/audio-tables.mk
|
|
include hardware/google/pixel/vibrator/cs40l26/device.mk
|
|
|
|
$(call soong_config_set,lyric,tuning_product,cloudripper)
|
|
$(call soong_config_set,google3a_config,target_device,cloudripper)
|
|
|
|
DEVICE_PACKAGE_OVERLAYS += device/google/tangorpro/tangorpro/overlay
|
|
PRODUCT_SOONG_NAMESPACES += device/google/tangorpro
|
|
PRODUCT_PACKAGES += WifiOverlayT6pro
|
|
|
|
# Touch files
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/tangorpro/NVTCapacitiveTouchScreen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/NVTCapacitiveTouchScreen.idc \
|
|
device/google/tangorpro/NVTCapacitivePen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/NVTCapacitivePen.idc
|
|
|
|
# Init files
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/tangorpro/conf/init.tangorpro.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.tangorpro.rc
|
|
|
|
# Recovery files
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/tangorpro/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.tangorpro.rc
|
|
|
|
# insmod files
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/tangorpro/init.insmod.tangorpro.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.tangorpro.cfg
|
|
|
|
# Camera
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/tangorpro/media_profiles_tangorpro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
|
|
|
|
# NFC
|
|
PRODUCT_COPY_FILES += \
|
|
frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \
|
|
frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \
|
|
frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \
|
|
frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \
|
|
frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \
|
|
frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \
|
|
device/google/tangorpro/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \
|
|
device/google/tangorpro/nfc/libnfc-nci-tangorpro.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
|
|
|
|
PRODUCT_PACKAGES += \
|
|
NfcNci \
|
|
Tag \
|
|
android.hardware.nfc@1.2-service.st
|
|
|
|
# SecureElement
|
|
PRODUCT_PACKAGES += \
|
|
android.hardware.secure_element@1.2-service-gto \
|
|
android.hardware.secure_element@1.2-service-gto-ese2
|
|
|
|
PRODUCT_COPY_FILES += \
|
|
frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.ese.xml \
|
|
frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml \
|
|
device/google/tangorpro/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf \
|
|
device/google/tangorpro/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
|
|
|
|
DEVICE_MANIFEST_FILE += \
|
|
device/google/tangorpro/nfc/manifest_nfc.xml \
|
|
device/google/tangorpro/nfc/manifest_se.xml
|
|
|
|
# Thermal Config
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/tangorpro/thermal_info_config_tangorpro.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json
|
|
|
|
# Power HAL config
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/tangorpro/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
|
|
|
|
# Bluetooth HAL and Pixel extension
|
|
include device/google/tangorpro/bluetooth/qti_default.mk
|
|
|
|
# Keymaster HAL
|
|
#LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service
|
|
|
|
# Gatekeeper HAL
|
|
#LOCAL_GATEKEEPER_PRODUCT_PACKAGE ?= android.hardware.gatekeeper@1.0-service.software
|
|
|
|
|
|
# Gatekeeper
|
|
# PRODUCT_PACKAGES += \
|
|
# android.hardware.gatekeeper@1.0-service.software
|
|
|
|
# Keymint replaces Keymaster
|
|
# PRODUCT_PACKAGES += \
|
|
# android.hardware.security.keymint-service
|
|
|
|
# Keymaster
|
|
#PRODUCT_PACKAGES += \
|
|
# android.hardware.keymaster@4.0-impl \
|
|
# android.hardware.keymaster@4.0-service
|
|
|
|
#PRODUCT_PACKAGES += android.hardware.keymaster@4.0-service.remote
|
|
#PRODUCT_PACKAGES += android.hardware.keymaster@4.1-service.remote
|
|
#LOCAL_KEYMASTER_PRODUCT_PACKAGE := android.hardware.keymaster@4.1-service
|
|
#LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service
|
|
|
|
# PRODUCT_PROPERTY_OVERRIDES += \
|
|
# ro.hardware.keystore_desede=true \
|
|
# ro.hardware.keystore=software \
|
|
# ro.hardware.gatekeeper=software
|
|
|
|
## Fingerprint HAL
|
|
#GOODIX_CONFIG_BUILD_VERSION := g7_trusty
|
|
#include device/google/gs101/fingerprint/udfps_common.mk
|
|
#ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
|
|
#include device/google/gs101/fingerprint/udfps_shipping.mk
|
|
#else
|
|
#include device/google/gs101/fingerprint/udfps_factory.mk
|
|
#endif
|
|
|
|
# Vibrator HAL
|
|
PRODUCT_VENDOR_PROPERTIES += \
|
|
ro.vendor.vibrator.hal.supported_primitives=243
|
|
|
|
# Trusty liboemcrypto.so
|
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts
|
|
|
|
# GPS xml
|
|
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/tangorpro/gps.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
|
else
|
|
PRODUCT_COPY_FILES += \
|
|
device/google/tangorpro/gps_user.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
|
endif
|
|
|
|
# DCK properties based on target
|
|
PRODUCT_PROPERTY_OVERRIDES += \
|
|
ro.gms.dck.eligible_wcc=2
|
|
|
|
# Wifi SAP Interface Name
|
|
PRODUCT_PROPERTY_OVERRIDES += \
|
|
ro.vendor.wifi.sap.interface=wlan1
|
|
|
|
# Set ro.crypto.metadata_init_delete_all_keys.enabled to false to unblock boot
|
|
PRODUCT_PROPERTY_OVERRIDES += ro.crypto.metadata_init_delete_all_keys.enabled=false
|