The servers do not have ImageMagick installed right now, breaking the automated builds. Revert this for now. This reverts the following commits:gugelfrei840e781408
bootanim: Use a for loop to make part# foldersce5405d1f7
Fix wrong bootanimation.zip from mkdir .../part{0..2}6179d9494f
cm: Build bootanimation.zip67ddf37281
cm: Rework boot animation generation Change-Id: I63fc43da9b1a6afea5f791e879f0bfc9a385d98d
parent
01bdd55142
commit
e2ec4c6051
@ -1,52 +0,0 @@
|
||||
#
|
||||
# Copyright (C) 2016 The CyanogenMod Project
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
define build-bootanimation
|
||||
sh vendor/cm/bootanimation/generate-bootanimation.sh \
|
||||
$(TARGET_SCREEN_WIDTH) \
|
||||
$(TARGET_SCREEN_HEIGHT) \
|
||||
$(TARGET_BOOTANIMATION_HALF_RES)
|
||||
endef
|
||||
|
||||
TARGET_GENERATED_BOOTANIMATION := $(TARGET_OUT_INTERMEDIATES)/BOOTANIMATION/bootanimation.zip
|
||||
$(TARGET_GENERATED_BOOTANIMATION):
|
||||
@echo "Building bootanimation"
|
||||
$(build-bootanimation)
|
||||
|
||||
ifeq ($(TARGET_BOOTANIMATION),)
|
||||
TARGET_BOOTANIMATION := $(TARGET_GENERATED_BOOTANIMATION)
|
||||
ifeq ($(shell command -v convert),)
|
||||
$(info **********************************************)
|
||||
$(info The boot animation could not be generated as)
|
||||
$(info ImageMagick is not installed in your system.)
|
||||
$(info $(space))
|
||||
$(info Please install ImageMagick from this website:)
|
||||
$(info https://imagemagick.org/script/binary-releases.php)
|
||||
$(info **********************************************)
|
||||
$(error stop)
|
||||
endif
|
||||
endif
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := bootanimation.zip
|
||||
LOCAL_MODULE_CLASS := ETC
|
||||
LOCAL_MODULE_PATH := $(TARGET_OUT)/media
|
||||
|
||||
include $(BUILD_SYSTEM)/base_rules.mk
|
||||
|
||||
$(LOCAL_BUILT_MODULE): $(TARGET_BOOTANIMATION)
|
||||
@mkdir -p $(dir $@)
|
||||
@cp $(TARGET_BOOTANIMATION) $@
|
@ -1,3 +0,0 @@
|
||||
c 1 0 part0
|
||||
c 0 0 part1
|
||||
c 1 0 part2
|
@ -1,35 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
WIDTH="$1"
|
||||
HEIGHT="$2"
|
||||
HALF_RES="$3"
|
||||
OUT="$ANDROID_PRODUCT_OUT/obj/BOOTANIMATION"
|
||||
|
||||
if [ "$HEIGHT" -lt "$WIDTH" ]; then
|
||||
SIZE="$HEIGHT"
|
||||
else
|
||||
SIZE="$WIDTH"
|
||||
fi
|
||||
|
||||
if [ "$HALF_RES" = "true" ]; then
|
||||
IMAGESIZE=$(expr $SIZE / 2)
|
||||
else
|
||||
IMAGESIZE="$SIZE"
|
||||
fi
|
||||
|
||||
RESOLUTION=""$IMAGESIZE"x"$IMAGESIZE""
|
||||
|
||||
for part_cnt in 0 1 2
|
||||
do
|
||||
mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part$part_cnt
|
||||
done
|
||||
tar xfp "vendor/cm/bootanimation/bootanimation.tar" --to-command="convert - -resize '$RESOLUTION' \"png8:$OUT/bootanimation/\$TAR_FILENAME\""
|
||||
|
||||
# Create desc.txt
|
||||
echo "$SIZE" "$SIZE" 30 > "$OUT/bootanimation/desc.txt"
|
||||
cat "vendor/cm/bootanimation/desc.txt" >> "$OUT/bootanimation/desc.txt"
|
||||
|
||||
# Create bootanimation.zip
|
||||
cd "$OUT/bootanimation"
|
||||
|
||||
zip -qr0 "$OUT/bootanimation.zip" .
|
@ -1,2 +1,7 @@
|
||||
# Inherit common CM stuff
|
||||
$(call inherit-product, vendor/cm/config/common_full.mk)
|
||||
|
||||
ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
|
||||
PRODUCT_COPY_FILES += \
|
||||
vendor/cm/prebuilt/common/bootanimation/800.zip:system/media/bootanimation.zip
|
||||
endif
|
||||
|
@ -1,2 +1,7 @@
|
||||
# Inherit common CM stuff
|
||||
$(call inherit-product, vendor/cm/config/common_mini.mk)
|
||||
|
||||
ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
|
||||
PRODUCT_COPY_FILES += \
|
||||
vendor/cm/prebuilt/common/bootanimation/800.zip:system/media/bootanimation.zip
|
||||
endif
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,25 @@
|
||||
#!/bin/sh
|
||||
|
||||
HALF_RES_RESOLUTIONS="240 320 360 480 540 600 720 768 800 1080 1200 1440 1536 1600"
|
||||
|
||||
for i in $HALF_RES_RESOLUTIONS; do
|
||||
rm -f $i.zip
|
||||
mkdir $i
|
||||
cd $i
|
||||
if [ -f ../../$(($i/2)).zip ]; then
|
||||
# use the existing scaled images
|
||||
echo "Using existing half-scale images instead of scaling from $i px"
|
||||
unzip ../../$(($i/2)).zip
|
||||
rm -f desc.txt
|
||||
unzip ../../$i.zip desc.txt
|
||||
else
|
||||
unzip ../../$i.zip
|
||||
for j in */*.[pP][nN][gG]; do
|
||||
convert $j -resize 50% tmp.png
|
||||
mv tmp.png $j
|
||||
done
|
||||
fi
|
||||
zip -r0 ../$i.zip .
|
||||
cd ..
|
||||
rm -rf $i
|
||||
done
|
Loading…
Reference in new issue