From ade98959e0d4c63c7edbaef8edc9c850c2948a4c Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Tue, 9 Mar 2021 18:15:41 +0100 Subject: [PATCH] config: Set screen size defaults globally * Makes defaults available to other places than just bootanimation Change-Id: I6865bdd08e7f3d9370ce8578691f52204d57fde7 --- bootanimation/Android.mk | 9 --------- config/common.mk | 2 ++ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/bootanimation/Android.mk b/bootanimation/Android.mk index 2bc78ceb..70bdc4bc 100644 --- a/bootanimation/Android.mk +++ b/bootanimation/Android.mk @@ -15,15 +15,6 @@ # limitations under the License. # -ifeq ($(TARGET_SCREEN_WIDTH),) - $(warning TARGET_SCREEN_WIDTH is not set, using default value: 1080) - TARGET_SCREEN_WIDTH := 1080 -endif -ifeq ($(TARGET_SCREEN_HEIGHT),) - $(warning TARGET_SCREEN_HEIGHT is not set, using default value: 1920) - TARGET_SCREEN_HEIGHT := 1920 -endif - TARGET_GENERATED_BOOTANIMATION := $(TARGET_OUT_INTERMEDIATES)/BOOTANIMATION/bootanimation.zip $(TARGET_GENERATED_BOOTANIMATION): INTERMEDIATES := $(TARGET_OUT_INTERMEDIATES)/BOOTANIMATION $(TARGET_GENERATED_BOOTANIMATION): $(SOONG_ZIP) diff --git a/config/common.mk b/config/common.mk index 89a25f9e..9de9de4c 100644 --- a/config/common.mk +++ b/config/common.mk @@ -98,6 +98,8 @@ PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := true PRODUCT_RESTRICT_VENDOR_FILES := false # Bootanimation +TARGET_SCREEN_WIDTH ?= 1080 +TARGET_SCREEN_HEIGHT ?= 1920 PRODUCT_PACKAGES += \ bootanimation.zip