redfin: Fix gapps selection based on WITH_GMS flag

Fix an issue where some packages are not properly configured due to
WITH_GMS environment variable not being explicitly set.

aosp_redfin.mk

@@ -58,9 +58,6 @@ ifneq ($(PRODUCT_VENDOR_FREEZE_SYSTEM_BUILD),true)
 endif
 endif
 
-# Don't build super.img.
-PRODUCT_BUILD_SUPER_PARTITION := false
-
 # b/113232673 STOPSHIP deal with Qualcomm stuff later
 # PRODUCT_RESTRICT_VENDOR_FILES := all
 

device-redfin.mk

@@ -24,8 +24,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/launch_with_ven
 LOCAL_PATH := device/google/redfin
 
 PRODUCT_SOONG_NAMESPACES += \
-    device/google/redfin \
-    hardware/qcom/wlan/legacy
+    device/google/redfin
 
 DEVICE_PACKAGE_OVERLAYS += device/google/redfin/redfin/overlay
 
@@ -61,12 +60,6 @@ PRODUCT_COPY_FILES += \
      $(LOCAL_PATH)/audio/acdbdata/Headset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Headset_cal.acdb \
      $(LOCAL_PATH)/audio/acdbdata/Speaker_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Speaker_cal.acdb \
      $(LOCAL_PATH)/audio/acdbdata/adsp_avs_config.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/adsp_avs_config.acdb
-
-# Audio ACDB workspace files for QACT
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_COPY_FILES += \
-     $(LOCAL_PATH)/audio/acdbdata/workspaceFile.qwsp:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/workspaceFile.qwsp
-endif
 endif
 
 # CS35L41 B0 SPEAKER AMP
@@ -96,10 +89,6 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/cs35l41/B2/cs35l41-revB2-dsp1-spk-prot.wmfw:$(TARGET_COPY_OUT_VENDOR)/firmware/cs35l41-revB2-dsp1-spk-prot.wmfw \
     $(LOCAL_PATH)/audio/cs35l41/B2/R-cs35l41-revB2-dsp1-spk-prot.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/R-cs35l41-revB2-dsp1-spk-prot.bin
 
-# Audio CS35L41 speaker calibration tool
-PRODUCT_PACKAGES_DEBUG += \
-    crus_sp_cal
-
 # Audio audiozoom config data
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/audiozoom.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audiozoom.xml
@@ -161,12 +150,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/thermal_info_config_$(PRODUCT_HARDWARE).json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json
 
-# Support to disable thermal protection at run time
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-    PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_PLATFORM).wlc.rc
-endif
-
 # GPS ANTENNA_INFO configuration file
 #PRODUCT_COPY_FILES += \
 #    $(LOCAL_PATH)/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf

evolution.dependencies

@@ -0,0 +1,21 @@
+[
+  {
+    "repository": "device_google_gs-common",
+    "target_path": "device/google/gs-common"
+  },
+  {
+    "repository": "device_google_redbull",
+    "target_path": "device/google/redbull",
+    "branch": "bka"
+  },
+  {
+    "repository": "apelete/proprietary_vendor_google_redfin",
+    "target_path": "vendor/google/redfin",
+    "remote" : "github-non-los",
+    "branch": "lineage-23.0"
+  },
+  {
+    "repository": "kernel_google_redbull",
+    "target_path": "kernel/google/redbull"
+  }
+]

init.hardware.wlc.rc.userdebug

@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2018 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.
-#
-
-on property:sys.boot_completed=1 && property:persist.vendor.limit.wlc.current=1
-    write /sys/class/power_supply/dc/current_max 75000
-
-on property:sys.boot_completed=1 && property:persist.vendor.limit.wlc.current=0
-    write /sys/class/power_supply/dc/current_max 1100000
-
-on property:vendor.disable.wlc=1
-    write /sys/class/power_supply/wireless/online 0

lineage.dependencies

@@ -1,6 +0,0 @@
-[
-  {
-    "repository": "android_device_google_redbull",
-    "target_path": "device/google/redbull"
-  }
-]

lineage_redfin.mk

@@ -27,4 +27,20 @@ PRODUCT_BUILD_PROP_OVERRIDES += \
     BuildFingerprint=google/redfin/redfin:14/UP1A.231105.001.B2/11260668:user/release-keys \
     DeviceProduct=redfin
 
