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

Commit 39a6a644 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merge from open-source master 

Change-Id: Ic005b0772e144fc986fd3bacc67d5840b16efb81
parents 703f4958 f5f11eb0

core/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -720,8 +720,12 @@ define build-systemtarball-target 
		$(INSTALLED_SYSTEMTARBALL_TARGET)

endef



ifndef SYSTEM_TARBALL_FORMAT

    SYSTEM_TARBALL_FORMAT := bz2

endif



system_tar := $(PRODUCT_OUT)/system.tar

INSTALLED_SYSTEMTARBALL_TARGET := $(system_tar).bz2

INSTALLED_SYSTEMTARBALL_TARGET := $(system_tar).$(SYSTEM_TARBALL_FORMAT)

$(INSTALLED_SYSTEMTARBALL_TARGET): PRIVATE_SYSTEM_TAR := $(system_tar)

$(INSTALLED_SYSTEMTARBALL_TARGET): $(FS_GET_STATS) $(INTERNAL_SYSTEMIMAGE_FILES)

	$(build-systemtarball-target)

tools/mktarball.sh

+8 −1
Original line number Diff line number Diff line
@@ -39,7 +39,14 @@ for f in ${subdirs} ${files} ; do 
done



if [ $? -eq 0 ] ; then

    case "${target_tarball}" in

    *.bz2 )

        bzip2 -c ${target_tar} > ${target_tarball}

        ;;

    *.gz )

        gzip -c ${target_tar} > ${target_tarball}

        ;;

    esac

    success=$?

    [ $success -eq 0 ] || rm -f ${target_tarball}

    rm -f ${target_tar}