Remove gmscore v4 to v9
Change-Id: I043d6dc5c6764fab824f6c5864df7ef78d283325
diff --git a/build.gradle b/build.gradle
index 5220ac2..8e20e6d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -428,13 +428,7 @@
"gmail/gmail_android_170604.16",
"gmail/gmail_android_180826.15",
"gmscore/gmscore_v10",
- "gmscore/gmscore_v9",
"gmscore/latest",
- "gmscore/v4",
- "gmscore/v5",
- "gmscore/v6",
- "gmscore/v7",
- "gmscore/v8",
"nest/nest_20180926_7c6cfb",
"proguard/proguard_internal_159423826",
"proguardsettings",
diff --git a/third_party/gmscore/gmscore_v9.tar.gz.sha1 b/third_party/gmscore/gmscore_v9.tar.gz.sha1
deleted file mode 100644
index 5983b5b..0000000
--- a/third_party/gmscore/gmscore_v9.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0066065faeb293c5a850d3319f2cb8a48d1e760d
\ No newline at end of file
diff --git a/third_party/gmscore/v4.tar.gz.sha1 b/third_party/gmscore/v4.tar.gz.sha1
deleted file mode 100644
index e4747ae..0000000
--- a/third_party/gmscore/v4.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2330b38e52fc7cfe78c6aa94ae497a0b1a42b9a2
\ No newline at end of file
diff --git a/third_party/gmscore/v5.tar.gz.sha1 b/third_party/gmscore/v5.tar.gz.sha1
deleted file mode 100644
index 8ca5043..0000000
--- a/third_party/gmscore/v5.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c96d3360ba55718eca7d9c7ac9edb801a2ed4cc5
\ No newline at end of file
diff --git a/third_party/gmscore/v6.tar.gz.sha1 b/third_party/gmscore/v6.tar.gz.sha1
deleted file mode 100644
index 6cca80b..0000000
--- a/third_party/gmscore/v6.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-05eaeaa62842453108ca7191595801bb52e24861
\ No newline at end of file
diff --git a/third_party/gmscore/v7.tar.gz.sha1 b/third_party/gmscore/v7.tar.gz.sha1
deleted file mode 100644
index 502e1cf..0000000
--- a/third_party/gmscore/v7.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-01da4f538ff748867d7fa9a7a9ba262d8aa62922
\ No newline at end of file
diff --git a/third_party/gmscore/v8.tar.gz.sha1 b/third_party/gmscore/v8.tar.gz.sha1
deleted file mode 100644
index 9eab429..0000000
--- a/third_party/gmscore/v8.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ee245a82b2470a1c60ac7fa085d2b5ce2101a3da
\ No newline at end of file
diff --git a/tools/gmscore_data.py b/tools/gmscore_data.py
index bef5ba3..95ee0bb 100644
--- a/tools/gmscore_data.py
+++ b/tools/gmscore_data.py
@@ -6,89 +6,18 @@
import os
import utils
+ANDROID_L_API = '21'
BASE = os.path.join(utils.THIRD_PARTY, 'gmscore')
-V4_BASE = os.path.join(BASE, 'v4')
-V5_BASE = os.path.join(BASE, 'v5')
-V6_BASE = os.path.join(BASE, 'v6')
-V7_BASE = os.path.join(BASE, 'v7')
-V8_BASE = os.path.join(BASE, 'v8')
-
-V9_BASE = os.path.join(BASE, 'gmscore_v9')
-V9_PREFIX = os.path.join(V9_BASE, 'GmsCore_prod_alldpi_release_all_locales')
-
V10_BASE = os.path.join(BASE, 'gmscore_v10')
V10_PREFIX = os.path.join(V10_BASE, 'GmsCore_prod_alldpi_release_all_locales')
LATEST_BASE = os.path.join(BASE, 'latest')
LATEST_PREFIX = os.path.join(LATEST_BASE, 'GmsCore_prod_alldpi_release_all_locales')
-ANDROID_L_API = '21'
-# NOTE: we always use android.jar for SDK v25, later we might want to revise it
-# to use proper android.jar version for each of gmscore version separately.
-ANDROID_JAR = utils.get_android_jar(25)
+LATEST_VERSION = 'latest'
VERSIONS = {
- 'v4': {
- 'dex' : {
- 'inputs' : glob.glob(os.path.join(V4_BASE, '*.dex')),
- 'pgmap' : os.path.join(V4_BASE, 'proguard.map'),
- 'libraries' : [ANDROID_JAR],
- 'min-api' : ANDROID_L_API,
- }
- },
- 'v5': {
- 'dex' : {
- 'inputs' : glob.glob(os.path.join(V5_BASE, '*.dex')),
- 'pgmap' : os.path.join(V5_BASE, 'proguard.map'),
- 'libraries' : [ANDROID_JAR],
- 'min-api' : ANDROID_L_API,
- }
- },
- 'v6': {
- 'dex' : {
- 'inputs' : glob.glob(os.path.join(V6_BASE, '*.dex')),
- 'pgmap' : os.path.join(V6_BASE, 'proguard.map'),
- 'libraries' : [ANDROID_JAR],
- 'min-api' : ANDROID_L_API,
- }
- },
- 'v7': {
- 'dex' : {
- 'inputs' : glob.glob(os.path.join(V7_BASE, '*.dex')),
- 'pgmap' : os.path.join(V7_BASE, 'proguard.map'),
- 'libraries' : [ANDROID_JAR],
- 'min-api' : ANDROID_L_API,
- }
- },
- 'v8': {
- 'dex' : {
- 'inputs' : glob.glob(os.path.join(V8_BASE, '*.dex')),
- 'pgmap' : os.path.join(V8_BASE, 'proguard.map'),
- 'libraries' : [ANDROID_JAR],
- 'min-api' : ANDROID_L_API,
- }
- },
- 'v9': {
- 'dex' : {
- 'flags': '--no-desugaring',
- 'inputs': [os.path.join(V9_BASE, 'armv7_GmsCore_prod_alldpi_release.apk')],
- 'main-dex-list': os.path.join(V9_BASE, 'main_dex_list.txt'),
- 'pgmap': '%s_proguard.map' % V9_PREFIX,
- },
- 'deploy' : {
- 'pgconf': ['%s_proguard.config' % V9_PREFIX,
- utils.IGNORE_WARNINGS_RULES],
- 'inputs': ['%s_deploy.jar' % V9_PREFIX],
- 'min-api' : ANDROID_L_API,
- },
- 'proguarded' : {
- 'flags': '--no-desugaring',
- 'inputs': ['%s_proguard.jar' % V9_PREFIX],
- 'main-dex-list': os.path.join(V9_BASE, 'main_dex_list.txt'),
- 'pgmap': '%s_proguard.map' % V9_PREFIX,
- }
- },
'v10': {
'dex' : {
'flags': '--no-desugaring',
diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index c775aa0..cdceb6b 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -390,7 +390,7 @@
def get_version_and_data(options):
if options.app == 'gmscore':
- version = options.version or 'v9'
+ version = options.version or gmscore_data.LATEST_VERSION
data = gmscore_data
elif options.app == 'nest':
version = options.version or '20180926'
