Install httpd-php to third_party/apache_mac

Also set up the path to httpd and config file properly.

We continue to use system httpd for mac10.12 and mac10.13,
as the 3pp htppd is built targeting newer version of Mac.

Bug: 1190885
Change-Id: If1e5264d26bcf384cb02e23facbd09fc9b33a2a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3524265
Reviewed-by: Nico Weber <[email protected]>
Commit-Queue: Weizhong Xia <[email protected]>
Cr-Commit-Position: refs/heads/main@{#981444}

Author: WeizhongX

BUILD.gn

@@ -1187,6 +1187,10 @@ if (!is_ios) {
       data_deps += [ "//build/win:copy_cdb_to_output" ]
     }
 
+    if (is_mac) {
+      data += [ "//third_party/apache-mac/" ]
+    }
+
     if (is_android) {
       data += [
         "//third_party/catapult/",

DEPS

@@ -524,6 +524,17 @@ deps = {
     'condition': '(host_os == "linux")',
   },
 
+  'src/third_party/apache-mac': {
+    'packages': [
+      {
+        'package': 'infra/3pp/tools/httpd-php/${{platform}}',
+        'version': 'version:[email protected]',
+      },
+    ],
+    'dep_type': 'cipd',
+    'condition': '(host_os == "mac")',
+  },
+
   'src/android_webview/tools/cts_archive': {
       'packages': [
           {

third_party/.gitignore

@@ -28,6 +28,10 @@
 /androidx/libs/
 /angle
 /angle_dx11
+/apache-mac/LICENSE
+/apache-mac/bin/*
+/apache-mac/lib/*
+/apache-mac/libexec/*
 /apache-portable-runtime/src
 /apache-win32/bin/*.exe
 /apache-win32/bin/*.dll

third_party/blink/tools/apache_config/apache2-httpd-2.4-prefork.conf

@@ -65,14 +65,6 @@ def __init__(self, sys_module, platform_module, filesystem_module,
     def is_mac(self):
         return self.os_name == 'mac'
 
-    def is_mac_monterey(self):
-        if not self.is_mac():
-            return False
-
-        command = ['sw_vers', '-productVersion']
-        version = self._executive.run_command(command).strip()
-        return version.startswith('12.')
-
     def is_win(self):
         return self.os_name == 'win'
 

third_party/blink/tools/blinkpy/common/system/platform_info.py

@@ -45,9 +45,6 @@ def __init__(self,
     def is_mac(self):
         return self.os_name == 'mac'
 
-    def is_mac_monterey(self):
-        return False
-
     def is_linux(self):
         return self.os_name == 'linux'
 

third_party/blink/tools/blinkpy/common/system/platform_info_mock.py

@@ -108,21 +108,19 @@ def operating_system(self):
     #
 
     def path_to_apache(self):
-        return '/usr/sbin/httpd'
+        # use system httpd on mac10.12, mac10.13. The httpd from cipd does not work on
+        # these platforms as that is compiled toward newer version of mac.
+        if self.host.platform.os_version in ['mac10.12', 'mac10.13']:
+            return '/usr/sbin/httpd'
+        return self._path_from_chromium_base(
+            'third_party', 'apache-mac', 'bin', 'httpd')
 
     def path_to_apache_config_file(self):
-        # TODO(crbug.com/1190885): Workaround for Monterey, should be reverted
-        # once we build chromium specific httpd.
-        if self.host.platform.is_mac_monterey():
-            config_file_name = "apache2-httpd-2.4-prefork.conf"
-            return self._filesystem.join(self.apache_config_directory(), config_file_name)
-
-        config_file_basename = 'apache2-httpd-' + self._apache_version()
-        if self.host.platform.os_version not in ['mac10.12']:
-            config_file_basename += '-php7'
-            if self.host.platform.os_version not in ['mac10.13', 'mac10.14']:
-                config_file_basename += '-prefork'
-        return self._filesystem.join(self.apache_config_directory(), config_file_basename + '.conf')
+        if self.host.platform.os_version in ['mac10.12']:
+            config_file_basename = 'apache2-httpd-%s.conf' % (self._apache_version(),)
+        else:
+            config_file_basename = 'apache2-httpd-%s-php7.conf' % (self._apache_version(),)
+        return self._filesystem.join(self.apache_config_directory(), config_file_basename)
 
     def _path_to_driver(self, target=None):
         return self._build_path_with_target(target,

third_party/blink/tools/blinkpy/web_tests/port/mac.py

@@ -77,11 +77,3 @@ def test_path_to_apache_config_file_on_10_13(self):
             port.path_to_apache_config_file(),
             '/mock-checkout/third_party/blink/tools/apache_config/apache2-httpd-2.4-php7.conf'
         )
-
-    def test_path_to_apache_config_file_on_10_15(self):
-        port = self.make_port(os_version='mac10.15', port_name='mac')
-        port._apache_version = lambda: '2.4'  # pylint: disable=protected-access
-        self.assertEqual(
-            port.path_to_apache_config_file(),
-            '/mock-checkout/third_party/blink/tools/apache_config/apache2-httpd-2.4-php7-prefork.conf'
-        )

third_party/blink/tools/blinkpy/web_tests/port/mac_unittest.py

@@ -121,13 +121,11 @@ def __init__(self, port_obj, output_dir, additional_dirs,
             '-c', 'TypesConfig "%s"' % mime_types_path,
             '-c', 'CustomLog "%s" common' % self._access_log_path,
             '-c', 'ErrorLog "%s"' % self._error_log_path,
+            '-c', 'PHPINIDir "%s"' % php_ini_dir,
             '-c', 'PidFile %s' % self._pid_file,
             '-c', 'SSLCertificateFile "%s"' % cert_file,
             '-c', 'DefaultType None',
         ]
-        if not self._port_obj.host.platform.is_mac_monterey():
-            start_cmd += ['-c', 'PHPINIDir "%s"' % php_ini_dir]
-
         # yapf: enable
 
         if self._is_win: