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

Commit 88dda3ec authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'epic211-a16-qpr0' into 'a16' 

Add missing changes from A15

See merge request !234
parents 4bb51f4d 9e0eb9a8

bootanimation/Android.bp

+26 −5
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ genrule { 
    ],

    tool_files: [

        "bootanimation.tar",

        "bootanimation_murena.tar",

        "bootanimation_murena_land.tar",

        "desc.txt",

        "gen-bootanimation.sh",

    ],
@@ -19,10 +21,25 @@ genrule { 
    cmd: select((soong_config_variable("lineage_bootanimation", "height"),

                 soong_config_variable("lineage_bootanimation", "width"),

                 soong_config_variable("lineage_bootanimation", "half_res"),

                 soong_config_variable("lineage_bootanimation", "uses_murena"),

                 soong_config_variable("lineage_bootanimation", "prebuilt_file")), {

        (any @ height, any @ width, any @ half_res, any @ prebuilt_file):

        (any @ height, any @ width, any @ half_res, any @ uses_murena, any @ prebuilt_file):

            "cp ../../../../../" + prebuilt_file + " $(out)",

        (any @ height, any @ width, any @ half_res, default):

        (any @ height, any @ width, any @ half_res, "true", default):

            "$(location gen-bootanimation.sh)" +

            " $(out)" +

            " $(genDir)" +

            " $(location bootanimation_murena.tar)" +

            " $(location desc.txt)" +

            " $(location mogrify)" +

            " $(location soong_zip)" +

            " " + height +

            " " + width +

            " " + half_res +

            " true" +

            " 30" +

            " $(location bootanimation_murena_land.tar)",

        (any @ height, any @ width, any @ half_res, default, default):

            "$(location gen-bootanimation.sh)" +

            " $(out)" +

            " $(genDir)" +
@@ -32,8 +49,10 @@ genrule { 
            " $(location soong_zip)" +

            " " + height +

            " " + width +

            " " + half_res,

        (default, default, default, default):

            " " + half_res +

            " false" +

            " 60",

        (default, default, default, default, default):

            "$(location gen-bootanimation.sh)" +

            " $(out)" +

            " $(genDir)" +
@@ -43,7 +62,9 @@ genrule { 
            " $(location soong_zip)" +

            " 600" +

            " 600" +

            " false",

            " false" +

            " false" +

            " 60",

    }),

}

bootanimation/bootanimation.tar

−3.85 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

bootanimation/bootanimation_murena_land.tar

0 → 100644
+3.54 MiB

File added.

No diff preview for this file type.

View file

bootanimation/gen-bootanimation.sh

+36 −6
Original line number Diff line number Diff line
@@ -25,32 +25,62 @@ PARAM_SOONG_ZIP=$6 
PARAM_TARGET_SCREEN_HEIGHT=$7

PARAM_TARGET_SCREEN_WIDTH=$8

PARAM_TARGET_BOOTANIMATION_HALF_RES=$9

PARAM_USES_MURENA=${10}

PARAM_FPS=${11}

PARAM_BOOTANIMATION_MURENA_LAND_TAR=${12}



INTERMEDIATES=$PARAM_GENDIR/intermediates



mkdir -p $INTERMEDIATES



# Cache orientation and murena checks

IS_LANDSCAPE=false

if [ $PARAM_TARGET_SCREEN_WIDTH -gt $PARAM_TARGET_SCREEN_HEIGHT ]; then

    IS_LANDSCAPE=true

fi



# Select tar file based on murena flag and orientation

if [ "$PARAM_USES_MURENA" = "true" ] && [ "$IS_LANDSCAPE" = "true" ]; then

    tar xfp $PARAM_BOOTANIMATION_MURENA_LAND_TAR -C $INTERMEDIATES

else

    tar xfp $PARAM_BOOTANIMATION_TAR -C $INTERMEDIATES

fi



if [ $PARAM_TARGET_SCREEN_HEIGHT -lt $PARAM_TARGET_SCREEN_WIDTH ]; then

if [ "$IS_LANDSCAPE" = "true" ]; then

    IMAGEWIDTH=$PARAM_TARGET_SCREEN_HEIGHT

    IMAGEHEIGHT=$PARAM_TARGET_SCREEN_WIDTH

else

    IMAGEWIDTH=$PARAM_TARGET_SCREEN_WIDTH

    IMAGEHEIGHT=$PARAM_TARGET_SCREEN_HEIGHT

fi



IMAGESCALEWIDTH=$IMAGEWIDTH

IMAGESCALEHEIGHT=$(expr $IMAGESCALEWIDTH / 3);

if [ "$PARAM_USES_MURENA" = "true" ]; then

    IMAGESCALEHEIGHT=$IMAGEHEIGHT

else

    IMAGESCALEHEIGHT=$(expr $IMAGESCALEWIDTH / 3)

fi



if [ "$PARAM_TARGET_BOOTANIMATION_HALF_RES" = "true" ]; then

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

fi



IMAGEHEIGHT=$(expr $IMAGEWIDTH / 3);

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

if [ "$PARAM_USES_MURENA" != "true" ]; then

    IMAGEHEIGHT=$(expr $IMAGEWIDTH / 3)

fi



if [ "$IS_LANDSCAPE" = "true" ]; then

    RESOLUTION="$IMAGEHEIGHT"x"$IMAGEWIDTH"

    TMP=$IMAGESCALEHEIGHT

    IMAGESCALEHEIGHT=$IMAGESCALEWIDTH

    IMAGESCALEWIDTH=$TMP

else

    RESOLUTION="$IMAGEWIDTH"x"$IMAGEHEIGHT"

fi



$PARAM_MOGRIFY -resize $RESOLUTION -colors 256 $INTERMEDIATES/*/*.png;



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

echo "$IMAGESCALEWIDTH $IMAGESCALEHEIGHT $PARAM_FPS" > $INTERMEDIATES/desc.txt;

cat $PARAM_DESC_TXT >> $INTERMEDIATES/desc.txt



$PARAM_SOONG_ZIP -L 0 -o $PARAM_OUT -C $INTERMEDIATES -D $INTERMEDIATES