Snap for 6844436 from 9e7623d1df6d3218ad53ac1742165c245a41e71f to simpleperf-releasesimpleperf-release

Change-Id: Idf0bdee9cfa18213c09b1349bd9f453a8a867c32

1 files changed, 8 insertions, 7 deletions

diff --git a/utils/src/mkdtboimg.py b/utils/src/mkdtboimg.py
index 056fb11..bc33e1f 100755
--- a/utils/src/mkdtboimg.py
+++ b/utils/src/mkdtboimg.py
@@ -18,13 +18,13 @@ from __future__ import print_function
 """Tool for packing multiple DTB/DTBO files into a single image"""
 
 import argparse
-import os
 import fnmatch
+import os
+import struct
+import zlib
 from array import array
 from collections import namedtuple
-import struct
 from sys import stdout
-import zlib
 
 class CompressionFormat(object):
     """Enum representing DT compression format for a DT entry.
@@ -897,10 +897,11 @@ def create_dtbo_image_from_config(fout, argv):
     params['version'] = version
     dt_entries = []
     for dt_arg in dt_args:
-        filepath = None
-        for root, dirnames, filenames in os.walk(args.dtbdir):
-            for filename in fnmatch.filter(filenames, dt_arg['filename']):
-                filepath = os.path.join(root, filename)
+        filepath = dt_arg['filename']
+        if not os.path.isabs(filepath):
+            for root, dirnames, filenames in os.walk(args.dtbdir):
+                for filename in fnmatch.filter(filenames, os.path.basename(filepath)):
+                    filepath = os.path.join(root, filename)
         params['dt_file'] = open(filepath, 'rb')
         params['dt_offset'] = 0
         params['dt_size'] = os.fstat(params['dt_file'].fileno()).st_size