Loading core/board_config.mk +4 −4 Original line number Original line Diff line number Diff line Loading @@ -397,9 +397,9 @@ ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),$(_product_services_path_placeholder)) MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true else ifeq ($(TARGET_COPY_OUT_PRODUCT),$(TARGET_COPY_OUT_PRODUCT_SERVICES)) else ifeq ($(TARGET_COPY_OUT_PRODUCT),$(TARGET_COPY_OUT_PRODUCT_SERVICES)) MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true else ifeq ($(filter product_services system/product_services,$(TARGET_COPY_OUT_PRODUCT_SERVICES)),) else ifeq ($(filter system/product_services,$(TARGET_COPY_OUT_PRODUCT_SERVICES)),) $(error TARGET_COPY_OUT_PRODUCT_SERVICES must be either 'product_services',\ $(error TARGET_COPY_OUT_PRODUCT_SERVICES must be either '$(TARGET_COPY_OUT_PRODUCT)'\ '$(TARGET_COPY_OUT_PRODUCT)' or 'system/product_services', seeing '$(TARGET_COPY_OUT_PRODUCT_SERVICES)'.) or 'system/product_services', seeing '$(TARGET_COPY_OUT_PRODUCT_SERVICES)'.) endif endif .KATI_READONLY := MERGE_PRODUCT_SERVICES_INTO_PRODUCT .KATI_READONLY := MERGE_PRODUCT_SERVICES_INTO_PRODUCT PRODUCT_COPY_FILES := $(subst $(_product_services_path_placeholder),$(TARGET_COPY_OUT_PRODUCT_SERVICES),$(PRODUCT_COPY_FILES)) PRODUCT_COPY_FILES := $(subst $(_product_services_path_placeholder),$(TARGET_COPY_OUT_PRODUCT_SERVICES),$(PRODUCT_COPY_FILES)) Loading @@ -414,7 +414,7 @@ endif ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),product_services) ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),product_services) BOARD_USES_PRODUCT_SERVICESIMAGE := true BOARD_USES_PRODUCT_SERVICESIMAGE := true else ifdef BOARD_USES_PRODUCT_SERVICESIMAGE else ifdef BOARD_USES_PRODUCT_SERVICESIMAGE $(error TARGET_COPY_OUT_PRODUCT_SERVICES must be set to 'product_services' to use a product_services image) $(error A 'product_services' partition should not be used. Use 'system/product_services' instead.) endif endif BUILDING_PRODUCT_SERVICES_IMAGE := BUILDING_PRODUCT_SERVICES_IMAGE := Loading core/build_id.mk +1 −1 Original line number Original line Diff line number Diff line Loading @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # (like "CRB01"). It must be a single word, and is # capitalized by convention. # capitalized by convention. BUILD_ID=QP1A.190704.001 BUILD_ID=QP1A.190708.001 target/board/gsi_system.prop +5 −0 Original line number Original line Diff line number Diff line Loading @@ -12,3 +12,8 @@ persist.sys.disable_rescue=true # TODO(b/78105955): disable privapp_permissions checking before the bug solved # TODO(b/78105955): disable privapp_permissions checking before the bug solved ro.control_privapp_permissions=disable ro.control_privapp_permissions=disable # TODO(b/136212765): the default for LMK ro.lmk.kill_heaviest_task=true ro.lmk.kill_timeout_ms=100 ro.lmk.use_minfree_levels=true target/board/gsi_system_user.prop +5 −0 Original line number Original line Diff line number Diff line Loading @@ -9,3 +9,8 @@ persist.sys.disable_rescue=true # TODO(b/78105955): disable privapp_permissions checking before the bug solved # TODO(b/78105955): disable privapp_permissions checking before the bug solved ro.control_privapp_permissions=disable ro.control_privapp_permissions=disable # TODO(b/136212765): the default for LMK ro.lmk.kill_heaviest_task=true ro.lmk.kill_timeout_ms=100 ro.lmk.use_minfree_levels=true Loading
core/board_config.mk +4 −4 Original line number Original line Diff line number Diff line Loading @@ -397,9 +397,9 @@ ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),$(_product_services_path_placeholder)) MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true else ifeq ($(TARGET_COPY_OUT_PRODUCT),$(TARGET_COPY_OUT_PRODUCT_SERVICES)) else ifeq ($(TARGET_COPY_OUT_PRODUCT),$(TARGET_COPY_OUT_PRODUCT_SERVICES)) MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true else ifeq ($(filter product_services system/product_services,$(TARGET_COPY_OUT_PRODUCT_SERVICES)),) else ifeq ($(filter system/product_services,$(TARGET_COPY_OUT_PRODUCT_SERVICES)),) $(error TARGET_COPY_OUT_PRODUCT_SERVICES must be either 'product_services',\ $(error TARGET_COPY_OUT_PRODUCT_SERVICES must be either '$(TARGET_COPY_OUT_PRODUCT)'\ '$(TARGET_COPY_OUT_PRODUCT)' or 'system/product_services', seeing '$(TARGET_COPY_OUT_PRODUCT_SERVICES)'.) or 'system/product_services', seeing '$(TARGET_COPY_OUT_PRODUCT_SERVICES)'.) endif endif .KATI_READONLY := MERGE_PRODUCT_SERVICES_INTO_PRODUCT .KATI_READONLY := MERGE_PRODUCT_SERVICES_INTO_PRODUCT PRODUCT_COPY_FILES := $(subst $(_product_services_path_placeholder),$(TARGET_COPY_OUT_PRODUCT_SERVICES),$(PRODUCT_COPY_FILES)) PRODUCT_COPY_FILES := $(subst $(_product_services_path_placeholder),$(TARGET_COPY_OUT_PRODUCT_SERVICES),$(PRODUCT_COPY_FILES)) Loading @@ -414,7 +414,7 @@ endif ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),product_services) ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),product_services) BOARD_USES_PRODUCT_SERVICESIMAGE := true BOARD_USES_PRODUCT_SERVICESIMAGE := true else ifdef BOARD_USES_PRODUCT_SERVICESIMAGE else ifdef BOARD_USES_PRODUCT_SERVICESIMAGE $(error TARGET_COPY_OUT_PRODUCT_SERVICES must be set to 'product_services' to use a product_services image) $(error A 'product_services' partition should not be used. Use 'system/product_services' instead.) endif endif BUILDING_PRODUCT_SERVICES_IMAGE := BUILDING_PRODUCT_SERVICES_IMAGE := Loading
core/build_id.mk +1 −1 Original line number Original line Diff line number Diff line Loading @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # (like "CRB01"). It must be a single word, and is # capitalized by convention. # capitalized by convention. BUILD_ID=QP1A.190704.001 BUILD_ID=QP1A.190708.001
target/board/gsi_system.prop +5 −0 Original line number Original line Diff line number Diff line Loading @@ -12,3 +12,8 @@ persist.sys.disable_rescue=true # TODO(b/78105955): disable privapp_permissions checking before the bug solved # TODO(b/78105955): disable privapp_permissions checking before the bug solved ro.control_privapp_permissions=disable ro.control_privapp_permissions=disable # TODO(b/136212765): the default for LMK ro.lmk.kill_heaviest_task=true ro.lmk.kill_timeout_ms=100 ro.lmk.use_minfree_levels=true
target/board/gsi_system_user.prop +5 −0 Original line number Original line Diff line number Diff line Loading @@ -9,3 +9,8 @@ persist.sys.disable_rescue=true # TODO(b/78105955): disable privapp_permissions checking before the bug solved # TODO(b/78105955): disable privapp_permissions checking before the bug solved ro.control_privapp_permissions=disable ro.control_privapp_permissions=disable # TODO(b/136212765): the default for LMK ro.lmk.kill_heaviest_task=true ro.lmk.kill_timeout_ms=100 ro.lmk.use_minfree_levels=true