diff --git a/bootanimation/Android.mk b/bootanimation/Android.mk
index a608035ffb9e9ac7298698ccd32740d580cda656..7eaf96c445faf89e49d119ced769a2bf20b2b58e 100644
--- a/bootanimation/Android.mk
+++ b/bootanimation/Android.mk
@@ -25,7 +25,8 @@ ifeq ($(TARGET_SCREEN_HEIGHT),)
 endif
 
 define build-bootanimation
-    sh vendor/lineage/bootanimation/generate-bootanimation.sh \
+    $(shell) vendor/lineage/bootanimation/generate-bootanimation.sh \
+    $(PRODUCT_OUT) \
     $(TARGET_SCREEN_WIDTH) \
     $(TARGET_SCREEN_HEIGHT) \
     $(TARGET_BOOTANIMATION_HALF_RES)
diff --git a/bootanimation/generate-bootanimation.sh b/bootanimation/generate-bootanimation.sh
index 3bcb272551f220d7fe64d5fa466b3fec1637a5bb..41d8c022cb4bc950dbb738614d1b5f71e0ba6b48 100755
--- a/bootanimation/generate-bootanimation.sh
+++ b/bootanimation/generate-bootanimation.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
 
-WIDTH="$1"
-HEIGHT="$2"
-HALF_RES="$3"
-OUT="$ANDROID_PRODUCT_OUT/obj/BOOTANIMATION"
+PRODUCT_OUT="$1"
+WIDTH="$2"
+HEIGHT="$3"
+HALF_RES="$4"
+
+OUT="$PRODUCT_OUT/obj/BOOTANIMATION"
 
 if [ "$HEIGHT" -lt "$WIDTH" ]; then
     IMAGEWIDTH="$HEIGHT"
@@ -24,7 +26,7 @@ RESOLUTION=""$IMAGEWIDTH"x"$IMAGEHEIGHT""
 
 for part_cnt in 0 1 2 3 4
 do
-    mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part$part_cnt
+    mkdir -p "$OUT/bootanimation/part$part_cnt"
 done
 tar xfp "vendor/lineage/bootanimation/bootanimation.tar" -C "$OUT/bootanimation/"
 mogrify -resize $RESOLUTION -colors 250 "$OUT/bootanimation/"*"/"*".png"