Snap for 8282595 from 3eace521b8 to udc-release

Change-Id: Ife026f1d6ccd5f4464dbb35054b8db8941d047e5
This commit is contained in:
Android Build Coastguard Worker 2022-03-10 04:01:14 +00:00
commit ec719c9c7b
6 changed files with 68 additions and 29 deletions

View file

@ -12,3 +12,8 @@ on boot
# Audio test folder # Audio test folder
mkdir /data/AudioTest 0775 system system mkdir /data/AudioTest 0775 system system
on property:sys.boot_completed=1
# Bump nnapi min clamp & add adbd to it for factory (b/222226268)
write /sys/kernel/vendor_sched/nnapi_uclamp_min 512
exec - system system -- /vendor/bin/factory/factory_post_boot

View file

@ -153,50 +153,52 @@ endif
USE_SWIFTSHADER := false USE_SWIFTSHADER := false
# HWUI # HWUI
TARGET_USES_VULKAN = false TARGET_USES_VULKAN = true
PRODUCT_SOONG_NAMESPACES += vendor/arm/mali/valhall PRODUCT_SOONG_NAMESPACES += \
vendor/arm/mali/valhall
$(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM)) $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
include device/google/gs101/neuralnetwork/neuralnetwork.mk
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
csffw_image_prebuilt__firmware_prebuilt_todx_mali_csffw.bin \ csffw_image_prebuilt__firmware_prebuilt_todx_mali_csffw.bin \
libGLES_mali \ libGLES_mali \
vulkan.mali \ vulkan.mali \
libOpenCL \ libOpenCL \
libgpudataproducer \ libgpudataproducer \
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.vulkan=mali ro.hardware.vulkan=mali
include device/google/gs101/neuralnetwork/neuralnetwork.mk
ifeq ($(USE_SWIFTSHADER),true) ifeq ($(USE_SWIFTSHADER),true)
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
libGLESv1_CM_swiftshader \ libGLESv1_CM_swiftshader \
libEGL_swiftshader \ libEGL_swiftshader \
libGLESv2_swiftshader libGLESv2_swiftshader
endif endif
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \ frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \
frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \ frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \ frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \
frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \ frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \
frameworks/native/data/etc/android.software.vulkan.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ frameworks/native/data/etc/android.software.vulkan.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
frameworks/native/data/etc/android.software.opengles.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml frameworks/native/data/etc/android.software.opengles.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
ifeq ($(USE_SWIFTSHADER),true) ifeq ($(USE_SWIFTSHADER),true)
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = swiftshader ro.hardware.egl = swiftshader
else else
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.hardware.egl = mali ro.hardware.egl = mali
endif endif
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.opengles.version=196610 \ ro.opengles.version=196610 \
debug.renderengine.backend=skiaglthreaded \ graphics.gpu.profiler.support=true \
graphics.gpu.profiler.support=true \ debug.renderengine.backend=skiaglthreaded \
# GRAPHICS - GPU (end) # GRAPHICS - GPU (end)
# #################### # ####################

View file

@ -0,0 +1,25 @@
//
// Copyright (C) 2022 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.
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
sh_binary {
name: "factory_post_boot",
src: "factory_post_boot.sh",
vendor: true,
sub_dir: "factory",
}

View file

@ -0,0 +1,4 @@
#!/vendor/bin/sh
# Add adbd to nnapi vendor cgroup. (b/222226268)
echo `pidof adbd` > /sys/kernel/vendor_sched/set_task_group_nnapi

View file

@ -63,11 +63,14 @@ DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay-factory
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/gs201/conf/init.factory.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.factory.rc device/google/gs201/conf/init.factory.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.factory.rc
BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/factory_boost
# Add factory-friendly changes # Add factory-friendly changes
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
FactoryOverlaySettings \ FactoryOverlaySettings \
FactoryOverlayLauncher3 \ FactoryOverlayLauncher3 \
FactoryOverlayFrameworkRes FactoryOverlayFrameworkRes \
factory_post_boot
# To prevent rebooting due to crashing services # To prevent rebooting due to crashing services
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \

View file

@ -115,7 +115,7 @@
<Limit name="size" min="64x64" max="3840x2176" /> <Limit name="size" min="64x64" max="3840x2176" />
<Limit name="alignment" value="2x2" /> <Limit name="alignment" value="2x2" />
<Limit name="block-size" value="64x64" /> <Limit name="block-size" value="64x64" />
<Limit name="block-count" range="1-2025" /> <Limit name="block-count" range="1-2040" />
<Limit name="blocks-per-second" min="1" max="3888000" /> <Limit name="blocks-per-second" min="1" max="3888000" />
<Limit name="bitrate" range="1-80000000" /> <Limit name="bitrate" range="1-80000000" />
<Limit name="performance-point-1280x720" range="240" /> <Limit name="performance-point-1280x720" range="240" />
@ -128,7 +128,7 @@
<Limit name="size" min="64x64" max="3840x2176" /> <Limit name="size" min="64x64" max="3840x2176" />
<Limit name="alignment" value="2x2" /> <Limit name="alignment" value="2x2" />
<Limit name="block-size" value="64x64" /> <Limit name="block-size" value="64x64" />
<Limit name="block-count" range="1-2025" /> <Limit name="block-count" range="1-2040" />
<Limit name="blocks-per-second" min="1" max="3888000" /> <Limit name="blocks-per-second" min="1" max="3888000" />
<Limit name="bitrate" range="1-80000000" /> <Limit name="bitrate" range="1-80000000" />
<Limit name="performance-point-1280x720" range="240" /> <Limit name="performance-point-1280x720" range="240" />
@ -159,7 +159,7 @@
<Limit name="size" min="64x64" max="3840x2176" /> <Limit name="size" min="64x64" max="3840x2176" />
<Limit name="alignment" value="2x2" /> <Limit name="alignment" value="2x2" />
<Limit name="block-size" value="32x32" /> <Limit name="block-size" value="32x32" />
<Limit name="block-count" range="1-8100" /> <Limit name="block-count" range="1-8160" />
<Limit name="blocks-per-second" min="1" max="979200" /> <Limit name="blocks-per-second" min="1" max="979200" />
<Limit name="bitrate" range="1-120000000" /> <Limit name="bitrate" range="1-120000000" />
<Limit name="performance-point-1280x720" range="240" /> <Limit name="performance-point-1280x720" range="240" />
@ -214,7 +214,7 @@
<Limit name="size" min="64x64" max="3840x2176" /> <Limit name="size" min="64x64" max="3840x2176" />
<Limit name="alignment" value="2x2" /> <Limit name="alignment" value="2x2" />
<Limit name="block-size" value="64x64" /> <Limit name="block-size" value="64x64" />
<Limit name="block-count" range="1-2025" /> <Limit name="block-count" range="1-2040" />
<Limit name="blocks-per-second" min="1" max="243000" /> <Limit name="blocks-per-second" min="1" max="243000" />
<Limit name="bitrate" range="1-80000000" /> <Limit name="bitrate" range="1-80000000" />
<Limit name="performance-point-1280x720" range="240" /> <Limit name="performance-point-1280x720" range="240" />