From c048e1fff6e84d1841c972a470d27ebac3f3f1c7 Mon Sep 17 00:00:00 2001 From: Hiroyuki Komatsu Date: Sun, 24 Dec 2023 05:27:16 +0000 Subject: [PATCH] Update build rules for `gyp/` PiperOrigin-RevId: 593373857 --- src/build_mozc.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/build_mozc.py b/src/build_mozc.py index 3e82a064d..fe30f3fc9 100755 --- a/src/build_mozc.py +++ b/src/build_mozc.py @@ -153,11 +153,11 @@ def GetGypFileNames(options): glob.glob('%s/data/test/session/scenario/*/*.gyp' % OSS_SRC_DIR) ) # Include subdirectories of data_manager - gyp_file_names.extend(glob.glob('%s/data_manager/*/*.gyp' % SRC_DIR)) + gyp_file_names.extend(glob.glob('%s/data_manager/*/*.gyp' % OSS_SRC_DIR)) # Include subdirectory of dictionary - gyp_file_names.extend(glob.glob('%s/dictionary/*/*.gyp' % SRC_DIR)) + gyp_file_names.extend(glob.glob('%s/dictionary/*/*.gyp' % OSS_SRC_DIR)) # Include subdirectory of rewriter - gyp_file_names.extend(glob.glob('%s/rewriter/*/*.gyp' % SRC_DIR)) + gyp_file_names.extend(glob.glob('%s/rewriter/*/*.gyp' % OSS_SRC_DIR)) # Include subdirectory of win32 and breakpad for Windows if options.target_platform == 'Windows': gyp_file_names.extend(glob.glob('%s/win32/*/*.gyp' % OSS_SRC_DIR)) @@ -298,7 +298,7 @@ def ExpandMetaTarget(options, meta_target_name): if target_platform == 'Linux': targets = [ - SRC_DIR + '/server/server.gyp:mozc_server', + OSS_SRC_DIR + '/server/server.gyp:mozc_server', OSS_SRC_DIR + '/gui/gui.gyp:mozc_tool', ] elif target_platform == 'Mac': @@ -453,9 +453,9 @@ def GypMain(options, unused_args): logging.info('Building GYP command line...') gyp_options = ['--depth=.'] if target_platform == 'Windows': - gyp_options.extend(['--include=%s/gyp/common_win.gypi' % SRC_DIR]) + gyp_options.extend(['--include=%s/gyp/common_win.gypi' % OSS_SRC_DIR]) else: - gyp_options.extend(['--include=%s/gyp/common.gypi' % SRC_DIR]) + gyp_options.extend(['--include=%s/gyp/common.gypi' % OSS_SRC_DIR]) gyp_options.extend(['-D', 'abs_depth=%s' % MOZC_ROOT]) gyp_options.extend(['-D', 'ext_third_party_dir=%s' % EXT_THIRD_PARTY_DIR]) @@ -803,7 +803,7 @@ def RunTestsMain(options, args): if target_platform == 'Windows': targets.append('out_win/%sDynamic_x64:unittests' % options.configuration) else: - targets.append('%s/gyp/tests.gyp:unittests' % SRC_DIR) + targets.append('%s/gyp/tests.gyp:unittests' % OSS_SRC_DIR) # Build the test targets (build_opts, build_args) = ParseBuildOptions(build_options + targets)