Skip to content

Commit

Permalink
Update build rules for gyp/
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 593373857
  • Loading branch information
hiroyuki-komatsu committed Dec 24, 2023
1 parent 3a7da12 commit c048e1f
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/build_mozc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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':
Expand Down Expand Up @@ -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])
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit c048e1f

Please sign in to comment.