From f87c311246a5346142b0d0f6557e806649c89cf8 Mon Sep 17 00:00:00 2001
From: Hiroyuki Komatsu <komatsu@google.com>
Date: Tue, 23 Apr 2024 02:01:00 +0000
Subject: [PATCH] Remove intermediate codesign tasks.

* The codesign is done at the end of the build process anyway.
* It caused the build error with the notarization script.

#codehealth

PiperOrigin-RevId: 627226624
---
 src/mac/codesign_mac.gypi | 56 ---------------------------------------
 src/mac/mac.gyp           |  4 ---
 2 files changed, 60 deletions(-)
 delete mode 100644 src/mac/codesign_mac.gypi

diff --git a/src/mac/codesign_mac.gypi b/src/mac/codesign_mac.gypi
deleted file mode 100644
index 71f987b09..000000000
--- a/src/mac/codesign_mac.gypi
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2010-2021, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-{
-  'type': 'none',
-  'actions': [
-    {
-      'action_name': 'code_signing',
-      'inputs': [
-        # Though Ninja requires the rule to generate files in inputs,
-        # it does not catch files under directories to be copied.
-        # (See: mac/mac.gyp > GoogleJapaneseInput > copies)
-        # The dependencies can be managed by the 'dependencies'
-        # variable in any case.
-        # TODO(komatsu): Enable to handle dependencies with Ninja.
-        # '<(app_path)/Contents/MacOS/<(package_name)',
-      ],
-      'outputs': [
-        '<(app_path)/Contents/_CodeSignature/CodeResources',
-      ],
-      'action': [
-        '<(python)', '<(mozc_oss_src_dir)/build_tools/codesign_mac.py',
-        '--target', '<(app_path)',
-        # This keychain is for testing. In the release build environment,
-        # the keychain is replaced with the official keychain in the script.
-        '--keychain', '<(DEPTH)/mac/MacSigning.keychain',
-      ]
-    },
-  ],
-}
diff --git a/src/mac/mac.gyp b/src/mac/mac.gyp
index 1c06b702a..9dfa2fd69 100644
--- a/src/mac/mac.gyp
+++ b/src/mac/mac.gyp
@@ -518,10 +518,6 @@
             ['branding=="GoogleJapaneseInput"', {
               'dependencies': [
                 'DevConfirmPane',
-                # Skip the intermediate codesigns since the codesign_DiskImage
-                # target performs the codesign later.
-                # TODO(b/332803337): Remove the rules after the confirmation.
-                # 'codesign_client',
               ],
             }],
           ],