diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 0a022e9c..00000000 --- a/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -# -# Copyright (C) 2011 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. -# - -# WARNING: Everything listed here will be built on ALL platforms, -# including x86, the universal, and the SDK. Modules must be uniquely -# named (liblights.panda), and must build everywhere, or limit themselves -# to only building on ARM if they include assembly. Individual makefiles -# are responsible for having their own logic, for fine-grained control. - -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,default-permissions.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,libnfc-nci.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,fstab.postinstall,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,ueventd.rc,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,hals.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,media_profiles_V1_0.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,media_codecs_performance.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,device_state_configuration.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,task_profiles.json,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,p2p_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) -$(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) - -$(eval $(call declare-1p-copy-files,device/google/gs101,audio_policy_configuration.xml)) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 2fdbc7ff..a5e752d7 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -49,6 +49,11 @@ BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y BOARD_KERNEL_CMDLINE += swiotlb=noforce BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs +# Enable KUnit for userdebug and eng builds +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + BOARD_KERNEL_CMDLINE += kunit.enable=1 +endif + TARGET_NO_BOOTLOADER := true TARGET_NO_RADIOIMAGE := true BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img) @@ -185,8 +190,8 @@ BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \ vendor \ vendor_dlkm -# Set error limit to BOARD_SUPER_PARTITON_SIZE - 500MB -BOARD_SUPER_PARTITION_ERROR_LIMIT := 8006926336 +# Set error limit to BOARD_SUPER_PARTITON_SIZE - 400MB +BOARD_SUPER_PARTITION_ERROR_LIMIT := 8111783936 # Testing related defines BOARD_PERFSETUP_SCRIPT := platform_testing/scripts/perf-setup/r4o6-setup.sh @@ -357,9 +362,8 @@ BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.m BOARD_DO_NOT_STRIP_VENDOR_MODULES := true # Prebuilt kernel modules that are *not* listed in vendor_boot.modules.load -BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES = fips140/fips140.ko +BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES = fips140.ko BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k))) -KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA)) # Kernel modules that are listed in vendor_boot.modules.load BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load)) diff --git a/OWNERS b/OWNERS index feed301f..4a2962aa 100644 --- a/OWNERS +++ b/OWNERS @@ -2,4 +2,4 @@ per-file powerhint.json = wvw@google.com,joaodias@google.com,jenhaochen@google.c per-file powerhint.json = wvw@google.com,joaodias@google.com,jenhaochen@google.com,rkganesh@google.com,jychen@google.com # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. -per-file *.mk=file:device/google/gs-common:main:/OWNERS +per-file *.mk=file:device/google/gs-common:main:/MK_OWNERS diff --git a/default-permissions.xml b/default-permissions.xml index fb5ed945..03fdec2d 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -73,6 +73,8 @@ + + com.google.hardware.pixel.display - 10 + 11-12 IDisplay default diff --git a/health/android.hardware.health-service.gs101.xml b/health/android.hardware.health-service.gs101.xml index 1fe9b8d2..2acaabac 100644 --- a/health/android.hardware.health-service.gs101.xml +++ b/health/android.hardware.health-service.gs101.xml @@ -1,7 +1,7 @@ android.hardware.health - 2 + 3 IHealth/default diff --git a/manifest_media.xml b/manifest_media.xml index 329dd2d4..52544290 100644 --- a/manifest_media.xml +++ b/manifest_media.xml @@ -1,22 +1,4 @@ - - android.hardware.media.c2 - hwbinder - 1.0 - - IComponentStore - default1 - - - - android.hardware.media.c2 - hwbinder - 1.2 - - IComponentStore - default - - android.hardware.media.c2 1 diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml index cddd6177..534c5f4a 100644 --- a/media_codecs_aosp_c2.xml +++ b/media_codecs_aosp_c2.xml @@ -100,7 +100,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -218,7 +218,7 @@ - + diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml index 40c81ff1..7dd10432 100644 --- a/media_codecs_bo_c2.xml +++ b/media_codecs_bo_c2.xml @@ -19,7 +19,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml index 49f131f8..04daa356 100644 --- a/media_codecs_performance_c2.xml +++ b/media_codecs_performance_c2.xml @@ -115,20 +115,20 @@ - + - + - + - + - - - - - + + + + + diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index a32fd947..964ebf6f 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -237,8 +237,8 @@ true - - true + + 6291456 20971520 diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index 5b533ceb..d8461466 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -73,11 +73,14 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { "/sys/class/power_supply/maxfg/gmsr", "/sys/class/power_supply/maxfg_base/gmsr", }, - .FGLearningPath = { - "/sys/class/power_supply/maxfg/fg_learning_events" - }, .FGModelLoadingPath = { "/sys/class/power_supply/maxfg/m5_model_state" + }, + .FGLogBufferPath = { + "/dev/logbuffer_maxfg_monitor", + "/dev/logbuffer_max77779fg_monitor", + "/dev/logbuffer_maxfg_base_monitor", + "/dev/logbuffer_maxfg_secondary_monitor" } }; diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index 454d7f89..bba7b86a 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -167,4 +167,10 @@ If equals to 0, it means there's no limit on the max number of channels to include per network.--> 3 + + true + diff --git a/telephony/pktrouter.mk b/telephony/pktrouter.mk index dd923b59..7af34224 100644 --- a/telephony/pktrouter.mk +++ b/telephony/pktrouter.mk @@ -1,3 +1,5 @@ PRODUCT_PACKAGES += wfc-pkt-router PRODUCT_PROPERTY_OVERRIDES += vendor.pktrouter=1 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/telephony/pktrouter +PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ + $(TARGET_COPY_OUT_SYSTEM)/bin/oem-iptables-init.sh