Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b5955de authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'epic42-t-bringup' into 'v1-t' 

Port changes from Android S

See merge request !147
parents 58bf1701 110f63ff

LICENSE

+1 −0
Original line number Diff line number Diff line 
   Copyright 2011-15 The CyanogenMod Project

             2017    The LineageOS Project

             2019-21 E FOUNDATION



   Licensed under the Apache License, Version 2.0 (the "License");

   you may not use this file except in compliance with the License.

bootanimation/Android.mk

+21 −4
Original line number Diff line number Diff line
@@ -15,30 +15,47 @@ 
# limitations under the License.

#



ifeq ($(TARGET_USES_MURENA_BOOTANIMATION),true)

BOOTANIMATION_TAR = bootanimation_murena.tar

BOOTANIMATION_FPS := 30

else

BOOTANIMATION_TAR = bootanimation.tar

BOOTANIMATION_FPS := 60

endif



TARGET_GENERATED_BOOTANIMATION := $(TARGET_OUT_INTERMEDIATES)/BOOTANIMATION/bootanimation.zip

$(TARGET_GENERATED_BOOTANIMATION): INTERMEDIATES := $(TARGET_OUT_INTERMEDIATES)/BOOTANIMATION

$(TARGET_GENERATED_BOOTANIMATION): $(SOONG_ZIP)

	@echo "Building bootanimation.zip"

	@rm -rf $(dir $@)

	@mkdir -p $(dir $@)

	$(hide) tar xfp vendor/lineage/bootanimation/bootanimation.tar -C $(INTERMEDIATES)

	$(hide) tar xfp vendor/lineage/bootanimation/$(BOOTANIMATION_TAR) -C $(INTERMEDIATES)

	$(hide) if [ $(TARGET_SCREEN_HEIGHT) -lt $(TARGET_SCREEN_WIDTH) ]; then \

	    IMAGEWIDTH=$(TARGET_SCREEN_HEIGHT); \

	else \

	    IMAGEWIDTH=$(TARGET_SCREEN_WIDTH); \

	fi; \

	IMAGESCALEWIDTH=$$IMAGEWIDTH; \

	if [ "$(TARGET_USES_MURENA_BOOTANIMATION)" = "true" ]; then \

		IMAGESCALEHEIGHT=$(TARGET_SCREEN_HEIGHT); \

	else \

		IMAGESCALEHEIGHT=$$(expr $$IMAGESCALEWIDTH / 3); \

	fi; \

	if [ "$(TARGET_BOOTANIMATION_HALF_RES)" = "true" ]; then \

	    IMAGEWIDTH="$$(expr "$$IMAGEWIDTH" / 2)"; \

	fi; \

	if [ "$(TARGET_USES_MURENA_BOOTANIMATION)" = "true" ]; then \

		IMAGEHEIGHT=$(TARGET_SCREEN_HEIGHT); \

	else \

		IMAGEHEIGHT=$$(expr $$IMAGEWIDTH / 3); \

	fi; \

	RESOLUTION="$$IMAGEWIDTH"x"$$IMAGEHEIGHT"; \

	for part_cnt in 0 1 2 3 4; do \

	    mkdir -p $(INTERMEDIATES)/part$$part_cnt; \

	done; \

	prebuilts/tools-lineage/${HOST_OS}-x86/bin/mogrify -resize $$RESOLUTION -colors 250 $(INTERMEDIATES)/*/*.png; \

	echo "$$IMAGESCALEWIDTH $$IMAGESCALEHEIGHT 60" > $(INTERMEDIATES)/desc.txt; \

	BOOTANIMFPS=$(BOOTANIMATION_FPS); \

	echo "$$IMAGESCALEWIDTH $$IMAGESCALEHEIGHT $$BOOTANIMFPS" > $(INTERMEDIATES)/desc.txt; \

	cat vendor/lineage/bootanimation/desc.txt >> $(INTERMEDIATES)/desc.txt

	$(hide) $(SOONG_ZIP) -L 0 -o $(TARGET_GENERATED_BOOTANIMATION) -C $(INTERMEDIATES) -D $(INTERMEDIATES)

bootanimation/bootanimation.tar

−7.51 MiB (2.28 MiB)

File changed.

No diff preview for this file type.

View original file
View changed file

bootanimation/bootanimation_murena.tar

0 → 100644
+1.13 MiB

File added.

No diff preview for this file type.

View file

build/core/main_version.mk

+12 −1
Original line number Diff line number Diff line
@@ -10,7 +10,18 @@ ADDITIONAL_SYSTEM_PROPERTIES += \ 
    ro.lineage.releasetype=$(LINEAGE_BUILDTYPE) \

    ro.lineage.build.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR) \

    ro.modversion=$(LINEAGE_VERSION) \

    ro.lineagelegal.url=https://lineageos.org/legal

    ro.lineagelegal.url=https://lineageos.org/legal \

    ro.elegal.url=https://e.foundation/legal



ifdef CI_PIPELINE_ID

    ADDITIONAL_SYSTEM_PROPERTIES += \

        ro.cm.build.pipeline.id=$(CI_PIPELINE_ID)

endif



ifdef CI_PIPELINE_IID

    ADDITIONAL_SYSTEM_PROPERTIES += \

        ro.cm.build.pipeline.iid=$(CI_PIPELINE_IID)

endif



# LineageOS Platform Display Version

ADDITIONAL_SYSTEM_PROPERTIES += \