diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2018-09-14 16:40:56 -0700 |
|---|---|---|
| committer | Luis Hector Chavez <lhchavez@google.com> | 2018-09-14 17:42:47 -0700 |
| commit | 8bf88c8f319126520347be55342761abfba6a61a (patch) | |
| tree | ef00ddfb7c62ff036504b93f7181037b8ac6f935 | |
| parent | d958dea15649e2e146dad8cf6410eb9a3867cd05 (diff) | |
| download | libchrome-8bf88c8f319126520347be55342761abfba6a61a.tar.gz | |
libchrome: Use python2 for merge_srcjars
This change avoids a build break in mac_sdk.
Bug: None
Test: m
Change-Id: I658fd59bb4cec63d3aa378812db15f06b5f0284e
| -rw-r--r-- | Android.bp | 4 | ||||
| -rwxr-xr-x | libchrome_tools/merge_srcjars.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index 4dd1aa904e..9fd9fbda29 100644 --- a/Android.bp +++ b/Android.bp @@ -691,10 +691,10 @@ python_binary_host { srcs: ["libchrome_tools/merge_srcjars.py"], version: { py3: { - enabled: true, + enabled: false }, py2: { - enabled: false, + enabled: true, }, }, } diff --git a/libchrome_tools/merge_srcjars.py b/libchrome_tools/merge_srcjars.py index f774764087..421763ca96 100755 --- a/libchrome_tools/merge_srcjars.py +++ b/libchrome_tools/merge_srcjars.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python2 """Merges several .srcjar files.""" |