commit 6238f22027b84cab640c59288b9513d26217faab
author Rico Wind <ricow@google.com> Wed Oct 03 10:36:10 2018 +0200
committer Rico Wind <ricow@google.com> Wed Oct 03 10:36:10 2018 +0200
tree 4a411d12536d47e7db2521434fd3287c8006631c
parent a9111294bee6f8ed617af412c85fd23c7309a3fd

Simplify app data files

Use utils.THIRD_PARTY and utils.get_android_jar

Change-Id: Ie6fd234b5cee27b1ab73da18e87ec9de930aeadb

tools/gmail_data.py

diff --git a/tools/gmail_data.py b/tools/gmail_data.py
index ba95450..5149389 100644
--- a/tools/gmail_data.py
+++ b/tools/gmail_data.py
@@ -6,9 +6,8 @@
 import os
 import utils
 
-THIRD_PARTY = os.path.join(utils.REPO_ROOT, 'third_party')
 ANDROID_L_API = '21'
-BASE = os.path.join(THIRD_PARTY, 'gmail')
+BASE = os.path.join(utils.THIRD_PARTY, 'gmail')
 
 V170604_16_BASE = os.path.join(BASE, 'gmail_android_170604.16')
 V170604_16_PREFIX = os.path.join(V170604_16_BASE, 'Gmail_release_unstripped')
@@ -17,7 +16,7 @@
 V180826_15_PREFIX = os.path.join(V180826_15_BASE, 'Gmail_release_unstripped')
 
 # NOTE: We always use android.jar for SDK v25 for now.
-ANDROID_JAR = os.path.join(THIRD_PARTY, 'android_jar', 'lib-v25', 'android.jar')
+ANDROID_JAR = utils.get_android_jar(25)
 
 VERSIONS = {
   '170604.16': {
@@ -48,7 +47,7 @@
       'inputs': ['%s_deploy.jar' % V180826_15_PREFIX],
       'pgconf': [
           '%s_proguard.config' % V180826_15_PREFIX,
-          '%s/proguardsettings/Gmail_proguard.config' % THIRD_PARTY],
+          '%s/proguardsettings/Gmail_proguard.config' % utils.THIRD_PARTY],
       'min-api' : ANDROID_L_API,
     },
     'proguarded' : {