fixup! Disable userdebug diagnostics

Change-Id: I9ec35b51e3414bded1945b7035372d91ef960414
Skip gyotaku_app for lineage builds
2024-09-07 16:34:17 +03:00 · 2024-06-15 22:31:53 +03:00 · 2024-06-15 22:26:04 +03:00 · 2024-04-25 15:34:27 +03:00 · 2024-04-24 20:03:50 +03:00 · 2024-03-10 07:29:44 +02:00
30 changed files with 100 additions and 14 deletions
--- a/.gitupstream
+++ b/.gitupstream
@@ -0,0 +1 @@
+https://android.googlesource.com/device/google/gs-common
--- a/aoc/aoc.mk
+++ b/aoc/aoc.mk
@@ -11,18 +11,15 @@ PRODUCT_PACKAGES += \
 endif

 # If AoC Daemon is not present on this build, load firmware at boot via rc
-ifeq ($(wildcard vendor/google/whitechapel/aoc/aocd),)
-PRODUCT_COPY_FILES += \
-	device/google/gs-common/aoc/conf/init.aoc.nodaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc
-else
 PRODUCT_COPY_FILES += \
 	device/google/gs-common/aoc/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc
-endif

 # AoC debug support
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += \
 	aocdump \
 	aocutil \
 	aoc_audio_cfg \
 	vp_util \
 	aocx_tool
+endif
--- a/battery_mitigation/bcl.mk
+++ b/battery_mitigation/bcl.mk
@@ -1,7 +1,7 @@
 ifeq (,$(filter factory_%,$(TARGET_PRODUCT)))
 PRODUCT_PACKAGES += battery_mitigation
 endif
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 ifeq (,$(filter factory_%,$(TARGET_PRODUCT)))
 PRODUCT_PACKAGES += BrownoutDetection
 endif
--- a/bcmbt/dump/dumplog.mk
+++ b/bcmbt/dump/dumplog.mk
@@ -1,3 +1,5 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/bcmbt/dump/sepolicy/

+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += dump_bcmbt
+endif
--- a/camera/dump.mk
+++ b/camera/dump.mk
@@ -2,5 +2,6 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/camera/sepolicy/vendor
 PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/gs-common/camera/sepolicy/product/public
 PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/gs-common/camera/sepolicy/product/private

+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += dump_camera
-
+endif
--- a/dauntless/gsc.mk
+++ b/dauntless/gsc.mk
@@ -16,9 +16,11 @@ PRODUCT_PACKAGES += \
    dump_gsc.sh

 # USERDEBUG ONLY: Install test packages
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += citadel_integration_tests \
                          pwntest \
                          nugget_targeted_tests \
                          CitadelProvision \
                          nugget_aidl_test_weaver
 endif
+endif
--- a/display/dump.mk
+++ b/display/dump.mk
@@ -1,4 +1,6 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/display/sepolicy

+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += dump_display_userdebug.sh
+endif
 PRODUCT_PACKAGES += dump_display
--- a/display_logbuffer/init.display_logbuffer.rc
+++ b/display_logbuffer/init.display_logbuffer.rc
@@ -1,3 +1,3 @@
-on property:ro.build.type=userdebug
+on property:ro.build.type=eng
    chown system system /dev/logbuffer_dsim0
    chown system system /dev/logbuffer_dsim1
--- a/gps/brcm/device.mk
+++ b/gps/brcm/device.mk
@@ -15,5 +15,7 @@ PRODUCT_PACKAGES += \
 	sitril-gps \
 	android.hardware.location.gps.prebuilt.xml

+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += \
 	init.gps_log.rc
+endif
--- a/gps/dump/log.mk
+++ b/gps/dump/log.mk
@@ -1,4 +1,5 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/dump/sepolicy/

+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += dump_gps
-
+endif
--- a/gxp/gxp.mk
+++ b/gxp/gxp.mk
@@ -7,7 +7,9 @@ PRODUCT_PACKAGES += \
 # GXP C-API library
 PRODUCT_PACKAGES += libgxp
 # GXP Debug dump.
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += dump_gxp
+endif

 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gxp/sepolicy

--- a/gyotaku_app/gyotaku.mk
+++ b/gyotaku_app/gyotaku.mk
@@ -1,4 +1,5 @@
 ifneq ($(TARGET_BUILD_VARIANT), user)
+  ifeq ($(LINEAGE_BUILD),)
  ifeq (,$(filter aosp_%, $(TARGET_PRODUCT))) # Skip aosp target product
    PRODUCT_PACKAGES_DEBUG += \
      Gyotaku
@@ -11,4 +12,5 @@ ifneq ($(TARGET_BUILD_VARIANT), user)
        BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/dump
      endif
  endif
+  endif
 endif
--- a/led/led.mk
+++ b/led/led.mk
@@ -1,3 +1,5 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/led/sepolicy

