commit f663ba3e720a536eda74bc389f6612dd6415d15e
author Krzysztof Kosiński <krzysio@google.com> Thu Sep 22 07:42:04 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 22 07:42:04 2022 +0000
tree e1fb30656cf6c05c654b4fdfdd5affd69adf95b6
parent 0b643d008e19f7e68703a2e8571634d86274f093
parent 3d632e231a50332d9159b41838db0fdc2fda86fc

Disable Python 2 variant, but keep sources filegroup. am: 665a6ab3f7 am: 4cd48834ec am: 89c6609d06 am: 3a8f39dd56 am: 3d632e231a

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

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

Android.bp

diff --git a/Android.bp b/Android.bp
index c77abc6..4cb6d72 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,12 +57,6 @@
 }
 
 filegroup {
-    name: "py2_httplib2_srcs",
-    srcs: ["python2/httplib2/*.py"],
-    path: "python2/httplib2",
-}
-
-filegroup {
     name: "py3_httplib2_srcs",
     srcs: ["python3/httplib2/*.py"],
     path: "python3/httplib2",
@@ -73,14 +67,5 @@
     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"],
 }