| author | Xindong Xu <xindong.xu@amlogic.com> | 2017-12-15 02:46:10 (GMT) |
|---|---|---|
| committer | Xindong Xu <xindong.xu@amlogic.com> | 2017-12-18 09:01:59 (GMT) |
| commit | bdb4353da4a4167bc1d4bec7c7a53c724937d4de (patch) | |
| tree | ee2e55e3da3cb19f05b75fde073e52e22915a2f3 | |
| parent | c4ef6d59f0fd0048791b73afae25d4664e52184d (diff) | |
| download | common-bdb4353da4a4167bc1d4bec7c7a53c724937d4de.zip common-bdb4353da4a4167bc1d4bec7c7a53c724937d4de.tar.gz common-bdb4353da4a4167bc1d4bec7c7a53c724937d4de.tar.bz2 | |
ref_dev_common: bring up 8.1.0_r1 [4/4]
PD# 157115
bring up 8.1.0_r1
Change-Id: If6fabb23b6d04e0649381b0ec2cc41945d8cbac8
28 files changed, 171 insertions, 72 deletions
diff --git a/core_amlogic.mk b/core_amlogic.mk index eb5b827..8c6c006 100644 --- a/core_amlogic.mk +++ b/core_amlogic.mk @@ -26,6 +26,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Put en_US first in the list, so make it default. PRODUCT_LOCALES := en_US +ALLOW_MISSING_DEPENDENCIES := true + # Include drawables for all densities PRODUCT_AAPT_CONFIG := normal hdpi xhdpi xxhdpi @@ -45,11 +47,8 @@ PRODUCT_PACKAGES += \ ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) PRODUCT_PACKAGES += \ - PhotoTable \ - Happycast_Tv -endif + PhotoTable -ifneq ($(TARGET_BUILD_GOOGLE_ATV), true) PRODUCT_PACKAGES += \ LiveWallpapers \ LiveWallpapersPicker @@ -431,6 +430,8 @@ PRODUCT_PACKAGES += \ ifeq ($(TARGET_BUILD_GOOGLE_ATV), true) PRODUCT_IS_ATV := true +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/tutorial-library-google.zip:system/media/tutorial-library-google.zip endif PRODUCT_PROPERTY_OVERRIDES += \ @@ -452,34 +453,32 @@ PRODUCT_PROPERTY_OVERRIDES += \ fw.disable_quota=true PRODUCT_PACKAGES += \ + VendorOverlay + +PRODUCT_PROPERTY_OVERRIDES += \ + ro.boot.vendor.overlay.theme=VendorOverlay + +PRODUCT_PACKAGES += \ + android.hardware.renderscript@1.0.vndk-sp\ android.hardware.graphics.allocator@2.0.vndk-sp\ android.hardware.graphics.mapper@2.0.vndk-sp\ android.hardware.graphics.common@1.0.vndk-sp\ - android.hardware.renderscript@1.0.vndk-sp\ - android.hidl.base@1.0.vndk-sp\ - android.hidl.memory@1.0.vndk-sp \ - libRSCpuRef.vndk-sp\ - libRSDriver.vndk-sp\ - libRS_internal.vndk-sp\ - libbacktrace.vndk-sp\ + libhwbinder.vndk-sp\ libbase.vndk-sp\ - libbcinfo.vndk-sp\ - libblas.vndk-sp\ - libc++.vndk-sp\ - libcompiler_rt.vndk-sp\ libcutils.vndk-sp\ - libft2.vndk-sp\ libhardware.vndk-sp\ libhidlbase.vndk-sp\ - libhidlmemory.vndk-sp \ libhidltransport.vndk-sp\ - libhwbinder.vndk-sp\ - libion.vndk-sp\ - liblzma.vndk-sp\ + libutils.vndk-sp\ + libc++.vndk-sp\ + libRS_internal.vndk-sp\ + libRSDriver.vndk-sp\ + libRSCpuRef.vndk-sp\ + libbcinfo.vndk-sp\ + libblas.vndk-sp\ + libft2.vndk-sp\ libpng.vndk-sp\ + libcompiler_rt.vndk-sp\ + libbacktrace.vndk-sp\ libunwind.vndk-sp\ - libutils.vndk-sp -ifeq ($(TARGET_BUILD_GOOGLE_ATV),true) - PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/tutorial-library-google.zip:system/media/tutorial-library-google.zip -endif + liblzma.vndk-sp\ @@ -297,7 +297,21 @@ endif aml_fastboot_zip:$(INSTALLED_AML_FASTBOOT_ZIP) $(INSTALLED_AML_FASTBOOT_ZIP): $(addprefix $(PRODUCT_OUT)/,$(FASTBOOT_IMAGES)) echo "install $@" - cd $(PRODUCT_OUT); zip -r $(TARGET_PRODUCT)-fastboot-$(BUILD_NUMBER).zip $(FASTBOOT_IMAGES) + mkdir -p $(PRODUCT_OUT)/fastboot + cd $(PRODUCT_OUT); cp $(FASTBOOT_IMAGES) fastboot/; +ifeq ($(TARGET_PRODUCT),ampere) + echo "board=p212" > $(PRODUCT_OUT)/fastboot/android-info.txt +endif +ifeq ($(TARGET_PRODUCT),braun) + echo "board=p230" > $(PRODUCT_OUT)/fastboot/android-info.txt +endif +ifeq ($(TARGET_PRODUCT),curie) + echo "board=p241" > $(PRODUCT_OUT)/fastboot/android-info.txt +endif +ifeq ($(TARGET_PRODUCT),darwin) + echo "board=txlx_t962e_r321" > $(PRODUCT_OUT)/fastboot/android-info.txt +endif + cd $(PRODUCT_OUT)/fastboot; zip -r ../$(TARGET_PRODUCT)-fastboot-$(BUILD_NUMBER).zip $(FASTBOOT_IMAGES) droidcore: $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_MANIFEST_XML) $(INSTALLED_AML_FASTBOOT_ZIP) otapackage: $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_MANIFEST_XML) $(INSTALLED_AML_FASTBOOT_ZIP) diff --git a/products/mbox/init.amlogic.rc b/products/mbox/init.amlogic.rc index 004120a..e49cbe6 100644 --- a/products/mbox/init.amlogic.rc +++ b/products/mbox/init.amlogic.rc @@ -253,7 +253,7 @@ on boot # HDMI/LCD switch chown system system /sys/class/display/mode - chown media system /sys/class/display/axis + chown system graphics /sys/class/display/axis chown system system /sys/class/graphics/fb0/scale chown system system /sys/class/graphics/fb1/scale chown system system /sys/class/graphics/fb0/scale_axis diff --git a/products/mbox/upgrade_4.9/aml_upgrade_package_AB.conf b/products/mbox/upgrade_4.9/aml_upgrade_package_AB.conf index a79d370..360af03 100644 --- a/products/mbox/upgrade_4.9/aml_upgrade_package_AB.conf +++ b/products/mbox/upgrade_4.9/aml_upgrade_package_AB.conf @@ -21,6 +21,7 @@ file="boot.img" main_type="PARTITION" sub_type="boot_a" file="system.img" main_type="PARTITION" sub_type="system_a" file="vendor.img" main_type="PARTITION" sub_type="vendor_a" file="odm.img" main_type="PARTITION" sub_type="odm_a" +file="odm.img" main_type="PARTITION" sub_type="odm_b" file="u-boot.bin" main_type="PARTITION" sub_type="bootloader" file="dtb.img" main_type="PARTITION" sub_type="_aml_dtb" diff --git a/products/mbox/upgrade_4.9/aml_upgrade_package_AB_enc.conf b/products/mbox/upgrade_4.9/aml_upgrade_package_AB_enc.conf index 1b1d9a0..59c1c2e 100644 --- a/products/mbox/upgrade_4.9/aml_upgrade_package_AB_enc.conf +++ b/products/mbox/upgrade_4.9/aml_upgrade_package_AB_enc.conf @@ -21,11 +21,11 @@ file="manifest.xml" main_type="xml" sub_type="man #file="userdata.img" main_type="PARTITION" sub_type="data" file="logo.img" main_type="PARTITION" sub_type="logo" -file="boot.img.encrypt" main_type="PARTITION" sub_type="boot" file="boot.img.encrypt" main_type="PARTITION" sub_type="boot_a" -#file="boot.img.encrypt" main_type="PARTITION" sub_type="boot_b" file="system.img" main_type="PARTITION" sub_type="system_a" -#file="system.img" main_type="PARTITION" sub_type="system_b" +file="vendor.img" main_type="PARTITION" sub_type="vendor_a" +file="odm.img" main_type="PARTITION" sub_type="odm_a" +file="odm.img" main_type="PARTITION" sub_type="odm_b" file="u-boot.bin.encrypt" main_type="PARTITION" sub_type="bootloader" file="dtb.img.encrypt" main_type="PARTITION" sub_type="_aml_dtb" diff --git a/products/tv/init.amlogic.rc b/products/tv/init.amlogic.rc index 295dedd..8b7670b 100644 --- a/products/tv/init.amlogic.rc +++ b/products/tv/init.amlogic.rc @@ -264,7 +264,7 @@ on boot # HDMI/LCD switch chown system system /sys/class/display/mode - chown media system /sys/class/display/axis + chown system graphics /sys/class/display/axis chown system system /sys/class/graphics/fb0/scale chown system system /sys/class/graphics/fb1/scale chown system system /sys/class/graphics/fb0/scale_axis diff --git a/recovery/check/Android.mk b/recovery/check/Android.mk index 7d19b62..0f1921f 100644 --- a/recovery/check/Android.mk +++ b/recovery/check/Android.mk @@ -8,7 +8,9 @@ LOCAL_MODULE := libsecurity LOCAL_C_INCLUDES += bootable/recovery -LOCAL_C_INCLUDES += system/core/base/include +LOCAL_C_INCLUDES += \ + system/core/base/include \ + system/core/libziparchive/include LOCAL_C_INCLUDES += $(LOCAL_PATH)/../ diff --git a/recovery/recovery_extra/Android.mk b/recovery/recovery_extra/Android.mk index a77a718..f94b6f4 100644 --- a/recovery/recovery_extra/Android.mk +++ b/recovery/recovery_extra/Android.mk @@ -14,7 +14,9 @@ LOCAL_C_INCLUDES += \ system/vold \ system/core/adb -LOCAL_C_INCLUDES += system/core/base/include +LOCAL_C_INCLUDES += \ + system/core/base/include \ + system/core/libziparchive/include LOCAL_C_INCLUDES += bootable/recovery/bootloader_message/include diff --git a/recovery/ui/Android.mk b/recovery/ui/Android.mk index 640aaac..80f0eaa 100644 --- a/recovery/ui/Android.mk +++ b/recovery/ui/Android.mk @@ -12,7 +12,9 @@ LOCAL_C_INCLUDES += \ system/core/adb \ device/amlogic/common/recovery -LOCAL_C_INCLUDES += system/core/base/include +LOCAL_C_INCLUDES += \ + system/core/base/include \ + system/core/libziparchive/include LOCAL_C_INCLUDES += bootable/recovery/bootloader_message/include diff --git a/recovery/updater_extra/Android.mk b/recovery/updater_extra/Android.mk index 80130e0..589ffe5 100644 --- a/recovery/updater_extra/Android.mk +++ b/recovery/updater_extra/Android.mk @@ -10,7 +10,9 @@ LOCAL_MODULE_TAGS := eng LOCAL_C_INCLUDES += bootable/recovery -LOCAL_C_INCLUDES += bootable/recovery/updater/include +LOCAL_C_INCLUDES += \ + bootable/recovery/updater/include \ + system/core/libziparchive/include LOCAL_C_INCLUDES += $(LOCAL_PATH)/../ diff --git a/sepolicy/e2fs.te b/sepolicy/e2fs.te new file mode 100644 index 0000000..fdf7a97 --- a/dev/null +++ b/sepolicy/e2fs.te @@ -0,0 +1,7 @@ +allow e2fs cache_block_device:blk_file { read getattr open ioctl write }; +allow e2fs devpts:chr_file { read write getattr ioctl }; +allow e2fs odm_block_device:blk_file getattr; +allow e2fs system_block_fsck_device:blk_file getattr; +allow e2fs tee_block_device:blk_file { getattr ioctl open read write }; +allow e2fs vendor_block_device:blk_file getattr; +allow e2fs sysfs_fs_ext4_features:dir search;
\ No newline at end of file diff --git a/sepolicy/file.te b/sepolicy/file.te index e2c35a2..59b2db8 100644 --- a/sepolicy/file.te +++ b/sepolicy/file.te @@ -10,7 +10,7 @@ type pppoe_wrapper_socket, file_type; # XBMC type sysfs_xbmc, fs_type, sysfs_type; # Update -type update_data_file, file_type; +type update_data_file, file_type, data_file_type; #optee type drm_device, fs_type,sysfs_type; diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 3672dc8..22b94f8 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -106,8 +106,8 @@ #/vendor/bin/imageserver u:object_r:imageserver_exec:s0 -/system/bin/mke2fs -- u:object_r:fsck_exec:s0 -/system/bin/e2fsdroid -- u:object_r:fsck_exec:s0 +#/system/bin/mke2fs -- u:object_r:fsck_exec:s0 +#/system/bin/e2fsdroid -- u:object_r:fsck_exec:s0 #/vendor/bin/pppoe_wrapper u:object_r:pppoe_wrapper_exec:s0 /vendor/bin/hdcp_rx22 u:object_r:hdcp_rx22_exec:s0 diff --git a/sepolicy/hal_cas_default.te b/sepolicy/hal_cas_default.te new file mode 100644 index 0000000..e390b95 --- a/dev/null +++ b/sepolicy/hal_cas_default.te @@ -0,0 +1,2 @@ +allow hal_cas_default vndbinder_device:chr_file { read write open ioctl }; + diff --git a/sepolicy/hal_memtrack_default.te b/sepolicy/hal_memtrack_default.te index 6cde1cc..b7e3882 100644 --- a/sepolicy/hal_memtrack_default.te +++ b/sepolicy/hal_memtrack_default.te @@ -14,6 +14,17 @@ allow hal_memtrack_default hal_dumpstate_default:dir { search }; allow hal_memtrack_default hal_configstore_default:file { open read getattr }; allow hal_memtrack_default hal_configstore_default:dir { search }; +allow hal_memtrack_default hal_cas_default:dir search; +allow hal_memtrack_default hal_cas_default:file { getattr open read }; +allow hal_memtrack_default hal_health_default:dir search; +allow hal_memtrack_default hal_health_default:file { getattr open read }; +allow hal_memtrack_default hal_light_default:dir search; +allow hal_memtrack_default hal_light_default:file { getattr open read }; +allow hal_memtrack_default hal_thermal_default:dir search; +allow hal_memtrack_default hal_thermal_default:file { getattr open read }; +allow hal_memtrack_default thermalserviced:dir search; +allow hal_memtrack_default thermalserviced:file { getattr open read }; + allow hal_memtrack_default { priv_app platform_app untrusted_app su drmserver installd keystore mdnsd isolated_app }:dir { search }; allow hal_memtrack_default { priv_app platform_app untrusted_app su drmserver installd keystore mdnsd isolated_app }:file { read open getattr }; diff --git a/sepolicy/logd.te b/sepolicy/logd.te new file mode 100644 index 0000000..2e9f1eb --- a/dev/null +++ b/sepolicy/logd.te @@ -0,0 +1 @@ +allow logd unlabeled:dir search; diff --git a/sepolicy/mediaprovider.te b/sepolicy/mediaprovider.te new file mode 100644 index 0000000..85882e5 --- a/dev/null +++ b/sepolicy/mediaprovider.te @@ -0,0 +1 @@ +allow mediaprovider media_prop:file { getattr open read }; diff --git a/sepolicy/recovery.te b/sepolicy/recovery.te index 033ac7a..3be1941 100644 --- a/sepolicy/recovery.te +++ b/sepolicy/recovery.te @@ -26,14 +26,26 @@ allow recovery recovery:capability { net_admin }; allow recovery aml_display_prop:file {open read getattr}; allow recovery uboot_prop:file {open read getattr}; -allow recovery update_data_file:file rw_file_perms; -allow recovery update_data_file:dir { search read write open }; +allow recovery self:capability2 syslog; +allow recovery sysfs_fs_ext4_features:dir search; +allow recovery sysfs_fs_ext4_features:file read; + +#allow recovery update_data_file:file rw_file_perms; +#allow recovery update_data_file:dir { search read write open }; allow recovery graphics_device:dir {search}; allow recovery graphics_device:chr_file {open read write ioctl}; allow shell rootfs:file { entrypoint execute getattr open read }; +allow recovery bcmdl_prop:file { getattr open }; +allow recovery media_prop:file { getattr open }; +allow recovery sysfs_audio_cap:file read; +allow recovery sysfs_video:file { open read write }; +allow recovery tv_config_prop:file { getattr open }; +allow recovery tv_prop:file { getattr open }; +allow recovery wifi_prop:file { getattr open }; + allow shell tmpfs:file {open read getattr}; allow shell sysfs:file { read open }; allow shell rootfs:file {execute_no_trans}; diff --git a/sepolicy/system_app.te b/sepolicy/system_app.te index b5cedf0..4529e3a 100644 --- a/sepolicy/system_app.te +++ b/sepolicy/system_app.te @@ -23,8 +23,8 @@ #allow system_app unlabeled:file { lock open read write getattr }; # ## /cache_file for dvb app creat update.zip file at /cache dir -#allow system_app cache_file:dir {create_dir_perms create_file_perms rw_file_perms}; -#allow system_app cache_file:file {create_file_perms rw_file_perms}; +allow system_app cache_file:dir { search add_name write }; +allow system_app cache_file:file { create getattr open write }; # #allow system_app log_file:dir { search read open getattr }; #allow system_app log_file:file { read open getattr }; @@ -42,7 +42,7 @@ #allow system_app pppoe_wrapper_socket:file create; allow system_app cache_recovery_file:dir { search read open write add_name remove_name }; -allow system_app cache_recovery_file:file { create getattr open read write }; +allow system_app cache_recovery_file:file { create getattr open read write unlink }; allow system_app update_engine:binder {call transfer}; # @@ -55,8 +55,10 @@ allow system_app vendor_file:file { read open getattr execute }; allow system_app system_app:netlink_kobject_uevent_socket { create }; -allow system_app update_data_file:dir { getattr search read write open add_name remove_name }; -allow system_app update_data_file:file { getattr write read create open unlink }; +allow system_app update_data_file:dir search; + +#allow system_app update_data_file:dir { getattr search read write open add_name remove_name }; +#allow system_app update_data_file:file { getattr write read create open unlink }; allow system_app { pppoe_service subtitle_service }:service_manager { add }; diff --git a/sepolicy/system_server.te b/sepolicy/system_server.te index 4c58d4f..21fdcbc 100644 --- a/sepolicy/system_server.te +++ b/sepolicy/system_server.te @@ -47,3 +47,7 @@ allow system_server socket_device:sock_file { write }; allow system_server hidraw_device:chr_file {open read write ioctl}; allow system_server audio_prop:property_service { set }; allow system_server uhid_device:chr_file { write open ioctl }; + +allow system_server hal_audio_default:file write; + +allow system_server mediaprovider:file { write open };
\ No newline at end of file diff --git a/sepolicy/untrusted_app.te b/sepolicy/untrusted_app.te new file mode 100644 index 0000000..091d6c2 --- a/dev/null +++ b/sepolicy/untrusted_app.te @@ -0,0 +1 @@ +allow untrusted_app system_control:binder call; diff --git a/sepolicy/untrusted_app_25.te b/sepolicy/untrusted_app_25.te new file mode 100644 index 0000000..998b431 --- a/dev/null +++ b/sepolicy/untrusted_app_25.te @@ -0,0 +1 @@ +allow untrusted_app_25 sysfs:file { open read }; diff --git a/sepolicy/zygote.te b/sepolicy/zygote.te index 683ea47..0c47602 100644 --- a/sepolicy/zygote.te +++ b/sepolicy/zygote.te @@ -11,3 +11,5 @@ get_prop(zygote, media_prop) allow zygote kernel:system module_request; allow zygote vendor_file:file { read open getattr execute }; + +allow zygote cgroup:file { create };
\ No newline at end of file diff --git a/vendor-overlay/Android.mk b/vendor-overlay/Android.mk new file mode 100644 index 0000000..0d3c2e7 --- a/dev/null +++ b/vendor-overlay/Android.mk @@ -0,0 +1,18 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +CAL_MODULE_TAGS := optional + +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/overlay + +#include files in res diretory +LOCAL_RESOURCE_DIR := \ + $(LOCAL_PATH)/res + +LOCAL_SDK_VERSION := current +LOCAL_EXPORT_PACKAGE_RESOURCES := true + +LOCAL_PACKAGE_NAME := VendorOverlay +LOCAL_CERTIFICATE := platform + +include $(BUILD_PACKAGE) diff --git a/vendor-overlay/AndroidManifest.xml b/vendor-overlay/AndroidManifest.xml new file mode 100644 index 0000000..53c5de6 --- a/dev/null +++ b/vendor-overlay/AndroidManifest.xml @@ -0,0 +1,6 @@ +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.droidlogic.overlay" + android:versionCode="1" + android:versionName="1.0"> + <overlay android:targetPackage="android" android:priority="1" android:isStatic="true"/> +</manifest> diff --git a/vendor-overlay/res/values/config.xml b/vendor-overlay/res/values/config.xml new file mode 100644 index 0000000..6770174 --- a/dev/null +++ b/vendor-overlay/res/values/config.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <bool name="config_useFixedVolume">true</bool> + <bool name="config_voice_capable">false</bool> +</resources> diff --git a/vndk/Android.mk b/vndk/Android.mk index f4bdb14..203d36d 100644 --- a/vndk/Android.mk +++ b/vndk/Android.mk @@ -1,33 +1,29 @@ LOCAL_PATH := $(call my-dir) VNDK_SP_LIBRARIES := \ - android.hardware.graphics.allocator@2.0 \ - android.hardware.graphics.mapper@2.0 \ - android.hardware.graphics.common@1.0 \ - android.hardware.renderscript@1.0 \ - android.hidl.base@1.0 \ - android.hidl.memory@1.0 \ - libRSCpuRef \ - libRSDriver \ - libRS_internal \ - libbacktrace \ - libbase \ - libbcinfo \ - libblas \ - libc++ \ - libcompiler_rt \ - libcutils \ - libft2 \ - libhardware \ - libhidlbase \ - libhidlmemory \ - libhidltransport \ - libhwbinder \ - libion \ - liblzma \ - libpng \ - libunwind \ - libutils \ + android.hardware.renderscript@1.0\ + android.hardware.graphics.allocator@2.0\ + android.hardware.graphics.mapper@2.0\ + android.hardware.graphics.common@1.0\ + libhwbinder\ + libbase\ + libcutils\ + libhardware\ + libutils\ + libc++\ + libbacktrace\ + libunwind\ + liblzma\ + libhidlbase\ + libhidltransport\ + libRS_internal\ + libRSDriver\ + libRSCpuRef\ + libbcinfo\ + libblas\ + libft2\ + libpng\ + libcompiler_rt\ define add-vndk-sp-lib include $$(CLEAR_VARS) @@ -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 |