summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--common/core_amlogic.mk17
-rw-r--r--common/init.amlogic.wifi.rc2
-rw-r--r--common/sepolicy/bcmdl.te5
-rw-r--r--common/sepolicy/hal_wifi_default.te10
-rw-r--r--common/wifi_driver.mk77
-rw-r--r--p212/Kernel.mk2
-rw-r--r--p212/device.mk3
-rw-r--r--p212/files/media_codecs_performance.xml14
-rw-r--r--p212/manifest.xml (copied from common/manifest.xml)9
-rw-r--r--p212/overlay/frameworks/base/core/res/res/values/config.xml7
-rw-r--r--p212/p212.mk4
-rw-r--r--p212/system.prop1
-rw-r--r--p230/device.mk3
-rw-r--r--p230/manifest.xml (renamed from common/manifest.xml)0
-rw-r--r--p230/overlay/frameworks/base/core/res/res/values/config.xml4
-rw-r--r--p230/system.prop1
16 files changed, 92 insertions, 67 deletions
diff --git a/common/core_amlogic.mk b/common/core_amlogic.mk
index 1233405..9e4b45e 100644
--- a/common/core_amlogic.mk
+++ b/common/core_amlogic.mk
@@ -8,6 +8,15 @@ $(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk)
# Get a list of languages.
$(call inherit-product, build/target/product/locales_full.mk)
+# Define the host tools and libs that are parts of the SDK.
+ifneq ($(filter sdk win_sdk sdk_addon,$(MAKECMDGOALS)),)
+-include sdk/build/product_sdk.mk
+-include development/build/product_sdk.mk
+
+PRODUCT_PACKAGES += \
+ EmulatorSmokeTests
+endif
+
# Additional settings used in all AOSP builds
PRODUCT_PROPERTY_OVERRIDES += \
ro.com.android.dateformat=MM-dd-yyyy \
@@ -84,9 +93,6 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
device/amlogic/common/ddr/ddr_window_64.ko:$(PRODUCT_OUT)/obj/lib_vendor/ddr_window_64.ko
-PRODUCT_COPY_FILES += \
- device/amlogic/common/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml
-
PRODUCT_PROPERTY_OVERRIDES += \
ro.carrier=unknown \
net.tethering.noprovisioning=true
@@ -96,7 +102,6 @@ PRODUCT_PACKAGES += \
CalendarProvider \
CaptivePortalLogin \
CertInstaller \
- DocumentsUI \
ExternalStorageProvider \
FusedLocation \
InputDevices \
@@ -136,7 +141,8 @@ WITH_SOFT_AM_EXTRACTOR_DECODER := true
PRODUCT_PROPERTY_OVERRIDES += \
debug.hwui.render_dirty_regions=false \
ro.hwui.texture_cache_size=64.0f \
- camera.disable_zsl_mode=1
+ camera.disable_zsl_mode=1 \
+ debug.hwui.use_buffer_age=false
# USB camera default face
PRODUCT_PROPERTY_OVERRIDES += \
@@ -145,6 +151,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
ifneq ($(TARGET_BUILD_GOOGLE_ATV), true)
PRODUCT_PACKAGES += \
AppInstaller \
+ DocumentsUI \
FileBrowser \
RemoteIME \
DeskClock \
diff --git a/common/init.amlogic.wifi.rc b/common/init.amlogic.wifi.rc
index ccc7b6b..6bc71d5 100644
--- a/common/init.amlogic.wifi.rc
+++ b/common/init.amlogic.wifi.rc
@@ -19,7 +19,7 @@ service rtl_supplicant /vendor/bin/hw/wpa_supplicant \
disabled
oneshot
-service bcm_supplicant /vendor/bin/hw/wpa_supplicant \
+service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-I/vendor/etc/wifi/bcm_supplicant_overlay.conf \
-m/data/misc/wifi/p2p_supplicant.conf \
diff --git a/common/sepolicy/bcmdl.te b/common/sepolicy/bcmdl.te
index 42849f8..2739981 100644
--- a/common/sepolicy/bcmdl.te
+++ b/common/sepolicy/bcmdl.te
@@ -1,11 +1,12 @@
type bcmdl, domain;
type bcmdl_exec, exec_type, file_type;
allow bcmdl usb_device:dir { read open search };
-
+allow bcmdl usb_device:chr_file { read open write ioctl };
allow bcmdl bcmdl:capability { net_raw net_admin };
+allow bcmdl bcmdl:netlink_kobject_uevent_socket { create setopt bind read };
allow bcmdl property_socket:sock_file write;
allow bcmdl init:unix_stream_socket connectto;
allow bcmdl sysfs:file { open read getattr };
allow bcmdl proc:file { open read getattr };
allow bcmdl sysfs:dir { read open };
-allow bcmdl bcmdl_prop:property_service { set }; \ No newline at end of file
+allow bcmdl bcmdl_prop:property_service { set };
diff --git a/common/sepolicy/hal_wifi_default.te b/common/sepolicy/hal_wifi_default.te
index af1a488..0fbfee7 100644
--- a/common/sepolicy/hal_wifi_default.te
+++ b/common/sepolicy/hal_wifi_default.te
@@ -1,4 +1,14 @@
allow hal_wifi_default sysfs:file rw_file_perms;
allow hal_wifi_default self:capability sys_module;
allow hal_wifi_default proc_modules:file rw_file_perms;
+allow hal_wifi_default radio_device:chr_file rw_file_perms;
+allow hal_wifi_default wifi_data_file:dir rw_file_perms;
+allow hal_wifi_default device:dir rw_file_perms;
+allow hal_wifi_default usb_device:dir rw_file_perms;
+allow hal_wifi_default wifi_data_file:dir { search add_name};
+allow hal_wifi_default ctl_default_prop:property_service set;
+allow hal_wifi_default wifi_data_file:file { open setattr create read write};
+allow hal_wifi_default self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
allow hal_wifi_default { system_file vendor_file }:system module_load;
+allow hal_wifi_default hal_wifi_default:capability chown;
+allow hal_wifi_default kernel:system module_request;
diff --git a/common/wifi_driver.mk b/common/wifi_driver.mk
index d319933..9d791d6 100644
--- a/common/wifi_driver.mk
+++ b/common/wifi_driver.mk
@@ -157,46 +157,47 @@ qca6174:
multiwifi:
@echo "make wifi module KERNEL_ARCH is $(KERNEL_ARCH)"
$(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8189es/rtl8189ES ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
+ mkdir -p $(TARGET_OUT)/
cp $(shell pwd)/hardware/wifi/realtek/drivers/8189es/rtl8189ES/8189es.ko $(TARGET_OUT)/
- $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8189ftv/rtl8189FS ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
- cp $(shell pwd)/hardware/wifi/realtek/drivers/8189ftv/rtl8189FS/8189fs.ko $(TARGET_OUT)/
- $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8188ftv/rtl8188FU ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
- cp $(shell pwd)/hardware/wifi/realtek/drivers/8188ftv/rtl8188FU/8188fu.ko $(TARGET_OUT)/
- $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8192eu/rtl8192EU ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
- cp $(shell pwd)/hardware/wifi/realtek/drivers/8192eu/rtl8192EU/8192eu.ko $(TARGET_OUT)/
- $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8723bs/rtl8723BS ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
- cp $(shell pwd)/hardware/wifi/realtek/drivers/8723bs/rtl8723BS/8723bs.ko $(TARGET_OUT)/
- $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8723du/rtl8723DU ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
- cp $(shell pwd)/hardware/wifi/realtek/drivers/8723du/rtl8723DU/8723du.ko $(TARGET_OUT)/
- $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8723ds/rtl8723DS ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
- cp $(shell pwd)/hardware/wifi/realtek/drivers/8723ds/rtl8723DS/8723ds.ko $(TARGET_OUT)/
- $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8188eu/rtl8xxx_EU ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
- cp $(shell pwd)/hardware/wifi/realtek/drivers/8188eu/rtl8xxx_EU/8188eu.ko $(TARGET_OUT)/
- $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8812au/rtl8812AU ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
- cp $(shell pwd)/hardware/wifi/realtek/drivers/8812au/rtl8812AU/8812au.ko $(TARGET_OUT)/
- $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8192es/rtl8192ES ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
- cp $(shell pwd)/hardware/wifi/realtek/drivers/8192es/rtl8192ES/8192es.ko $(TARGET_OUT)/
- $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/broadcom/drivers/ap6xxx/bcmdhd.1.363.59.144.x.cn ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) CONFIG_DHD_USE_STATIC_BUF=y modules
- cp $(shell pwd)/hardware/wifi/broadcom/drivers/ap6xxx/bcmdhd.1.363.59.144.x.cn/dhd.ko $(TARGET_OUT)/
- $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/mtk/drivers/mt7601 ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
- cp $(shell pwd)/hardware/wifi/mtk/drivers/mt7601/mt7601usta.ko $(TARGET_OUT)/
- cp $(shell pwd)/hardware/wifi/mtk/drivers/mt7601/mtprealloc.ko $(TARGET_OUT)/
- $(MAKE) CROSS_COMPILE=$(CROSS_COMPILE) LINUX_SRC=$(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ RT28xx_DIR=$(shell pwd)/hardware/wifi/mtk/drivers/mt7603 -f $(shell pwd)/hardware/wifi/mtk/drivers/mt7603/Makefile
- cp $(shell pwd)/hardware/wifi/mtk/drivers/mt7603/os/linux/mt7603usta.ko $(TARGET_OUT)/
- $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ TopDIR=$(shell pwd)/hardware/wifi/realtek/drivers/8822bs/rtl8822BS M=$(shell pwd)/hardware/wifi/realtek/drivers/8822bs/rtl8822BS ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
- cp $(shell pwd)/hardware/wifi/realtek/drivers/8822bs/rtl8822BS/8822bs.ko $(TARGET_OUT)/
- $(MAKE) -C $(shell pwd)/hardware/wifi/qualcomm/drivers/qca9377/AIO/build drivers BOARD_TYPE=x86-android IF_TYPE=SDIO KERNELPATH=$(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ
- cp $(shell pwd)/hardware/wifi/qualcomm/drivers/qca9377/AIO/rootfs-x86-android.build/lib/modules/wlan.ko $(TARGET_OUT)/wlan_9377.ko
- cp $(shell pwd)/hardware/wifi/qualcomm/drivers/qca9377/AIO/rootfs-x86-android.build/lib/modules/cfg80211.ko $(TARGET_OUT)/cfg80211_9377.ko
- cp $(shell pwd)/hardware/wifi/qualcomm/drivers/qca9377/AIO/rootfs-x86-android.build/lib/modules/compat.ko $(TARGET_OUT)/compat_9377.ko
- $(MAKE) -C $(shell pwd)/hardware/wifi/qualcomm/drivers/qca6174/AIO/build KERNELPATH=$(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ
- cp $(shell pwd)/hardware/wifi/qualcomm/drivers/qca6174/AIO/rootfs-x86-android.build/lib/modules/wlan.ko $(TARGET_OUT)/wlan_6174.ko
- cp $(shell pwd)/hardware/wifi/qualcomm/drivers/qca6174/AIO/rootfs-x86-android.build/lib/modules/cfg80211.ko $(TARGET_OUT)/cfg80211_6174.ko
- cp $(shell pwd)/hardware/wifi/qualcomm/drivers/qca6174/AIO/rootfs-x86-android.build/lib/modules/compat.ko $(TARGET_OUT)/compat_6174.ko
- #cp $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ/net/wireless/cfg80211.ko $(TARGET_OUT)/
+# $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8189ftv/rtl8189FS ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
+# cp $(shell pwd)/hardware/wifi/realtek/drivers/8189ftv/rtl8189FS/8189fs.ko $(TARGET_OUT)/
+# $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8188ftv/rtl8188FU ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
+# cp $(shell pwd)/hardware/wifi/realtek/drivers/8188ftv/rtl8188FU/8188fu.ko $(TARGET_OUT)/
+# $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8192eu/rtl8192EU ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
+# cp $(shell pwd)/hardware/wifi/realtek/drivers/8192eu/rtl8192EU/8192eu.ko $(TARGET_OUT)/
+# $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8723bs/rtl8723BS ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
+# cp $(shell pwd)/hardware/wifi/realtek/drivers/8723bs/rtl8723BS/8723bs.ko $(TARGET_OUT)/
+# $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8723du/rtl8723DU ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
+# cp $(shell pwd)/hardware/wifi/realtek/drivers/8723du/rtl8723DU/8723du.ko $(TARGET_OUT)/
+# $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8723ds/rtl8723DS ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
+# cp $(shell pwd)/hardware/wifi/realtek/drivers/8723ds/rtl8723DS/8723ds.ko $(TARGET_OUT)/
+# $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8188eu/rtl8xxx_EU ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
+# cp $(shell pwd)/hardware/wifi/realtek/drivers/8188eu/rtl8xxx_EU/8188eu.ko $(TARGET_OUT)/
+# $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8812au/rtl8812AU ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
+# cp $(shell pwd)/hardware/wifi/realtek/drivers/8812au/rtl8812AU/8812au.ko $(TARGET_OUT)/
+# $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/realtek/drivers/8192es/rtl8192ES ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
+# cp $(shell pwd)/hardware/wifi/realtek/drivers/8192es/rtl8192ES/8192es.ko $(TARGET_OUT)/
+ $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/broadcom/drivers/ap6xxx/bcmdhd.1.579.77.41.1.cn ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) CONFIG_DHD_USE_STATIC_BUF=y modules
+ cp $(shell pwd)/hardware/wifi/broadcom/drivers/ap6xxx/bcmdhd.1.579.77.41.1.cn/dhd.ko $(TARGET_OUT)/
+# $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/mtk/drivers/mt7601 ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
+# cp $(shell pwd)/hardware/wifi/mtk/drivers/mt7601/mt7601usta.ko $(TARGET_OUT)/
+# cp $(shell pwd)/hardware/wifi/mtk/drivers/mt7601/mtprealloc.ko $(TARGET_OUT)/
+# $(MAKE) CROSS_COMPILE=$(CROSS_COMPILE) LINUX_SRC=$(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ RT28xx_DIR=$(shell pwd)/hardware/wifi/mtk/drivers/mt7603 -f $(shell pwd)/hardware/wifi/mtk/drivers/mt7603/Makefile
+# cp $(shell pwd)/hardware/wifi/mtk/drivers/mt7603/os/linux/mt7603usta.ko $(TARGET_OUT)/
+# $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ TopDIR=$(shell pwd)/hardware/wifi/realtek/drivers/8822bs/rtl8822BS M=$(shell pwd)/hardware/wifi/realtek/drivers/8822bs/rtl8822BS ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
+# cp $(shell pwd)/hardware/wifi/realtek/drivers/8822bs/rtl8822BS/8822bs.ko $(TARGET_OUT)/
+# $(MAKE) -C $(shell pwd)/hardware/wifi/qualcomm/drivers/qca9377/AIO/build drivers BOARD_TYPE=x86-android IF_TYPE=SDIO KERNELPATH=$(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ
+# cp $(shell pwd)/hardware/wifi/qualcomm/drivers/qca9377/AIO/rootfs-x86-android.build/lib/modules/wlan.ko $(TARGET_OUT)/wlan_9377.ko
+# cp $(shell pwd)/hardware/wifi/qualcomm/drivers/qca9377/AIO/rootfs-x86-android.build/lib/modules/cfg80211.ko $(TARGET_OUT)/cfg80211_9377.ko
+# cp $(shell pwd)/hardware/wifi/qualcomm/drivers/qca9377/AIO/rootfs-x86-android.build/lib/modules/compat.ko $(TARGET_OUT)/compat_9377.ko
+# $(MAKE) -C $(shell pwd)/hardware/wifi/qualcomm/drivers/qca6174/AIO/build KERNELPATH=$(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ
+# cp $(shell pwd)/hardware/wifi/qualcomm/drivers/qca6174/AIO/rootfs-x86-android.build/lib/modules/wlan.ko $(TARGET_OUT)/wlan_6174.ko
+# cp $(shell pwd)/hardware/wifi/qualcomm/drivers/qca6174/AIO/rootfs-x86-android.build/lib/modules/cfg80211.ko $(TARGET_OUT)/cfg80211_6174.ko
+# cp $(shell pwd)/hardware/wifi/qualcomm/drivers/qca6174/AIO/rootfs-x86-android.build/lib/modules/compat.ko $(TARGET_OUT)/compat_6174.ko
+# #cp $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ/net/wireless/cfg80211.ko $(TARGET_OUT)/
$(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/broadcom/drivers/ap6xxx/bcmdhd-usb.1.363.110.17.x ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
cp $(shell pwd)/hardware/wifi/broadcom/drivers/ap6xxx/bcmdhd-usb.1.363.110.17.x/bcmdhd.ko $(TARGET_OUT)/
- $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/vendor/broadcom/btusb/btusb_1_6_29_1/ ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
- cp $(shell pwd)/vendor/broadcom/btusb/btusb_1_6_29_1/btusb.ko $(TARGET_OUT)/
+# $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/vendor/broadcom/btusb/btusb_1_6_29_1/ ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
+# cp $(shell pwd)/vendor/broadcom/btusb/btusb_1_6_29_1/btusb.ko $(TARGET_OUT)/
$(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ TopDIR=$(shell pwd)/hardware/wifi/realtek/drivers/8822bu/rtl8822BU M=$(shell pwd)/hardware/wifi/realtek/drivers/8822bu/rtl8822BU ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
cp $(shell pwd)/hardware/wifi/realtek/drivers/8822bu/rtl8822BU/8822bu.ko $(TARGET_OUT)/
diff --git a/p212/Kernel.mk b/p212/Kernel.mk
index 242ec84..44539bc 100644
--- a/p212/Kernel.mk
+++ b/p212/Kernel.mk
@@ -3,7 +3,7 @@
-include device/amlogic/common/media_modules.mk
USE_PREBUILT_KERNEL := false
-WIFI_MODULE := AP6335
+WIFI_MODULE := multiwifi
INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel
diff --git a/p212/device.mk b/p212/device.mk
index 4346d9e..7122a92 100644
--- a/p212/device.mk
+++ b/p212/device.mk
@@ -45,7 +45,8 @@ PRODUCT_COPY_FILES += \
device/amlogic/p212/files/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
device/amlogic/p212/files/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
device/amlogic/p212/files/mixer_paths.xml:system/etc/mixer_paths.xml \
- device/amlogic/p212/files/mesondisplay.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/mesondisplay.cfg
+ device/amlogic/p212/files/mesondisplay.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/mesondisplay.cfg \
+ device/amlogic/p212/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml
# remote IME config file
PRODUCT_COPY_FILES += \
diff --git a/p212/files/media_codecs_performance.xml b/p212/files/media_codecs_performance.xml
index 200cadd..ac382ac 100644
--- a/p212/files/media_codecs_performance.xml
+++ b/p212/files/media_codecs_performance.xml
@@ -38,12 +38,12 @@
</MediaCodec>
<MediaCodec name="OMX.amlogic.avc.decoder.awesome" type="video/avc" update="true">
<Limit name="measured-frame-rate-320x240" range="226-226" />
- <Limit name="measured-frame-rate-720x480" range="228-228" />
+ <Limit name="measured-frame-rate-720x480" range="580-580" />
<Limit name="measured-frame-rate-1280x720" range="290-290" />
<Limit name="measured-frame-rate-1920x1080" range="135-135" />
</MediaCodec>
<MediaCodec name="OMX.amlogic.vp9.decoder.awesome" type="video/x-vnd.on2.vp9" update="true">
- <Limit name="measured-frame-rate-320x180" range="1033-1033" />
+ <Limit name="measured-frame-rate-320x180" range="400-400" />
<Limit name="measured-frame-rate-640x360" range="816-816" />
<Limit name="measured-frame-rate-1280x720" range="290-290" />
<Limit name="measured-frame-rate-1920x1080" range="133-133" />
@@ -51,8 +51,8 @@
</MediaCodec>
<MediaCodec name="OMX.amlogic.hevc.decoder.awesome" type="video/hevc" update="true">
<Limit name="measured-frame-rate-352x288" range="458-458" />
- <Limit name="measured-frame-rate-640x360" range="164-164" />
- <Limit name="measured-frame-rate-720x480" range="148-148" />
+ <Limit name="measured-frame-rate-640x360" range="500-500" />
+ <Limit name="measured-frame-rate-720x480" range="516-516" />
<Limit name="measured-frame-rate-1280x720" range="294-294" />
<Limit name="measured-frame-rate-1920x1080" range="132-132" />
<Limit name="measured-frame-rate-3840x2160" range="72-72" />
@@ -76,9 +76,9 @@
</MediaCodec>
<MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
<Limit name="measured-frame-rate-320x180" range="676-676" />
- <Limit name="measured-frame-rate-640x360" range="330-330" />
- <Limit name="measured-frame-rate-1280x720" range="93-93" />
- <Limit name="measured-frame-rate-1920x1080" range="42-42" />
+ <Limit name="measured-frame-rate-640x360" range="130-130" />
+ <Limit name="measured-frame-rate-1280x720" range="29-29" />
+ <Limit name="measured-frame-rate-1920x1080" range="11-11" />
</MediaCodec>
<MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
<Limit name="measured-frame-rate-320x180" range="265-265" />
diff --git a/common/manifest.xml b/p212/manifest.xml
index 88567d2..10fdb8c 100644
--- a/common/manifest.xml
+++ b/p212/manifest.xml
@@ -142,15 +142,6 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
- <name>android.hardware.boot</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IBootControl</name>
- <instance>default</instance>
- </interface>
- </hal>
<sepolicy>
<version>26.0</version>
</sepolicy>
diff --git a/p212/overlay/frameworks/base/core/res/res/values/config.xml b/p212/overlay/frameworks/base/core/res/res/values/config.xml
index 35b9a26..1ad27aa 100644
--- a/p212/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/p212/overlay/frameworks/base/core/res/res/values/config.xml
@@ -94,4 +94,11 @@
<bool name="config_defaultInTouchMode">false</bool>
<!-- Whether the device uses the default focus highlight when focus state isn't specified. -->
<bool name="config_useDefaultFocusHighlight">false</bool>
+
+ <!-- Keyguard component -->
+ <string name="config_keyguardComponent" translatable="false">com.droidlogic/com.droidlogic.StubKeyguardService</string>
+
+ <!-- disable wallpaper, which may consume too much boot time -->
+ <!-- cannot disable wallpaper, com.android.settings will crash! -->
+ <!--bool name="config_enableWallpaperService">false</bool-->
</resources>
diff --git a/p212/p212.mk b/p212/p212.mk
index 1ab8395..80908d6 100644
--- a/p212/p212.mk
+++ b/p212/p212.mk
@@ -181,8 +181,8 @@ endif
#
#########################################################################
-#MULTI_WIFI_SUPPORT := true
-WIFI_MODULE := AP6335
+MULTI_WIFI_SUPPORT := true
+#WIFI_MODULE := AP6335
include device/amlogic/common/wifi.mk
# Change this to match target country
diff --git a/p212/system.prop b/p212/system.prop
index ebdbac8..36d7460 100644
--- a/p212/system.prop
+++ b/p212/system.prop
@@ -11,6 +11,7 @@ ro.camera.preview.UseMJPEG=1
ro.autoconnectbt.isneed=true
ro.autoconnectbt.macprefix=00:CD:FF
ro.autoconnectbt.btclass=50c
+ro.autoconnectbt.nameprefix=Amlogic_RC
#if wifi Only
ro.radio.noril=false
diff --git a/p230/device.mk b/p230/device.mk
index 62271dc..ff82ee2 100644
--- a/p230/device.mk
+++ b/p230/device.mk
@@ -33,7 +33,8 @@ PRODUCT_COPY_FILES += \
device/amlogic/p230/files/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
device/amlogic/p230/files/mixer_paths.xml:system/etc/mixer_paths.xml \
device/amlogic/p230/files/mesondisplay.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/mesondisplay.cfg \
- frameworks/native/data/etc/android.hardware.hdmi.cec.xml:system/etc/permissions/android.hardware.hdmi.cec.xml
+ frameworks/native/data/etc/android.hardware.hdmi.cec.xml:system/etc/permissions/android.hardware.hdmi.cec.xml \
+ device/amlogic/p230/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml
# remote IME config file
PRODUCT_COPY_FILES += \
diff --git a/common/manifest.xml b/p230/manifest.xml
index 88567d2..88567d2 100644
--- a/common/manifest.xml
+++ b/p230/manifest.xml
diff --git a/p230/overlay/frameworks/base/core/res/res/values/config.xml b/p230/overlay/frameworks/base/core/res/res/values/config.xml
index 35b9a26..da55f60 100644
--- a/p230/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/p230/overlay/frameworks/base/core/res/res/values/config.xml
@@ -94,4 +94,8 @@
<bool name="config_defaultInTouchMode">false</bool>
<!-- Whether the device uses the default focus highlight when focus state isn't specified. -->
<bool name="config_useDefaultFocusHighlight">false</bool>
+
+ <!-- Keyguard component -->
+ <string name="config_keyguardComponent" translatable="false">com.droidlogic/com.droidlogic.StubKeyguardService</string>
+
</resources>
diff --git a/p230/system.prop b/p230/system.prop
index ebdbac8..36d7460 100644
--- a/p230/system.prop
+++ b/p230/system.prop
@@ -11,6 +11,7 @@ ro.camera.preview.UseMJPEG=1
ro.autoconnectbt.isneed=true
ro.autoconnectbt.macprefix=00:CD:FF
ro.autoconnectbt.btclass=50c
+ro.autoconnectbt.nameprefix=Amlogic_RC
#if wifi Only
ro.radio.noril=false
generated by cgit at 2024-05-17 16:35:25 (GMT)