summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BoardConfig-common.mk2
-rw-r--r--conf/init.gs201.rc11
-rw-r--r--conf/init.recovery.device.rc2
-rw-r--r--device.mk42
-rw-r--r--gnss/device-gnss.mk2
5 files changed, 37 insertions, 22 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index f400656f..ae4cdb1f 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -225,7 +225,7 @@ BOARD_USES_GENERIC_AUDIO := true
$(call soong_config_set,aoc_audio_func,ext_hidl,true)
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
$(call soong_config_set,aoc_audio_func,dump_usecase_data,true)
$(call soong_config_set,aoc_audio_func,hal_socket_control,true)
$(call soong_config_set,aoc_audio_func,record_tunning_keys,true)
diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index cebd881d..96dec81a 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -2,12 +2,11 @@ import /vendor/etc/init/hw/init.gs201.usb.rc
import android.hardware.drm@1.2-service.widevine.rc
import init.exynos.sensorhub.rc
-on early-init && property:ro.debuggable=1
- # Convert /dev/block/by-name/persist to ext4 on userdebug builds only
+on early-init && property:ro.build.type=eng
+ # Convert /dev/block/by-name/persist to ext4 on eng builds only
exec -- /system_ext/bin/convert_to_ext4.sh /dev/block/by-name/persist false
- mount_all /vendor/etc/fstab.persist --early
-on early-init && property:ro.debuggable=0
+on early-init
mount_all /vendor/etc/fstab.persist --early
on init
@@ -655,8 +654,8 @@ on property:vendor.ril.cbd.svc=0
stop lhd
stop scd
-# on userdebug and eng builds, enable kgdb on the serial console
-on property:ro.debuggable=1
+# on eng builds, enable kgdb on the serial console
+on property:ro.build.type=eng
write /sys/module/kgdboc/parameters/kgdboc ttyFIQ1
write /sys/module/fiq_debugger/parameters/kgdb_enable 1
diff --git a/conf/init.recovery.device.rc b/conf/init.recovery.device.rc
index 592efbd3..2d49d83f 100644
--- a/conf/init.recovery.device.rc
+++ b/conf/init.recovery.device.rc
@@ -3,7 +3,7 @@ on init
setprop sys.usb.controller "11210000.dwc3"
setprop sys.usb.configfs 1
-on init && property:ro.debuggable=1 && property:ro.boot.mode=recovery
+on init && property:ro.build.type=eng && property:ro.boot.mode=recovery
start recovery-console
service recovery-console /system/bin/sh
diff --git a/device.mk b/device.mk
index 49c3b606..c5732d09 100644
--- a/device.mk
+++ b/device.mk
@@ -66,7 +66,7 @@ PRODUCT_SOONG_NAMESPACES += \
vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)
endif
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
#Set IKE logs to verbose for WFC
PRODUCT_PROPERTY_OVERRIDES += log.tag.IKE=VERBOSE
@@ -82,10 +82,12 @@ PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-xcap=DEBUG
PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-HC=DEBUG
# Modem userdebug
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
include device/google/gs201/modem/userdebug.mk
endif
+endif
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
# b/36703476: Set default log size to 1M
PRODUCT_PROPERTY_OVERRIDES += \
ro.logd.size=1M
@@ -291,7 +293,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
device/google/gs201/conf/init.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.rc
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \
device/google/gs201/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc
endif
@@ -331,7 +333,7 @@ PRODUCT_PACKAGES += \
android.hardware.contexthub-service.generic
# CHRE tools
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += \
chre_power_test_client \
chre_test_client
@@ -361,7 +363,7 @@ PRODUCT_PACKAGES += \
checkpoint_gc
# Vendor verbose logging default property
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.verbose_logging_enabled=true
else
@@ -417,7 +419,7 @@ PRODUCT_COPY_FILES += \
endif
# default usb debug functions
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.usb.usbradio.config=dm
endif
@@ -553,10 +555,11 @@ PRODUCT_PACKAGES += \
battery_mitigation
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += BrownoutDetection
endif
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES_DEBUG += \
sg_write_buffer \
f2fs_io \
@@ -564,6 +567,7 @@ PRODUCT_PACKAGES_DEBUG += \
f2fsstat \
f2fs.fibmap \
dump.f2fs
+endif
# Storage health HAL
PRODUCT_PACKAGES += \
@@ -586,8 +590,10 @@ ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
include hardware/google/pixel/dauntless/dauntless.mk
endif
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES_DEBUG += \
WvInstallKeybox
+endif
# Copy Camera HFD Setfiles
#PRODUCT_COPY_FILES += \
@@ -646,7 +652,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
debug.slsi_platform=1 \
debug.hwc.winupdate=1
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += displaycolor_service
endif
@@ -721,7 +727,7 @@ PRODUCT_PACKAGES += wpa_supplicant.conf
WIFI_PRIV_CMD_UPDATE_MBO_CELL_STATUS := enabled
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += wpa_cli
PRODUCT_PACKAGES += hostapd_cli
endif
@@ -801,8 +807,10 @@ $(call inherit-product, system/core/trusty/trusty-storage.mk)
$(call inherit-product, system/core/trusty/trusty-base.mk)
# Trusty unit test tool
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl \
tipc-test
+endif
include device/google/gs101/confirmationui/confirmationui.mk
@@ -831,7 +839,7 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml
# System props to enable Bluetooth Quality Report (BQR) feature
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.bqr.event_mask?=262174 \
persist.bluetooth.bqr.min_interval_ms=500
@@ -871,8 +879,8 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
Iwlan
-#Iwlan test app for userdebug/eng builds
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+#Iwlan test app for eng builds
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += \
IwlanTestApp
endif
@@ -896,8 +904,10 @@ $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHA
PRODUCT_PACKAGES += ShannonIms
#RCS Test Messaging App
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES_DEBUG += \
TestRcsApp
+endif
PRODUCT_PACKAGES += ShannonRcs
endif
@@ -941,7 +951,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.sys.modem.logging.enable=true
# Enable silent CP crash handling
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.ril.crash_handling_mode=1
else
@@ -993,11 +1003,13 @@ PRODUCT_COPY_FILES += \
ARM_COMPUTE_CL_ENABLE := 1
# Vibrator Diag
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES_DEBUG += \
diag-vibrator \
diag-vibrator-cs40l25a \
diag-vibrator-drv2624 \
$(NULL)
+endif
PRODUCT_PACKAGES += \
android.hardware.health-service.gs201 \
@@ -1092,7 +1104,7 @@ PRODUCT_PACKAGES += vndservicemanager
PRODUCT_PACKAGES += vndservice
## TinyTools, debug tool and cs35l41 speaker calibration tool for Audio
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += \
tinyplay \
tinycap \
@@ -1179,7 +1191,9 @@ USES_RADIOEXT_V1_5 = true
include hardware/google/pixel/wifi_ext/device.mk
# Battery Stats Viewer
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer
+endif
# Install product specific framework compatibility matrix
# (TODO: b/169535506) This includes the FCM for system_ext and product partition.
diff --git a/gnss/device-gnss.mk b/gnss/device-gnss.mk
index 5c5c2606..5e585916 100644
--- a/gnss/device-gnss.mk
+++ b/gnss/device-gnss.mk
@@ -15,5 +15,7 @@ PRODUCT_PACKAGES += \
scd \
android.hardware.gnss@2.1-service-brcm
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES_DEBUG += \
init.gps_log.rc
+endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 05:26:07 +0000