Skip to content

Commit

Permalink
Remove src/ios/ios.gyp
Browse files Browse the repository at this point in the history
Use bazel to built ios_engine.

#codehealth

PiperOrigin-RevId: 552057044
  • Loading branch information
yukawa authored and hiroyuki-komatsu committed Jul 29, 2023
1 parent 1c3908d commit dbe6797
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 235 deletions.
27 changes: 0 additions & 27 deletions src/build_mozc.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ def GetBuildShortBaseName(target_platform):
'Windows': 'out_win',
'Mac': 'out_mac',
'Linux': 'out_linux',
'iOS': 'out_ios',
}

if target_platform not in platform_dict:
Expand Down Expand Up @@ -658,28 +657,6 @@ def RunTest(binary_path, output_dir, options):
RemoveFile(tmp_xml_path)


def RunTestOnIos(binary_path, output_dir, _):
"""Run test with options.
Args:
binary_path: The path of unittest.
output_dir: The directory of output results.
_: Unused arg for the compatibility with RunTest.
"""
iossim = '%s/third_party/iossim/iossim' % MOZC_ROOT
binary_filename = os.path.basename(binary_path)
tmp_xml_path = os.path.join(output_dir, '%s.xml.running' % binary_filename)
env_options = [
'-e', 'GUNIT_OUTPUT=xml:%s' % tmp_xml_path,
'-e', 'GTEST_OUTPUT=xml:%s' % tmp_xml_path,
]
RunOrDie([iossim] + env_options + [binary_path])

xml_path = os.path.join(output_dir, '%s.xml' % binary_filename)
CopyFile(tmp_xml_path, xml_path)
RemoveFile(tmp_xml_path)


def RunTests(target_platform, configuration, parallel_num):
"""Run built tests actually.
Expand Down Expand Up @@ -711,10 +688,6 @@ def RunTests(target_platform, configuration, parallel_num):
test_function = RunTest
if target_platform == 'Windows':
executable_suffix = '.exe'
elif target_platform == 'iOS':
executable_suffix = '.app'
test_function = RunTestOnIos
parallel_num = 1

test_binaries = glob.glob(
os.path.join(base_path, '*_test' + executable_suffix))
Expand Down
38 changes: 0 additions & 38 deletions src/gyp/common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@
'mac_sdk%': '13.0',
'mac_deployment_target%': '10.9',

# Flag to specify if the build target is for simulator or not.
# This is used for iOS simulator so far.
'simulator_build%': '0',

# 'conditions' is put inside of 'variables' so that we can use
# another 'conditions' in this gyp element level later. Note that
# you can have only one 'conditions' in a gyp element.
Expand Down Expand Up @@ -258,40 +254,6 @@
['LDPLUSPLUS', '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++'],
],
'conditions': [
['target_platform=="iOS"', {
'target_conditions': [
['_toolset=="target"', {
# OS_IOS and __APPLE__ should be exclusive
# when iOS is fully supported.
'defines': ['OS_IOS'],
'xcode_settings': {
'SDKROOT': 'iphoneos',
'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
},
}],
['_toolset=="host"', {
'xcode_settings': {
# TODO(komatsu): If it is possible to remove the setting of
# MACOSX_DEPLOYMENT_TARGET when _toolset is "target"
# we should do it rather than setting it here and the
# next condition.
'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)',
},
}],
],
'link_settings': {
'target_conditions': [
['_toolset=="target"', {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
],
'libraries!': [
'$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
],
}],
],
},
}],
['target_platform=="Mac"', {
'xcode_settings': {
'ARCHS': ['x86_64'],
Expand Down
8 changes: 0 additions & 8 deletions src/gyp/tests.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,6 @@
'../mac/mac.gyp:mac_all_test',
],
}],
['target_platform=="iOS"', {
'dependencies!': [
'../client/client_test.gyp:client_all_test',
'../gui/gui.gyp:gui_all_test',
'../ipc/ipc.gyp:ipc_all_test',
'../renderer/renderer.gyp:renderer_all_test',
],
}],
['target_platform=="Linux"', {
'dependencies': [
'../unix/emacs/emacs.gyp:emacs_all_test',
Expand Down
162 changes: 0 additions & 162 deletions src/ios/ios.gyp

This file was deleted.

0 comments on commit dbe6797

Please sign in to comment.