diff options
| -rw-r--r-- | aoc/aoc.mk | 2 | ||||
| -rw-r--r-- | battery_mitigation/bcl.mk | 2 | ||||
| -rw-r--r-- | camera/dump.mk | 3 | ||||
| -rw-r--r-- | dauntless/gsc.mk | 2 | ||||
| -rw-r--r-- | display/dump.mk | 2 | ||||
| -rw-r--r-- | gps/brcm/device.mk | 4 | ||||
| -rw-r--r-- | gps/brcm/device_v2.mk | 4 | ||||
| -rw-r--r-- | gps/dump/log.mk | 3 | ||||
| -rw-r--r-- | gxp/dump.mk | 3 | ||||
| -rw-r--r-- | led/led.mk | 2 | ||||
| -rw-r--r-- | pixel_ril/ril.mk | 2 | ||||
| -rw-r--r-- | ramdump/ramdump.mk | 2 | ||||
| -rw-r--r-- | soc/soc.mk | 3 | ||||
| -rw-r--r-- | storage/storage.mk | 2 | ||||
| -rw-r--r-- | wlan/dump.mk | 3 |
15 files changed, 31 insertions, 8 deletions
@@ -19,8 +19,10 @@ PRODUCT_COPY_FILES += \ endif # AoC debug support +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES_DEBUG += \ aocdump \ aocutil \ aoc_audio_cfg \ vp_util +endif diff --git a/battery_mitigation/bcl.mk b/battery_mitigation/bcl.mk index 87e0f95..bd151fe 100644 --- a/battery_mitigation/bcl.mk +++ b/battery_mitigation/bcl.mk @@ -1,5 +1,5 @@ PRODUCT_PACKAGES += battery_mitigation -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES += BrownoutDetection endif diff --git a/camera/dump.mk b/camera/dump.mk index a3a5c7a..0df5823 100644 --- a/camera/dump.mk +++ b/camera/dump.mk @@ -1,4 +1,5 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/camera/sepolicy/ +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES_DEBUG += dump_camera - +endif diff --git a/dauntless/gsc.mk b/dauntless/gsc.mk index 892f71a..91385cb 100644 --- a/dauntless/gsc.mk +++ b/dauntless/gsc.mk @@ -16,8 +16,10 @@ 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 +endif endif
\ No newline at end of file diff --git a/display/dump.mk b/display/dump.mk index 2af14da..08897a0 100644 --- 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 diff --git a/gps/brcm/device.mk b/gps/brcm/device.mk index 73d0492..8499f46 100644 --- a/gps/brcm/device.mk +++ b/gps/brcm/device.mk @@ -2,7 +2,7 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/brcm/sepolicy PRODUCT_SOONG_NAMESPACES += device/google/gs-common/gps/brcm/prebuilt -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) $(call soong_config_set, SensorHub_debug, assertion, true) endif @@ -10,5 +10,7 @@ PRODUCT_PACKAGES += \ bcm47765_gps_package \ android.hardware.location.gps.prebuilt.xml +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES_DEBUG += \ init.gps_log.rc +endif diff --git a/gps/brcm/device_v2.mk b/gps/brcm/device_v2.mk index 5de9b61..cc658e1 100644 --- a/gps/brcm/device_v2.mk +++ b/gps/brcm/device_v2.mk @@ -2,7 +2,7 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/brcm/sepolicy PRODUCT_SOONG_NAMESPACES += vendor/broadcom/gps/bcm47765 -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) $(call soong_config_set, gpsv2, assertion, true) endif @@ -10,5 +10,7 @@ PRODUCT_PACKAGES += \ bcm47765_gps_package_v2 \ android.hardware.location.gps.prebuilt.xml +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES_DEBUG += \ init.gps_log.rc +endif diff --git a/gps/dump/log.mk b/gps/dump/log.mk index d977cb2..6a0aa9e 100644 --- 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 diff --git a/gxp/dump.mk b/gxp/dump.mk index c1f6300..34081b9 100644 --- a/gxp/dump.mk +++ b/gxp/dump.mk @@ -1,4 +1,5 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gxp/sepolicy/ +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES_DEBUG += dump_gxp - +endif @@ -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 diff --git a/pixel_ril/ril.mk b/pixel_ril/ril.mk index 37274aa..02494fe 100644 --- 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 \ diff --git a/ramdump/ramdump.mk b/ramdump/ramdump.mk index 5b34a67..1e14874 100644 --- 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 @@ -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.sh - +endif diff --git a/storage/storage.mk b/storage/storage.mk index cd0556d..954599a 100644 --- 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.sh # Pixel storage tool +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES_DEBUG += \ sg_write_buffer \ sg_read_buffer +endif diff --git a/wlan/dump.mk b/wlan/dump.mk index 1d90d22..b716de6 100644 --- 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 |