From c74523491125c28b8cc78e75add50cac96c385ee Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sun, 23 Nov 2025 00:26:33 +0200 Subject: [PATCH] gs101: Remove unused flags Change-Id: Iaae480da1806b096b972f67cc994766884842e97 --- BoardConfig-common.mk | 191 ----------------------- aosp_common.mk | 12 -- conf/egl.cfg | 1 - conf/nomodem/Android.bp | 81 ---------- device-common.mk | 2 - device.mk | 225 +--------------------------- manifest_64.xml | 21 --- modem/user.mk | 4 +- pkvm/Android.bp | 31 ---- pkvm/pkvm_enabler.c | 59 -------- pkvm/pkvm_enabler.gs101.rc | 11 -- sepolicy/gs101-sepolicy.mk | 5 - sepolicy/pkvm/file_contexts | 1 - sepolicy/pkvm/vendor_misc_writer.te | 2 - wifi/BoardConfig-wifi.mk | 5 - 15 files changed, 7 insertions(+), 644 deletions(-) delete mode 100644 conf/egl.cfg delete mode 100644 conf/nomodem/Android.bp delete mode 100644 manifest_64.xml delete mode 100644 pkvm/Android.bp delete mode 100644 pkvm/pkvm_enabler.c delete mode 100644 pkvm/pkvm_enabler.gs101.rc delete mode 100644 sepolicy/pkvm/file_contexts delete mode 100644 sepolicy/pkvm/vendor_misc_writer.te diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 2a6e1492..b6278ee7 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -16,29 +16,17 @@ include build/make/target/board/BoardConfigMainlineCommon.mk include build/make/target/board/BoardConfigPixelCommon.mk -# HACK : To fix up after bring up multimedia devices. -TARGET_SOC := gs101 - -TARGET_SOC_NAME := google - -USES_DEVICE_GOOGLE_GS101 := true -$(call soong_config_set,googleDeviceConfig,target_soc,gs101) - TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-2a TARGET_CPU_ABI := arm64-v8a TARGET_CPU_VARIANT := cortex-a55 -DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false) - -ifneq ($(DEVICE_IS_64BIT_ONLY),true) TARGET_2ND_ARCH := arm TARGET_2ND_ARCH_VARIANT := armv8-a TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI2 := armeabi TARGET_2ND_CPU_VARIANT := generic TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a53 -endif BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\" BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on @@ -49,7 +37,6 @@ BOARD_KERNEL_CMDLINE += cgroup.memory=nokmem BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs TARGET_NO_BOOTLOADER := true -TARGET_NO_RADIOIMAGE := true BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img) TARGET_NO_KERNEL := true BOARD_USES_GENERIC_KERNEL_IMAGE := true @@ -90,40 +77,6 @@ ifneq ($(PRODUCT_BUILD_PVMFW_IMAGE),false) AB_OTA_PARTITIONS += pvmfw endif -# EMULATOR common modules -BOARD_EMULATOR_COMMON_MODULES := liblight - -OVERRIDE_RS_DRIVER := libRSDriverArm.so -BOARD_EGL_CFG := device/google/gs101/conf/egl.cfg -#BOARD_USES_HGL := true -USE_OPENGL_RENDERER := true -NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 -BOARD_USES_EXYNOS5_COMMON_GRALLOC := true -BOARD_USES_ALIGN_RESTRICTION := false -BOARD_USES_GRALLOC_ION_SYNC := true - -# This should be the same value as USE_SWIFTSHADER in device.mk -BOARD_USES_SWIFTSHADER := false - -# Gralloc4 -ifeq ($(BOARD_USES_SWIFTSHADER),true) -$(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,true) -$(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_basic,false) -$(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_wideblk,false) -$(call soong_config_set,arm_gralloc,gralloc_init_afbc,false) -$(call soong_config_set,arm_gralloc,dpu_support_1010102_afbc,false) -else -$(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,false) -$(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_basic,true) -$(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_wideblk,true) -$(call soong_config_set,arm_gralloc,gralloc_init_afbc,true) -$(call soong_config_set,arm_gralloc,dpu_support_1010102_afbc,true) -endif # ifeq ($(BOARD_USES_SWIFTSHADER),true) -$(call soong_config_set,arm_gralloc,gralloc_ion_sync_on_lock,$(BOARD_USES_GRALLOC_ION_SYNC)) - -# Graphics -#BOARD_USES_EXYNOS_DATASPACE_FEATURE := true - # Enable chain partition for system. BOARD_AVB_VBMETA_SYSTEM := system system_ext product BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem @@ -146,7 +99,6 @@ TARGET_USERIMAGES_USE_F2FS := true BOARD_USERDATAIMAGE_PARTITION_SIZE := 11796480000 PRODUCT_FS_COMPRESSION := 1 BOARD_FLASH_BLOCK_SIZE := 4096 -BOARD_MOUNT_SDCARD_RW := true # product.img BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 @@ -156,30 +108,6 @@ TARGET_COPY_OUT_PRODUCT := product BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_SYSTEM_EXT := system_ext -######################## -# Video Codec -######################## -# 1. Exynos C2 -BOARD_USE_CODEC2_HIDL_1_2 := true -BOARD_USE_CSC_FILTER := false -BOARD_USE_DEC_SW_CSC := true -BOARD_USE_ENC_SW_CSC := true -BOARD_SUPPORT_MFC_ENC_RGB := true -BOARD_USE_BLOB_ALLOCATOR := false -BOARD_SUPPORT_MFC_ENC_BT2020 := true -BOARD_SUPPORT_FLEXIBLE_P010 := true -$(call soong_config_set,video_codec,target_soc_name,$(TARGET_SOC_NAME)) -$(call soong_config_set_bool,video_codec,board_use_codec2_hidl_1_2,$(BOARD_USE_CODEC2_HIDL_1_2)) -$(call soong_config_set_bool,video_codec,board_use_csc_filter,$(BOARD_USE_CSC_FILTER)) -$(call soong_config_set_bool,video_codec,board_use_dec_sw_csc,$(BOARD_USE_DEC_SW_CSC)) -$(call soong_config_set_bool,video_codec,board_use_enc_sw_csc,$(BOARD_USE_ENC_SW_CSC)) -$(call soong_config_set_bool,video_codec,board_support_mfc_enc_rgb,$(BOARD_SUPPORT_MFC_ENC_RGB)) -$(call soong_config_set_bool,video_codec,board_use_blob_allocator,$(BOARD_USE_BLOB_ALLOCATOR)) -$(call soong_config_set_bool,video_codec,board_support_mfc_enc_bt2020,$(BOARD_SUPPORT_MFC_ENC_BT2020)) -$(call soong_config_set_bool,video_codec,board_support_flexible_p010,$(BOARD_SUPPORT_FLEXIBLE_P010)) -$(call soong_config_set_bool,video_codec,board_use_codec2_aidl,$(if $(BOARD_USE_CODEC2_AIDL),true,false)) -######################## - BOARD_SUPER_PARTITION_SIZE := 8531214336 BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions # Set size to BOARD_SUPER_PARTITION_SIZE - overhead (4MiB) (b/182237294) @@ -194,139 +122,23 @@ BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \ # Set error limit to BOARD_SUPER_PARTITON_SIZE - 400MB BOARD_SUPER_PARTITION_ERROR_LIMIT := 8111783936 -# -# AUDIO & VOICE -# -BOARD_USES_GENERIC_AUDIO := true - -$(call soong_config_set,aoc_audio_func,ext_hidl,true) - -ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) -$(call soong_config_set,aoc_audio_func,aosp_build,true) -endif - -$(call soong_config_set,haptics,actuator_model,$(ACTUATOR_MODEL)) - -# Primary AudioHAL Configuration -#BOARD_USE_COMMON_AUDIOHAL := true -#BOARD_USE_CALLIOPE_AUDIOHAL := false -#BOARD_USE_AUDIOHAL := true - -# Compress Offload Configuration -#BOARD_USE_OFFLOAD_AUDIO := true -#BOARD_USE_OFFLOAD_EFFECT := false - -# SoundTriggerHAL Configuration -#BOARD_USE_SOUNDTRIGGER_HAL := false - -# Vibrator HAL actuator model and adaptive haptics configuration -$(call soong_config_set,haptics,actuator_model,$(ACTUATOR_MODEL)) -$(call soong_config_set,haptics,adaptive_haptics_feature,$(ADAPTIVE_HAPTICS_FEATURE)) - -# HWComposer -BOARD_HWC_VERSION := libhwc2.1 -TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK := false -BOARD_HDMI_INCAPABLE := true -TARGET_USES_HWC2 := true -HWC_SUPPORT_RENDER_INTENT := true -HWC_SUPPORT_COLOR_TRANSFORM := true -#BOARD_USES_DISPLAYPORT := true -# if AFBC is enabled, must set ro.vendor.ddk.set.afbc=1 -BOARD_USES_EXYNOS_AFBC_FEATURE := true -#BOARD_USES_HDRUI_GLES_CONVERSION := true - -BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_gs101 -BOARD_LIBACRYL_G2D_HDR_PLUGIN := libacryl_hdr_plugin -$(call soong_config_set,acryl,libacryl_g2d_hdr_plugin,//hardware/google/graphics/gs101/libacryl_plugins:libacryl_hdr_plugin) -$(call soong_config_set,acryl,libacryl_c_include,hardware/google/graphics/$(TARGET_BOARD_PLATFORM)/libcap) - -# HWCServices -BOARD_USES_HWC_SERVICES := true - -# WiFiDisplay -# BOARD_USES_VIRTUAL_DISPLAY := true -# BOARD_USES_VDS_EXYNOS_HWC := true -# BOARD_USES_WIFI_DISPLAY:= true -# BOARD_USES_EGL_SURFACE_FOR_COMPOSITION_MIXED := true -# BOARD_USES_VDS_YUV420SPM := true -# BOARD_USES_VDS_OTHERFORMAT := true -# BOARD_USES_VDS_DEBUG_FLAG := true -# BOARD_USES_DISABLE_COMPOSITIONTYPE_GLES := true -# BOARD_USES_SECURE_ENCODER_ONLY := true -# BOARD_USES_TSMUX := true - -# SCALER -BOARD_USES_DEFAULT_CSC_HW_SCALER := true -BOARD_DEFAULT_CSC_HW_SCALER := 4 -BOARD_USES_SCALER_M2M1SHOT := true - # Device Tree -BOARD_USES_DT := true BOARD_INCLUDE_DTB_IN_BOOTIMG := true BOARD_PREBUILT_DTBIMAGE_DIR := $(TARGET_KERNEL_DIR) BOARD_PREBUILT_DTBOIMAGE := $(BOARD_PREBUILT_DTBIMAGE_DIR)/dtbo.img -# PLATFORM LOG -TARGET_USES_LOGD := true - -# LIBHWJPEG -#TARGET_USES_UNIVERSAL_LIBHWJPEG := true -#LIBHWJPEG_HWSCALER_ID := 0 - -#Keymaster -#BOARD_USES_KEYMASTER_VER1 := true - -#FMP -#BOARD_USES_FMP_DM_CRYPT := true -#BOARD_USES_FMP_FSCRYPTO := true BOARD_USES_METADATA_PARTITION := true -# SKIA -#BOARD_USES_SKIA_MULTITHREADING := true -#BOARD_USES_FIMGAPI_V5X := true - -# SECCOMP Policy -BOARD_SECCOMP_POLICY = device/google/gs101/seccomp_policy - -#CURL -BOARD_USES_CURL := true - -# Sensor HAL -BOARD_USES_EXYNOS_SENSORS_DUMMY := true - -# VISION -# Exynos vision framework (EVF) -#TARGET_USES_EVF := true -# HW acceleration -#TARGET_USES_VPU_KERNEL := true -#TARGET_USES_SCORE_KERNEL := true -#TARGET_USES_CL_KERNEL := false - # exynos RIL -TARGET_EXYNOS_RIL_SOURCE := true ENABLE_VENDOR_RIL_SERVICE := true -# GNSS -# BOARD_USES_EXYNOS_GNSS_DUMMY := true - # Bluetooth defines # TODO(b/123695868): Remove the need for this BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := \ build/make/target/board/mainline_arm64/bluetooth -#VNDK -BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true -BOARD_VNDK_VERSION := current - -# H/W align restriction of MM IPs -BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64 - # Boot.img BOARD_RAMDISK_USE_LZ4 := true -#BOARD_KERNEL_BASE := 0x80000000 -#BOARD_KERNEL_PAGESIZE := 2048 -#BOARD_KERNEL_OFFSET := 0x80000 -#BOARD_RAMDISK_OFFSET := 0x4000000 BOARD_BOOT_HEADER_VERSION := 4 BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) @@ -380,9 +192,6 @@ $(error vendor_dlkm.modules.load not found or empty) endif BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES) -# Using BUILD_COPY_HEADERS -BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true - include device/google/gs101/sepolicy/gs101-sepolicy.mk # Battery options diff --git a/aosp_common.mk b/aosp_common.mk index 4c2d61b2..7580220c 100644 --- a/aosp_common.mk +++ b/aosp_common.mk @@ -17,14 +17,7 @@ # # All components inherited here go to system image # -DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false) - -ifeq ($(DEVICE_IS_64BIT_ONLY),true) -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) -else $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -endif - $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) # Enable CSI checking @@ -47,8 +40,3 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # TODO(b/136525499): move *_vendor.mk into the vendor makefile later $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) - -#$(call inherit-product, device/google/gs101/device.mk) - -# TODO: fix -# PRODUCT_RESTRICT_VENDOR_FILES := all diff --git a/conf/egl.cfg b/conf/egl.cfg deleted file mode 100644 index 4515dfd6..00000000 --- a/conf/egl.cfg +++ /dev/null @@ -1 +0,0 @@ -0 1 mali diff --git a/conf/nomodem/Android.bp b/conf/nomodem/Android.bp deleted file mode 100644 index 1b1ae24e..00000000 --- a/conf/nomodem/Android.bp +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) 2021 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. - */ - -// By default this device uses hardware-wrapped keys for storage encryption, -// which is intended to offer increased security over the traditional method -// (software keys). However, hardware-wrapped keys aren't compatible with -// FIPS-140 certification of the encryption hardware, and hence we have to -// disable the use of them in FIPS mode. This requires having two fstab files: -// one for the default mode, and one for FIPS mode selectable via -// androidboot.fstab_suffix on the kernel command line. These fstabs should be -// identical with the exception of the encryption settings, so to keep them in -// sync the rules below generate them from a template file. - -soong_namespace { - imports: [ - "device/google/gs101", - "device/google/gs101/conf", - ], -} - -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "device_google_gs101_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["device_google_gs101_license"], -} - -genrule { - name: "gen_fstab.gs101", - srcs: [ - "fstab.gs101.in*", - ":gs101_srcs", - ], - out: ["fstab.gs101"], - cmd: "sed -e s/@fileencryption@/::inlinecrypt_optimized+wrappedkey_v0/" + - " -e s/@metadata_encryption@/:wrappedkey_v0/" + - " -e /modem/d " + - " -e /efs/d $(in) > $(out)", -} - -genrule { - name: "gen_fstab.gs101-fips", - srcs: [ - "fstab.gs101.in*", - ":gs101_srcs", - ], - out: ["fstab.gs101-fips"], - cmd: "sed -e s/@fileencryption@/aes-256-xts/" + - " -e s/@metadata_encryption@/aes-256-xts/" + - " -e /modem/d " + - " -e /efs/d $(in) > $(out)", -} - -prebuilt_etc { - name: "fstab.gs101", - src: ":gen_fstab.gs101", - vendor: true, - vendor_ramdisk_available: true, -} - -prebuilt_etc { - name: "fstab.gs101-fips", - src: ":gen_fstab.gs101-fips", - vendor: true, - vendor_ramdisk_available: true, -} \ No newline at end of file diff --git a/device-common.mk b/device-common.mk index 623f0299..1e7a0051 100644 --- a/device-common.mk +++ b/device-common.mk @@ -16,11 +16,9 @@ include device/google/gs101/device.mk -ifneq ($(BOARD_WITHOUT_RADIO),true) # Telephony PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.telephony.carrierlock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.carrierlock.xml -endif # Android Verified Boot PRODUCT_COPY_FILES += \ diff --git a/device.mk b/device.mk index 16410bc2..01bccc3f 100644 --- a/device.mk +++ b/device.mk @@ -42,11 +42,6 @@ include device/google/gs-common/fingerprint/fingerprint.mk include device/google/gs-common/nfc/nfc.mk TARGET_BOARD_PLATFORM := gs101 -DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false) - -ifeq ($(DEVICE_IS_64BIT_ONLY),true) -LOCAL_64ONLY := _64 -endif AB_OTA_POSTINSTALL_CONFIG += \ RUN_POSTINSTALL_system=true \ @@ -78,8 +73,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.telephony.default_network=27 \ persist.vendor.ril.db_ecc.use.iccid_to_plmn=1 \ persist.vendor.ril.db_ecc.id.type=5 - #rild.libpath=/system/lib64/libsec-ril.so \ - #rild.libargs=-d /dev/umts_ipc0 # SIT-RIL Logging setting PRODUCT_PROPERTY_OVERRIDES += \ @@ -131,38 +124,11 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PROPERTY_OVERRIDES += \ telephony.active_modems.max_count=2 -USE_LASSEN_OEMHOOK := true -# The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when -# $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true. -ifneq ($(BOARD_WITHOUT_RADIO),true) - $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true) -endif - -# Use for GRIL -USES_LASSEN_MODEM := true -$(call soong_config_set, vendor_ril_google_feature, use_lassen_modem, true) - -ifeq ($(USES_GOOGLE_DIALER_CARRIER_SETTINGS),true) -USE_GOOGLE_DIALER := true -USE_GOOGLE_CARRIER_SETTINGS := true -endif - -# Audio client implementation for RIL -USES_GAUDIO := true - -# ###################### -# GRAPHICS - GPU (begin) - -# Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk -USE_SWIFTSHADER := false - # HWUI TARGET_USES_VULKAN = true -# Used in gfx_tools when defining tests with composer2 interface for gs101 devices -$(call soong_config_set,gfx_tools,use_hwc2,true) - include device/google/gs-common/gpu/gpu.mk + PRODUCT_PACKAGES += \ libGLES_mali \ vulkan.mali \ @@ -173,12 +139,9 @@ PRODUCT_SOONG_NAMESPACES += external/OpenCL-ICD-Loader PRODUCT_PACKAGES += \ libOpenCL \ mali_icd__customer_pixel_opencl-icd_ARM.icd -ifeq ($(DEVICE_IS_64BIT_ONLY),false) -PRODUCT_PACKAGES += \ - mali_icd__customer_pixel_opencl-icd_ARM32.icd -endif PRODUCT_VENDOR_PROPERTIES += \ + ro.hardware.egl=mali \ ro.hardware.vulkan=mali PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ @@ -192,13 +155,6 @@ PRODUCT_VENDOR_PROPERTIES += \ vendor.mali.base_protected_tls_max=67108864 \ vendor.mali.platform_agt_frequency_khz=24576 -ifeq ($(USE_SWIFTSHADER),true) -PRODUCT_PACKAGES += \ - libGLESv1_CM_swiftshader \ - libEGL_swiftshader \ - libGLESv2_swiftshader -endif - 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.vulkan.version-1_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \ @@ -207,14 +163,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.vulkan.deqp.level-2025-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ frameworks/native/data/etc/android.software.opengles.deqp.level-2025-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml -ifeq ($(USE_SWIFTSHADER),true) -PRODUCT_VENDOR_PROPERTIES += \ - ro.hardware.egl = swiftshader -else -PRODUCT_VENDOR_PROPERTIES += \ - ro.hardware.egl = mali -endif - # Configure EGL blobcache PRODUCT_VENDOR_PROPERTIES += \ ro.egl.blobcache.multifile=true \ @@ -227,14 +175,10 @@ PRODUCT_VENDOR_PROPERTIES += \ # b/295257834 Add HDR shaders to SurfaceFlinger's pre-warming cache PRODUCT_VENDOR_PROPERTIES += ro.surface_flinger.prime_shader_cache.ultrahdr=1 -# GRAPHICS - GPU (end) -# #################### - # Device Manifest, Device Compatibility Matrix for Treble DEVICE_MANIFEST_FILE := \ - device/google/gs101/manifest$(LOCAL_64ONLY).xml + device/google/gs101/manifest.xml -BOARD_USE_CODEC2_AIDL := V1 ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) DEVICE_MANIFEST_FILE += \ device/google/gs101/manifest_media_aosp.xml @@ -267,23 +211,14 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.gs101.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.rc -ifneq (,$(filter 5.%, $(TARGET_LINUX_KERNEL_VERSION))) -PRODUCT_COPY_FILES += \ - device/google/gs101/storage/5.10/init.gs101.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.storage.rc -else PRODUCT_COPY_FILES += \ device/google/gs101/storage/6.1/init.gs101.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.storage.rc -endif # Recovery files PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.gs101.rc -ifneq ($(BOARD_WITHOUT_RADIO),true) PRODUCT_SOONG_NAMESPACES += device/google/gs101/conf -else -PRODUCT_SOONG_NAMESPACES += device/google/gs101/conf/nomodem -endif # Fstab files PRODUCT_PACKAGES += \ @@ -355,24 +290,11 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PACKAGES += \ tlrpmb -# Touch firmware -#PRODUCT_COPY_FILES += \ - device/google/gs101/firmware/touch/s6sy761.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/s6sy761.fw # Touch PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml # Sensors -ifneq (,$(findstring tangor, $(TARGET_PRODUCT))) -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \ - frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.compass.xml \ - frameworks/native/data/etc/android.hardware.sensor.dynamic.head_tracker.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.dynamic.head_tracker.xml \ - frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.gyroscope.xml \ - frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml\ - frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepcounter.xml \ - frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepdetector.xml -else PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \ frameworks/native/data/etc/android.hardware.sensor.barometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.barometer.xml \ @@ -384,7 +306,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.proximity.xml \ frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepcounter.xml \ frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepdetector.xml -endif # Add sensor HAL AIDL product packages PRODUCT_PACKAGES += android.hardware.sensors-service.multihal @@ -420,37 +341,11 @@ PRODUCT_PACKAGES += \ # Audio HALs # -# Audio Configurations -USE_LEGACY_LOCAL_AUDIO_HAL := false -USE_XML_AUDIO_POLICY_CONF := 1 - # Enable AAudio MMAP/NOIRQ data path. PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_policy=2 PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_exclusive_policy=2 PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000 -# Calliope firmware overwrite -#PRODUCT_COPY_FILES += \ - device/google/gs101/firmware/calliope_dram.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_dram.bin \ - device/google/gs101/firmware/calliope_sram.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_sram.bin \ - device/google/gs101/firmware/calliope_dram_2.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_dram_2.bin \ - device/google/gs101/firmware/calliope_sram_2.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_sram_2.bin \ - device/google/gs101/firmware/calliope2.dt:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope2.dt \ - -# Cannot reference variables defined in BoardConfig.mk, uncomment this if -# BOARD_USE_OFFLOAD_AUDIO and BOARD_USE_OFFLOAD_EFFECT are true -## AudioEffectHAL library -#PRODUCT_PACKAGES += \ -# libexynospostprocbundle - -# Cannot reference variables defined in BoardConfig.mk, uncomment this if -# BOARD_USE_SOUNDTRIGGER_HAL is true -#PRODUCT_PACKAGES += \ -# sound_trigger.primary.maran9820 - -# A-Box Service Daemon -#PRODUCT_PACKAGES += main_abox - # Libs PRODUCT_PACKAGES += \ com.android.future.usb.accessory @@ -474,8 +369,6 @@ PRODUCT_PACKAGES += \ # Lyric Camera HAL settings include device/google/gs-common/camera/lyric.mk -$(call soong_config_set,lyric,soc,gs101) -$(call soong_config_set,google3a_config,soc,gs101) # WiFi PRODUCT_PACKAGES += \ @@ -512,19 +405,7 @@ PRODUCT_VENDOR_PROPERTIES += sys.usb.ffs.io_uring_enabled=true $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk) # Titan-M -ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS))) include device/google/gs-common/dauntless/gsc.mk -else -# include dauntless sepolicy to avoid compile error on devices without dauntless -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/dauntless/sepolicy -endif - -# Copy Camera HFD Setfiles -#PRODUCT_COPY_FILES += \ - device/google/gs101/firmware/camera/libhfd/default_configuration.hfd.cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/default_configuration.hfd.cfg.json \ - device/google/gs101/firmware/camera/libhfd/pp_cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/pp_cfg.json \ - device/google/gs101/firmware/camera/libhfd/tracker_cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/tracker_cfg.json \ - device/google/gs101/firmware/camera/libhfd/WithLightFixNoBN.SDNNmodel:$(TARGET_COPY_OUT_VENDOR)/firmware/WithLightFixNoBN.SDNNmodel PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \ @@ -535,14 +416,8 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \ frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml -# (See b/211840489) -ifneq ($(DISABLE_CAMERA_FS_AF),true) PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml -else -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.camera.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.xml -endif PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \ @@ -550,14 +425,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml\ frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml\ -#PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ - frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \ - frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \ - frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.passpoint.xml \ - frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \ - frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml \ - PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \ frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml \ @@ -570,7 +437,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ debug.hwc.winupdate=1 # hw composer HAL -$(call soong_config_set,google_displaycolor,displaycolor_platform,gs101) PRODUCT_PACKAGES += \ libdisplaycolor \ hwcomposer.$(TARGET_BOARD_PLATFORM) @@ -619,12 +485,6 @@ PRODUCT_COPY_FILES += \ # limit DPP downscale ratio PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.hwc.dpp.downscale=2 -# Cannot reference variables defined in BoardConfig.mk, uncomment this if -# BOARD_USES_EXYNOS_DSS_FEATURE is true -## set the dss enable status setup -#PRODUCT_PROPERTY_OVERRIDES += \ -# ro.exynos.dss=1 - # Cannot reference variables defined in BoardConfig.mk, uncomment this if # BOARD_USES_EXYNOS_AFBC_FEATURE is true # set the dss enable status setup @@ -648,12 +508,6 @@ PRODUCT_PACKAGES += wpa_supplicant.conf WIFI_PRIV_CMD_UPDATE_MBO_CELL_STATUS := enabled -#################################### -## VIDEO -#################################### - -$(call soong_config_set,bigo,soc,gs101) - # 1. Codec 2.0 # for settings used by different C2 hal include device/google/gs-common/mediacodec/common/mediacodec_common.mk @@ -669,13 +523,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ debug.stagefright.ccodec_delayed_params=1 \ ro.vendor.gpu.dataspace=1 -ifneq ($(BOARD_USE_CODEC2_AIDL), ) PRODUCT_PROPERTY_OVERRIDES += \ debug.stagefright.c2-poolmask=1507328 -else -PRODUCT_PROPERTY_OVERRIDES += \ - debug.stagefright.c2-poolmask=458752 -endif # Create input surface on the framework side PRODUCT_PROPERTY_OVERRIDES += \ @@ -687,15 +536,6 @@ PRODUCT_PROPERTY_OVERRIDES += media.c2.hal.selection=aidl PRODUCT_COPY_FILES += \ device/google/gs101/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ device/google/gs101/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml -#################################### - -# Telephony -#PRODUCT_COPY_FILES += \ - frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml - -# CBD (CP booting deamon) -CBD_USE_V2 := true -CBD_PROTOCOL_SIT := true # setup dalvik vm configs. $(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk) @@ -706,20 +546,14 @@ PRODUCT_TAGS += dalvik.gc.type-precise PRODUCT_PACKAGES += \ libexynosvision -ifeq ($(TARGET_USES_CL_KERNEL),true) -PRODUCT_PACKAGES += \ - libopenvx-opencl -endif - # Location -ifeq (,$(filter tangor citron,$(subst _, ,$(TARGET_PRODUCT)))) include device/google/gs-common/gps/brcm/device.mk PRODUCT_COPY_FILES += \ device/google/gs101/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer PRODUCT_COPY_FILES += \ device/google/gs101/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ device/google/gs101/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf -endif + # Trusty (KM, GK, Storage) $(call inherit-product, system/core/trusty/trusty-storage.mk) $(call inherit-product, system/core/trusty/trusty-base.mk) @@ -781,39 +615,11 @@ PRODUCT_PACKAGES += \ libstagefright_hdcp \ libskia_opt -#PRODUCT_PACKAGES += \ - mfc_fw.bin \ - calliope_sram.bin \ - calliope_dram.bin \ - calliope_iva.bin \ - vts.bin - -ifneq ($(BOARD_WITHOUT_RADIO),true) PRODUCT_PACKAGES += ShannonIms PRODUCT_PACKAGES += ShannonRcs -endif - -# Exynos RIL and telephony -# Multi SIM(DSDS) -SIM_COUNT := 2 -$(call soong_config_set,sim,sim_count,$(SIM_COUNT)) -SUPPORT_MULTI_SIM := true -# Support NR -SUPPORT_NR := true -# Using IRadio 1.6 -USE_RADIO_HAL_1_6 := true -# Support SecureElement HAL for HIDL -USE_SE_HIDL := true - -ifeq ($(DEVICE_IS_64BIT_ONLY),true) -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) -else -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -endif include device/google/gs-common/sensors/sensors.mk -$(call soong_config_set,usf,target_soc,gs101) PRODUCT_COPY_FILES += \ device/google/gs101/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \ @@ -850,16 +656,9 @@ PRODUCT_PACKAGES += \ android.hardware.health-service.gs101 \ android.hardware.health-service.gs101_recovery \ -# Audio # Audio HAL Server & Default Implementations include device/google/gs-common/audio/hidl_gs101.mk -## AoC soong -$(call soong_config_set,aoc,target_soc,$(TARGET_BOARD_PLATFORM)) -$(call soong_config_set,aoc,target_product,$(TARGET_PRODUCT)) - -$(call soong_config_set,android_hardware_audio,run_64bit,true) - # Audio properties PRODUCT_PROPERTY_OVERRIDES += \ ro.config.vc_call_vol_steps=7 \ @@ -867,10 +666,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.monitorRotation = true \ ro.audio.offload_wakelock=false -# declare use of spatial audio -# PRODUCT_PROPERTY_OVERRIDES += \ -# ro.audio.spatializer_enabled=true - # vndservicemanager and vndservice no longer included in API 30+, however needed by vendor code. # See b/148807371 for reference PRODUCT_PACKAGES += vndservicemanager @@ -893,8 +688,6 @@ PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true # EdgeTPU include device/google/gs-common/edgetpu/edgetpu.mk -# Config variables for TPU chip on device. -$(call soong_config_set,edgetpu_config,chip,abrolhos) # TPU firmware PRODUCT_PACKAGES += edgetpu-abrolhos.fw @@ -914,12 +707,8 @@ PRODUCT_PACKAGES += \ # pKVM $(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk) PRODUCT_BUILD_PVMFW_IMAGE := true -ifeq ($(TARGET_PKVM_ENABLED),true) - PRODUCT_PACKAGES += pkvm_enabler -else - PRODUCT_COPY_FILES += \ - device/google/gs101/pkvm/pkvm_experiment.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pkvm_experiment.rc -endif +PRODUCT_COPY_FILES += \ + device/google/gs101/pkvm/pkvm_experiment.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pkvm_experiment.rc # Enable watchdog timeout loop breaker. PRODUCT_PROPERTY_OVERRIDES += \ @@ -947,10 +736,8 @@ include hardware/google/pixel/common/pixel-common-device.mk # Pixel Logger include hardware/google/pixel/PixelLogger/PixelLogger.mk -ifneq ($(BOARD_WITHOUT_RADIO),true) # Telephony include device/google/gs101/telephony/user.mk -endif # Wifi ext include hardware/google/pixel/wifi_ext/device.mk diff --git a/manifest_64.xml b/manifest_64.xml deleted file mode 100644 index 73d3d924..00000000 --- a/manifest_64.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - android.hardware.graphics.composer - hwbinder - 2.4 - - IComposer - default - - - - android.hardware.boot - IBootControl/default - - - android.hardware.neuralnetworks - hwbinder - @1.3::IDevice/google-edgetpu - - - diff --git a/modem/user.mk b/modem/user.mk index da740610..c30558d0 100644 --- a/modem/user.mk +++ b/modem/user.mk @@ -1,4 +1,2 @@ -ifneq ($(BOARD_WITHOUT_RADIO),true) - PRODUCT_PACKAGES += dmd -endif +PRODUCT_PACKAGES += dmd BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/modem/user diff --git a/pkvm/Android.bp b/pkvm/Android.bp deleted file mode 100644 index dba96019..00000000 --- a/pkvm/Android.bp +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2021 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 { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: [ - "//device/google/gs101:device_google_gs101_license", - ], -} - -cc_binary { - name: "pkvm_enabler", - vendor: true, - init_rc: ["pkvm_enabler.gs101.rc"], - srcs: ["pkvm_enabler.c"], - shared_libs: ["liblog"], -} diff --git a/pkvm/pkvm_enabler.c b/pkvm/pkvm_enabler.c deleted file mode 100644 index b927318c..00000000 --- a/pkvm/pkvm_enabler.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2021 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. - */ - -#define LOG_TAG "pkvm_enabler" - -#include -#include -#include -#include -#include - -#include - -#define MISC_WRITER "/vendor/bin/misc_writer" - -int main() { - char *newargv[] = { MISC_WRITER, "--set-enable-pkvm", NULL }; - char *newenvp[] = { NULL }; - pid_t pid; - int ret, wstatus; - - /* Run misc_writer and return FAILURE to force a reboot. */ - pid = fork(); - if (pid == -1) { - ALOGE("Could not fork: %d", errno); - exit(EXIT_FAILURE); - } - - if (pid == 0) { - execve(MISC_WRITER, newargv, newenvp); - ALOGE("Could not execute " MISC_WRITER ": %d", errno); - _exit(EXIT_FAILURE); - } - - waitpid(pid, &wstatus, 0); - if (WIFEXITED(wstatus)) { - ret = WEXITSTATUS(wstatus); - if (ret) { - ALOGE(MISC_WRITER " exit status: %d", ret); - } - } else { - ALOGE(MISC_WRITER " terminated unexpectedly: %d", wstatus); - } - - exit(EXIT_FAILURE); -} diff --git a/pkvm/pkvm_enabler.gs101.rc b/pkvm/pkvm_enabler.gs101.rc deleted file mode 100644 index 4e64d4ba..00000000 --- a/pkvm/pkvm_enabler.gs101.rc +++ /dev/null @@ -1,11 +0,0 @@ -service pkvm_enabler /vendor/bin/pkvm_enabler - reboot_on_failure reboot,pkvm-not-enabled - user root - -# Old bootloaders do not set the protected_vm sysprop when pkvm is disabled -on early-init && property:ro.boot.hypervisor.protected_vm.supported= - exec_start pkvm_enabler - -# New bootloaders set the protected_vm sysprop to 0 when pkvm is disabled -on early-init && property:ro.boot.hypervisor.protected_vm.supported=0 - exec_start pkvm_enabler diff --git a/sepolicy/gs101-sepolicy.mk b/sepolicy/gs101-sepolicy.mk index a6947844..2db38f11 100644 --- a/sepolicy/gs101-sepolicy.mk +++ b/sepolicy/gs101-sepolicy.mk @@ -32,10 +32,5 @@ BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/powerstats # Public PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/gs101/sepolicy/public -# pKVM -ifeq ($(TARGET_PKVM_ENABLED),true) -BOARD_SEPOLICY_DIRS += device/google/gs101/sepolicy/pkvm -endif - # Health HAL BOARD_SEPOLICY_DIRS += device/google/gs101/sepolicy/health diff --git a/sepolicy/pkvm/file_contexts b/sepolicy/pkvm/file_contexts deleted file mode 100644 index 310aad4d..00000000 --- a/sepolicy/pkvm/file_contexts +++ /dev/null @@ -1 +0,0 @@ -/vendor/bin/pkvm_enabler u:object_r:vendor_misc_writer_exec:s0 diff --git a/sepolicy/pkvm/vendor_misc_writer.te b/sepolicy/pkvm/vendor_misc_writer.te deleted file mode 100644 index b9b4ceb1..00000000 --- a/sepolicy/pkvm/vendor_misc_writer.te +++ /dev/null @@ -1,2 +0,0 @@ -# Allow pkvm_enabler to execute misc_writer. -allow vendor_misc_writer vendor_misc_writer_exec:file execute_no_trans; diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk index 49245203..dac1e5fd 100644 --- a/wifi/BoardConfig-wifi.mk +++ b/wifi/BoardConfig-wifi.mk @@ -24,14 +24,9 @@ BOARD_HOSTAPD_DRIVER := NL80211 # Wifi interface combination - {1 STA + 1 AP} or {1 STA + 1 AP_BRIDGED} or {1 STA + 1 P2P} # or {1 STA + 1 NAN} or {2 STA} WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{P2P, NAN, AP, AP_BRIDGED}, 1}}, {{{STA}, 2}} -WIFI_FEATURE_WIFI_EXT_HAL := true -WIFI_FEATURE_IMU_DETECTION := true # Avoid Wifi reset on MAC Address change WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true WIFI_FEATURE_HOSTAPD_11AX := true BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true WIFI_BRCM_OPEN_SOURCE_MULTI_AKM := enabled - -# Add WIFI_FEATURE_IMU_DETECTION to soong_config -$(call soong_config_set,wifi,feature_imu_detection,$(WIFI_FEATURE_IMU_DETECTION))