+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += dump_led
+endif
--- a/modem/erase_modemlog/Android.bp
+++ b/modem/erase_modemlog/Android.bp
@@ -0,0 +1,15 @@
+//
+// SPDX-FileCopyrightText: 2024 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+package {
+    default_applicable_licenses: [ "Android-Apache-2.0" ],
+}
+
+sh_binary {
+    name: "erase_modemlog.sh",
+    src: "erase_modemlog.sh",
+    init_rc: ["erase_modemlog.rc"],
+    vendor: true,
+}
--- a/modem/erase_modemlog/erase_modemlog.mk
+++ b/modem/erase_modemlog/erase_modemlog.mk
@@ -0,0 +1,10 @@
+#
+# SPDX-FileCopyrightText: 2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/modem/erase_modemlog/sepolicy
+
+PRODUCT_PACKAGES += erase_modemlog.sh
+endif
--- a/modem/erase_modemlog/erase_modemlog.rc
+++ b/modem/erase_modemlog/erase_modemlog.rc
@@ -0,0 +1,10 @@
+#
+# SPDX-FileCopyrightText: 2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+service vendor.erase_modemlog.rc /vendor/bin/erase_modemlog.sh
+    class main
+    user system
+    group system
+    oneshot
--- a/modem/erase_modemlog/erase_modemlog.sh
+++ b/modem/erase_modemlog/erase_modemlog.sh
@@ -0,0 +1,13 @@
+#!/vendor/bin/sh
+#
+# SPDX-FileCopyrightText: 2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if [ ! -f /data/vendor/slog/erased ]; then
+    rm -rf /data/vendor/slog
+    mkdir /data/vendor/slog
+    chmod 771 /data/vendor/slog
+    chown -hR system.system /data/vendor/slog
+    touch /data/vendor/slog/erased
+fi
--- a/modem/erase_modemlog/sepolicy/erase_modemlog.te
+++ b/modem/erase_modemlog/sepolicy/erase_modemlog.te
@@ -0,0 +1,9 @@
+type erase_modemlog, domain;
+type erase_modemlog_exec, vendor_file_type, exec_type, file_type;
+
+init_daemon_domain(erase_modemlog)
+
+allow erase_modemlog vendor_slog_file:dir create_dir_perms;
+allow erase_modemlog vendor_slog_file:file create_file_perms;
+
+allow erase_modemlog vendor_toolbox_exec:file execute_no_trans;
--- a/modem/erase_modemlog/sepolicy/file_contexts
+++ b/modem/erase_modemlog/sepolicy/file_contexts
@@ -0,0 +1 @@
+/vendor/bin/erase_modemlog\.sh      u:object_r:erase_modemlog_exec:s0
--- a/modem/modem.mk
+++ b/modem/modem.mk
@@ -1 +1,2 @@
 include device/google/gs-common/modem/dump_modemlog/dump_modemlog.mk
+include device/google/gs-common/modem/erase_modemlog/erase_modemlog.mk
--- a/pixel_ril/ril.mk
+++ b/pixel_ril/ril.mk
@@ -9,7 +9,9 @@ DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/pixel_ril/co

 PRODUCT_PACKAGES += ril-extension

+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += libgooglerilmemmonitor
+endif

 PRODUCT_SOONG_NAMESPACES += \
    vendor/google/tools/ril-extension-service \
--- a/radio/dump.mk
+++ b/radio/dump.mk
@@ -1,4 +1,5 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/radio/sepolicy/

+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += dump_radio
-
+endif
--- a/ramdump/ramdump.mk
+++ b/ramdump/ramdump.mk
@@ -1,3 +1,5 @@
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += dump_ramdump
+endif

 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/ramdump/sepolicy
--- a/soc/soc.mk
+++ b/soc/soc.mk
@@ -1,5 +1,6 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/soc/sepolicy/soc

 PRODUCT_PACKAGES += dump_soc
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += dump_memory
-
+endif
--- a/storage/dump_storage.cpp
+++ b/storage/dump_storage.cpp
@@ -179,7 +179,7 @@ int main() {

    printf("\n------ UFS error history ------\n");
    std::string build_type = android::base::GetProperty(BUILD_TYPE_PROPERTY, "");
-    if (build_type == "userdebug") {
+    if (build_type == "eng") {
        std::string sg_read_buffer = "/vendor/bin/sg_read_buffer";
        std::ifstream sg_read_buffer_file(sg_read_buffer.c_str());
        if (sg_read_buffer_file.is_open()) {
--- a/storage/init.storage.rc
+++ b/storage/init.storage.rc
@@ -1,4 +1,4 @@
-on property:ro.build.type=userdebug
+on property:ro.build.type=eng
    write /dev/sys/block/bootdevice/pixel/enable_pixel_ufs_logging 1
    chown system /dev/sg3

--- a/storage/storage.mk
+++ b/storage/storage.mk
@@ -3,6 +3,8 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/storage/sepolicy
 PRODUCT_PACKAGES += dump_storage

 # Pixel storage tool
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += \
 	sg_write_buffer \
 	sg_read_buffer
+endif
--- a/thermal/thermal_hal/device.mk
+++ b/thermal/thermal_hal/device.mk
@@ -4,7 +4,9 @@ PRODUCT_PACKAGES += android.hardware.thermal-service.pixel
 PRODUCT_PACKAGES += thermal_symlinks

 # Thermal logd
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += thermal_logd
+endif
 PRODUCT_PACKAGES_ENG += thermal_logd

 BOARD_SEPOLICY_DIRS += device/google/gs-common/thermal/sepolicy/thermal_hal
--- a/touch/touchinspector/touchinspector.mk
+++ b/touch/touchinspector/touchinspector.mk
@@ -1,3 +1,5 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/touchinspector/sepolicy

+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += TouchInspector
+endif
--- a/wlan/dump.mk
+++ b/wlan/dump.mk
@@ -1,4 +1,5 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/wlan/sepolicy/

+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += dump_wlan
-
+endif
				`@@ -0,0 +1 @@`
				`https://android.googlesource.com/device/google/gs-common`
				`@@ -0,0 +1 @@`
				`/vendor/bin/erase_modemlog\.sh u:object_r:erase_modemlog_exec:s0`