From 665a6ab3f7ff69213052fe2d02f40a91114a559d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Tue, 20 Sep 2022 20:12:38 +0000 Subject: Disable Python 2 variant, but keep sources filegroup. The 'path' attribute affects the import path in Python. The change that removed it, aosp/2221331, appears to have accidentally moved the entire content of the module to httplib2.python3.httplib2. Bug: 245854393 Test: presubmit Change-Id: Ib518cb8668fc4c90e85f895d1cb45c1cffc8b42d --- Android.bp | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/Android.bp b/Android.bp index c77abc6..4cb6d72 100644 --- a/Android.bp +++ b/Android.bp @@ -56,12 +56,6 @@ filegroup { path: "python3/httplib2", } -filegroup { - name: "py2_httplib2_srcs", - srcs: ["python2/httplib2/*.py"], - path: "python2/httplib2", -} - filegroup { name: "py3_httplib2_srcs", srcs: ["python3/httplib2/*.py"], @@ -73,14 +67,5 @@ python_library { host_supported: true, data: [":cacert_data"], pkg_path: "httplib2", - version: { - py2: { - enabled: true, - srcs: [":py2_httplib2_srcs"], - }, - py3: { - enabled: true, - srcs: [":py3_httplib2_srcs"], - }, - }, + srcs: [":py3_httplib2_srcs"], } -- cgit v1.2.3