gclient: fix patch_project handling for the recipe engine

recipe_modules/gclient/config.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import types
 
 from recipe_engine.config import config_item_context, ConfigGroup, BadConf
 from recipe_engine.config import ConfigList, Dict, Single, Static, Set, List
 
 from . import api as gclient_api
@@ skipping 546 matching lines @@
 
 @config_ctx(config_vars={'GIT_MODE': True})
 def infra(c):
   soln = c.solutions.add()
   soln.name = 'infra'
   soln.url = 'https://chromium.googlesource.com/infra/infra.git'
   c.got_revision_mapping['infra'] = 'got_revision'
 
   p = c.patch_projects
   p['luci-py'] = ('infra/luci', 'HEAD')
+  # TODO(phajdan.jr): remove recipes-py when it's not used for project name.
   p['recipes-py'] = ('infra/recipes-py', 'HEAD')
+  p['recipe_engine'] = ('infra/recipes-py', 'HEAD')
 
 @config_ctx(config_vars={'GIT_MODE': True})
 def infra_internal(c):  # pragma: no cover
   soln = c.solutions.add()
   soln.name = 'infra_internal'
   soln.url = 'https://chrome-internal.googlesource.com/infra/infra_internal.git'
   c.got_revision_mapping['infra_internal'] = 'got_revision'
 
 @config_ctx(includes=['infra'])
 def luci_gae(c):
@@ skipping 103 matching lines @@
   soln = c.solutions.add()
   soln.name = 'gerrit-test-cq-normal'
   soln.url = 'https://chromium.googlesource.com/playground/gerrit-cq/normal.git'
 
 # TODO(phajdan.jr): Move to proper repo and add coverage.
 @config_ctx()
 def valgrind(c):  # pragma: no cover
   """Add Valgrind binaries to the gclient solution."""
   c.solutions[0].custom_deps['src/third_party/valgrind'] = \
     ChromiumGitURL(c, 'chromium', 'deps', 'valgrind', 'binaries')