From 8bf88c8f319126520347be55342761abfba6a61a Mon Sep 17 00:00:00 2001 From: Luis Hector Chavez Date: Fri, 14 Sep 2018 16:40:56 -0700 Subject: libchrome: Use python2 for merge_srcjars This change avoids a build break in mac_sdk. Bug: None Test: m Change-Id: I658fd59bb4cec63d3aa378812db15f06b5f0284e --- Android.bp | 4 ++-- 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.""" -- cgit v1.2.3