diff --git a/vndk/tools/header-checker/utils/create_reference_dumps.py b/vndk/tools/header-checker/utils/create_reference_dumps.py
index 5e17a933d..9581438bf 100755
--- a/vndk/tools/header-checker/utils/create_reference_dumps.py
+++ b/vndk/tools/header-checker/utils/create_reference_dumps.py
@@ -14,7 +14,6 @@ from utils import (make_libraries, make_tree, find_lib_lsdumps,
                    make_targets)
 
 PRODUCTS = ['aosp_arm_ab', 'aosp_arm64_ab', 'aosp_x86_ab', 'aosp_x86_64_ab']
-FIND_LSDUMPS_TARGET = 'findlsdumps'
 SOONG_DIR = os.path.join(AOSP_DIR, 'out', 'soong', '.intermediates')
 
 class Target(object):
@@ -41,8 +40,7 @@ def get_lsdump_paths_from_out(product):
     lsdump_paths_file = os.path.join(AOSP_DIR, build_vars[0],'target',
                                      'product', build_vars[1],
                                      'lsdump_paths.txt')
-    if os.path.exists(lsdump_paths_file) == False:
-        make_targets([FIND_LSDUMPS_TARGET], product)
+    assert(os.path.exists(lsdump_paths_file) == True)
     lsdump_paths = dict()
     with open(lsdump_paths_file) as f:
         for path in f.read().split(' '):
diff --git a/vndk/tools/header-checker/utils/utils.py b/vndk/tools/header-checker/utils/utils.py
index 155a6cc6e..e37134d07 100644
--- a/vndk/tools/header-checker/utils/utils.py
+++ b/vndk/tools/header-checker/utils/utils.py
@@ -125,7 +125,7 @@ def run_header_abi_linker(output_path, inputs, version_script, api, arch):
 def make_tree(product):
     # To aid creation of reference dumps.
     make_cmd = ['build/soong/soong_ui.bash', '--make-mode', '-j',
-                'vndk', 'TARGET_PRODUCT=' + product]
+                'vndk', 'findlsdumps', 'TARGET_PRODUCT=' + product]
     subprocess.check_call(make_cmd, cwd=AOSP_DIR)
 
 def make_targets(targets, product):