Revert "Disable unused Python 2 variant." am: 67a38f85db am: cd9865963a am: d4f2ca46c9 am: 9235a0fde4 am: fd69d4f929

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

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

1 files changed, 22 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 32aafcd..c77abc6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,10 +56,31 @@ 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"],
+    path: "python3/httplib2",
+}
+
 python_library {
     name: "py-httplib2",
     host_supported: true,
     data: [":cacert_data"],
     pkg_path: "httplib2",
-    srcs: ["python3/httplib2/*.py"],
+    version: {
+          py2: {
+              enabled: true,
+              srcs: [":py2_httplib2_srcs"],
+          },
+          py3: {
+              enabled: true,
+              srcs: [":py3_httplib2_srcs"],
+          },
+    },
 }