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

Commit 7a08313a authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "releasetools: Move one case of mkdtemp() to common.MakeTempDir()." am:... 

Merge "releasetools: Move one case of mkdtemp() to common.MakeTempDir()." am: a7a5e15f am: fc0bb788
am: e9f3ee0f

Change-Id: Ie5cf8533ae02aab3f52c3652b2afc55c729e16f2
parents cf504512 e9f3ee0f

tools/releasetools/common.py

+1 −3
Original line number Original line Diff line number Diff line
@@ -1535,9 +1535,7 @@ class BlockDifference(object): 
    b = blockimgdiff.BlockImageDiff(tgt, src, threads=OPTIONS.worker_threads,

    b = blockimgdiff.BlockImageDiff(tgt, src, threads=OPTIONS.worker_threads,

                                    version=self.version,

                                    version=self.version,

                                    disable_imgdiff=self.disable_imgdiff)

                                    disable_imgdiff=self.disable_imgdiff)

    tmpdir = tempfile.mkdtemp()

    self.path = os.path.join(MakeTempDir(), partition)

    OPTIONS.tempfiles.append(tmpdir)

    self.path = os.path.join(tmpdir, partition)

    b.Compute(self.path)

    b.Compute(self.path)

    self._required_cache = b.max_stashed_size

    self._required_cache = b.max_stashed_size

    self.touched_src_ranges = b.touched_src_ranges

    self.touched_src_ranges = b.touched_src_ranges