commit 2a82d3099c5171c1d43412ce5a9908323f99059f
author chojoyce <chojoyce@google.com> Tue Dec 24 18:13:36 2019 +0800
committer chojoyce <chojoyce@google.com> Tue Apr 07 16:10:45 2020 +0800
tree 50cf4ac39d927bf150b734c77f63fee4f8ee57ad
parent b1defa5bdacc944ae9862a200b4411ea64981941

acloud: fix py3 3rd_party compatible issues: ModuleNotFoundError: No module named 'http.client'

1 do sys.path.insert(0, /usr/lib/python3.X) while running in python3.
2 pyopenssl doesn't work in python3, so move into version py2.
3 replace import httplib as import six.moves.http_client.

BUG: 137195528
BUG: 144743252
Test: acloud-dev create
acloud-dev create --local-instance
acloud-dev create --local-instance --local-image
acloud-dev create --local-image

Change-Id: I5237da4a46fb7af43bfe4f3006a690de08b628b5

Android.bp

diff --git a/Android.bp b/Android.bp
index b211ee7..0e9b215 100644
--- a/Android.bp
+++ b/Android.bp
@@ -19,6 +19,9 @@
         py2: {
             enabled: true,
             embedded_launcher: false,
+            libs: [
+                "py-pyopenssl",
+            ]
         },
         py3: {
             enabled: false,
@@ -56,7 +59,6 @@
         "py-dateutil",
         "py-google-api-python-client",
         "py-oauth2client",
-        "py-pyopenssl",
         "py-six",
     ],
     dist: {