summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--common/core_amlogic.mk21
-rw-r--r--p212/BoardConfig.mk2
-rw-r--r--p212/device.mk3
-rw-r--r--p212/manifest.xml (copied from common/manifest.xml)18
-rw-r--r--p212/system.prop1
-rw-r--r--p230/BoardConfig.mk2
-rw-r--r--p230/device.mk3
-rw-r--r--p230/manifest.xml (renamed from common/manifest.xml)9
-rw-r--r--p230/system.prop1
9 files changed, 23 insertions, 37 deletions
diff --git a/common/core_amlogic.mk b/common/core_amlogic.mk
index 8787a55..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 \
@@ -330,7 +337,6 @@ PRODUCT_PACKAGES += \
android.hardware.light@2.0-impl \
android.hardware.drm@1.0-impl \
android.hardware.soundtrigger@2.0-impl \
- android.hardware.camera.provider@2.4-impl \
android.hardware.thermal@1.0-impl \
android.hardware.wifi@1.0-service \
android.hardware.usb@1.0-service \
@@ -348,8 +354,11 @@ PRODUCT_PACKAGES += \
android.hardware.audio.effect@2.0-impl \
android.hardware.audio@2.0-service
#Camera HAL
+ifneq ($(TARGET_BUILD_GOOGLE_ATV), true)
PRODUCT_PACKAGES += \
+ android.hardware.camera.provider@2.4-impl \
android.hardware.camera.provider@2.4-service
+endif
#Power HAL
PRODUCT_PACKAGES += \
diff --git a/p212/BoardConfig.mk b/p212/BoardConfig.mk
index d517c1f..668e7b3 100644
--- a/p212/BoardConfig.mk
+++ b/p212/BoardConfig.mk
@@ -50,7 +50,7 @@ TARGET_BOOTLOADER_BOARD_NAME := p212
USE_OPENGL_RENDERER := true
NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
MAX_VIRTUAL_DISPLAY_DIMENSION := 1920
-TARGET_APP_LAYER_USE_CONTINUOUS_BUFFER := true
+TARGET_APP_LAYER_USE_CONTINUOUS_BUFFER := false
TARGET_SUPPORT_SECURE_LAYER := false
# Camera
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/common/manifest.xml b/p212/manifest.xml
index 903fe5b..10fdb8c 100644
--- a/common/manifest.xml
+++ b/p212/manifest.xml
@@ -133,15 +133,6 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
- <name>android.hardware.camera.provider</name>
- <transport>hwbinder</transport>
- <version>2.4</version>
- <interface>
- <name>ICameraProvider</name>
- <instance>legacy/0</instance>
- </interface>
- </hal>
<hal>
<name>vendor.amlogic.hardware.systemcontrol</name>
<transport>hwbinder</transport>
@@ -151,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/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/BoardConfig.mk b/p230/BoardConfig.mk
index 9ccbd10..c8ef1be 100644
--- a/p230/BoardConfig.mk
+++ b/p230/BoardConfig.mk
@@ -50,7 +50,7 @@ TARGET_BOOTLOADER_BOARD_NAME := p230
USE_OPENGL_RENDERER := true
NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
MAX_VIRTUAL_DISPLAY_DIMENSION := 1920
-TARGET_APP_LAYER_USE_CONTINUOUS_BUFFER := true
+TARGET_APP_LAYER_USE_CONTINUOUS_BUFFER := false
TARGET_SUPPORT_SECURE_LAYER := false
# Camera
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 903fe5b..88567d2 100644
--- a/common/manifest.xml
+++ b/p230/manifest.xml
@@ -133,15 +133,6 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
- <name>android.hardware.camera.provider</name>
- <transport>hwbinder</transport>
- <version>2.4</version>
- <interface>
- <name>ICameraProvider</name>
- <instance>legacy/0</instance>
- </interface>
- </hal>
<hal>
<name>vendor.amlogic.hardware.systemcontrol</name>
<transport>hwbinder</transport>
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:53:22 (GMT)