commit e2b72e6bb2d6fc078f5d307eace67150907ecd7f
author Yi Kong <yikong@google.com> Mon Aug 29 21:01:47 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 29 21:01:47 2022 +0000
tree a3a09aedba467a8b2cc1b899937c33e10f14fd29
parent 21434b561bed1bdb9cffb7975c3039d16de179ce
parent 71db7674f98154aa802f6b644423199894041afa

Build cpython with venv PIP support am: 0a056b8eab am: 6b19f9b8d7 am: b4d171af16 am: 71db7674f9

Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2200355

Change-Id: I11225a23cb321ad0fcb21375423c2b7eb4efba7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

kokoro/build.py

diff --git a/kokoro/build.py b/kokoro/build.py
index cde1a8d..86080a8 100755
--- a/kokoro/build.py
+++ b/kokoro/build.py
@@ -42,6 +42,7 @@
         os.path.join(python_src, 'configure'),
         '--prefix={}'.format(install_dir),
         '--enable-shared',
+        '--with-ensurepip=install',
     ]
     env = dict(os.environ)
     if host == Host.Darwin:
@@ -136,8 +137,6 @@
       "tkinter", "turtledemo",
       # IDLE_DIRS_ONLY
       "idlelib",
-      # VENV_DIRS_ONLY
-      "ensurepip",
       # TCLTK_FILES_ONLY
       "turtle.py",
       # BDIST_WININST_FILES_ONLY