+ifeq ($(WITH_GMS),false)
+PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
+    system/priv-app/OmniStyle/OmniStyle.apk
+
+else
+TARGET_USES_MINI_GAPPS := true
+
+PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
+    system/priv-app/OmniStyle/OmniStyle.apk \
+    system/app/GoogleExtShared/GoogleExtShared.apk \
+    system/app/GooglePrintRecommendationService/GooglePrintRecommendationService.apk \
+    system/etc/permissions/privapp-permissions-google.xml \
+    system/priv-app/DocumentsUIGoogle/DocumentsUIGoogle.apk \
+    system/priv-app/TagGoogle/TagGoogle.apk
+endif
+
 $(call inherit-product, vendor/google/redfin/redfin-vendor.mk)

redfin/AndroidBoard.mk

@@ -1,26 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-#A/B builds require us to create the mount points at compile time.
-#Just creating it for all cases since it does not hurt.
-FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/firmware_mnt
-ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT)
-
-$(FIRMWARE_MOUNT_POINT):
-	@echo "Creating $(FIRMWARE_MOUNT_POINT)"
-	@mkdir -p $(TARGET_OUT_VENDOR)/firmware_mnt
-
-# copy kernel headers to the build tree
-$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr: $(wildcard $(PRODUCT_VENDOR_KERNEL_HEADERS)/*)
-	rm -rf $@
-	mkdir -p $@/include
-	cp -a $(PRODUCT_VENDOR_KERNEL_HEADERS)/. $@/include
-
-#----------------------------------------------------------------------
-# build and sign the final stage of bootloader
-#----------------------------------------------------------------------
-.PHONY: aboot
-ifeq ($(USESECIMAGETOOL), true)
-aboot: gensecimage_target gensecimage_install
-else
-aboot: $(INSTALLED_BOOTLOADER_MODULE)
-endif

redfin/extract-files.py

@@ -51,6 +51,8 @@ blob_fixups: blob_fixups_user_type = {
         .patch_file('osaifu-keitai.patch'),
     'product/etc/sysconfig/nexus.xml': blob_fixup()
         .regex_replace('qulacomm', 'qualcomm'),
+    'system_ext/lib64/libsecureuisvc_jni.so': blob_fixup()
+        .add_needed('libgui_shim.so'),
     'system_ext/priv-app/HbmSVManager/HbmSVManager.apk': blob_fixup()
         .apktool_patch('HbmSVManager.patch'),
     (
@@ -58,6 +60,13 @@ blob_fixups: blob_fixups_user_type = {
         'vendor/lib64/android.hardware.keymaster@4.1-impl.nos.so',
     ): blob_fixup()
         .add_needed('libcrypto_shim.so'),
+    (
+        'vendor/bin/hw/citadeld',
+        'vendor/lib/libmedia_ecoservice.so',
+        'vendor/lib64/libmedia_ecoservice.so',
+        'vendor/lib64/libnos_citadeld_proxy.so',
+    ): blob_fixup()
+        .add_needed('libbinder_shim.so'),
     'vendor/lib/libmmcamera_faceproc.so': blob_fixup()
         .clear_symbol_version('__aeabi_memcpy')
         .clear_symbol_version('__aeabi_memset')

sepolicy/vendor/google/pixelstats_vendor.te

@@ -1,22 +0,0 @@
-r_dir_file(pixelstats_vendor, sysfs_pixelstats)
-
-unix_socket_connect(pixelstats_vendor, chre, chre)
-
-get_prop(pixelstats_vendor, hwservicemanager_prop)
-hwbinder_use(pixelstats_vendor)
-allow pixelstats_vendor hal_pixelstats_hwservice:hwservice_manager find;
-
-allow pixelstats_vendor fwk_stats_hwservice:hwservice_manager find;
-binder_call(pixelstats_vendor, statsd)
-
-binder_use(pixelstats_vendor)
-allow pixelstats_vendor fwk_stats_service:service_manager find;
-
-allow pixelstats_vendor sysfs_scsi_devices_0000:file rw_file_perms;
-
-# OrientationCollector
-# HIDL sensorservice
-allow pixelstats_vendor fwk_sensor_hwservice:hwservice_manager find;
-# AIDL sensorservice
-allow pixelstats_vendor fwk_sensor_service:service_manager find;
-binder_call(pixelstats_vendor, system_server)

sepolicy/vendor/google/system_server.te

@@ -1,2 +0,0 @@
-# pixelstats_vendor/OrientationCollector
-binder_call(system_server, pixelstats_vendor)

sepolicy/wireless_charger/pixelstats_vendor.te

@@ -1,3 +0,0 @@
-# Wireless charge
-allow pixelstats_vendor sysfs_wlc:dir search;
-allow pixelstats_vendor sysfs_wlc:file rw_file_perms;