summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--core_amlogic.mk49
-rw-r--r--factory.mk16
-rw-r--r--products/mbox/init.amlogic.rc2
-rw-r--r--products/mbox/upgrade_4.9/aml_upgrade_package_AB.conf1
-rw-r--r--products/mbox/upgrade_4.9/aml_upgrade_package_AB_enc.conf6
-rw-r--r--products/tv/init.amlogic.rc2
-rw-r--r--recovery/check/Android.mk4
-rw-r--r--recovery/recovery_extra/Android.mk4
-rw-r--r--recovery/ui/Android.mk4
-rw-r--r--recovery/updater_extra/Android.mk4
-rw-r--r--sepolicy/e2fs.te7
-rw-r--r--sepolicy/file.te2
-rw-r--r--sepolicy/file_contexts4
-rw-r--r--sepolicy/hal_cas_default.te2
-rw-r--r--sepolicy/hal_memtrack_default.te11
-rw-r--r--sepolicy/logd.te1
-rw-r--r--sepolicy/mediaprovider.te1
-rw-r--r--sepolicy/recovery.te16
-rw-r--r--sepolicy/system_app.te12
-rw-r--r--sepolicy/system_server.te4
-rw-r--r--sepolicy/untrusted_app.te1
-rw-r--r--sepolicy/untrusted_app_25.te1
-rw-r--r--sepolicy/zygote.te2
-rw-r--r--vendor-overlay/Android.mk18
-rw-r--r--vendor-overlay/AndroidManifest.xml6
-rw-r--r--vendor-overlay/res/values/config.xml5
-rw-r--r--vndk/Android.mk50
-rw-r--r--wifi.mk8
28 files changed, 171 insertions, 72 deletions
diff --git a/wifi.mk b/wifi.mk
index caa8135..03ad5f2 100644
--- a/wifi.mk
+++ b/wifi.mk
@@ -102,9 +102,13 @@ endif
################################################################################## bcm4356
ifeq ($(WIFI_MODULE),bcm4356)
WIFI_DRIVER := bcm4356
+
+ifneq ($(WIFI_BUILD_IN), true)
WIFI_DRIVER_MODULE_PATH := /vendor/lib/modules/dhd.ko
WIFI_DRIVER_MODULE_NAME := dhd
WIFI_DRIVER_MODULE_ARG := "firmware_path=/vendor/etc/wifi/4356/fw_bcm4356a2_ag.bin nvram_path=/vendor/etc/wifi/4356/nvram_ap6356.txt"
+endif
+
WIFI_DRIVER_FW_PATH_STA := /vendor/etc/wifi/4356/fw_bcm4356a2_ag.bin
WIFI_DRIVER_FW_PATH_AP := /vendor/etc/wifi/4356/fw_bcm4356a2_ag_apsta.bin
WIFI_DRIVER_FW_PATH_P2P := /vendor/etc/wifi/4356/fw_bcm4356a2_ag_p2p.bin
@@ -679,9 +683,13 @@ endif
################################################################################## AP6335
ifeq ($(WIFI_MODULE),AP6335)
WIFI_DRIVER := AP6335
+
+ifneq ($(WIFI_BUILD_IN), true)
WIFI_DRIVER_MODULE_PATH := /vendor/lib/modules/dhd.ko
WIFI_DRIVER_MODULE_NAME := dhd
WIFI_DRIVER_MODULE_ARG := "firmware_path=/vendor/etc/wifi/6335/fw_bcm4339a0_ag.bin nvram_path=/vendor/etc/wifi/6335/nvram.txt"
+endif
+
WIFI_DRIVER_FW_PATH_STA :=/vendor/etc/wifi/6335/fw_bcm4339a0_ag.bin
WIFI_DRIVER_FW_PATH_AP :=/vendor/etc/wifi/6335/fw_bcm4339a0_ag_apsta.bin
WIFI_DRIVER_FW_PATH_P2P :=/vendor/etc/wifi/6335/fw_bcm4339a0_ag_p2p.bin