Restructure third_party/chrome.
before adding an up-to-date version.
This is mechanical restructuring of the old version of chrome, which is
added at https://r8.googlesource.com/r8/+/86bfc83b84e221d710762cedd7a387b6fdc90895
Change-Id: I5e89697c40d13f9daa17aa02b761337362b543c8
diff --git a/.gitignore b/.gitignore
index 0a00371..40fa43c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,8 +39,8 @@
third_party/classlib
third_party/cf_segments.tar.gz
third_party/cf_segments
-third_party/chrome.tar.gz
-third_party/chrome
+third_party/chrome/chrome_180917_ffbaa8.tar.gz
+third_party/chrome/chrome_180917_ffbaa8
third_party/dart-sdk
third_party/dart-sdk.tar.gz
third_party/desugar/desugar_*/
diff --git a/third_party/chrome.tar.gz.sha1 b/third_party/chrome.tar.gz.sha1
deleted file mode 100644
index a71281e..0000000
--- a/third_party/chrome.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6123958c62f06751873d1656143a8e283f98f1cb
\ No newline at end of file
diff --git a/third_party/chrome/chrome_180917_ffbaa8.tar.gz.sha1 b/third_party/chrome/chrome_180917_ffbaa8.tar.gz.sha1
new file mode 100644
index 0000000..104ad9d
--- /dev/null
+++ b/third_party/chrome/chrome_180917_ffbaa8.tar.gz.sha1
@@ -0,0 +1 @@
+e35ecc90931db82165b96f7b5f0e1c251ebe7347
\ No newline at end of file
diff --git a/tools/chrome_data.py b/tools/chrome_data.py
index 5dcd41b..cf62ce3 100644
--- a/tools/chrome_data.py
+++ b/tools/chrome_data.py
@@ -7,6 +7,8 @@
BASE = os.path.join(utils.THIRD_PARTY, 'chrome')
+V180917_BASE = os.path.join(BASE, 'chrome_180917_ffbaa8')
+
INPUT_JARS = [
'out/Release/gen/chrome/android/monochrome_public_apk/monochrome_public_apk.jar',
'out/Release/lib.java/third_party/bazel/desugar/Desugar-runtime.jar',
@@ -236,12 +238,12 @@
]
VERSIONS = {
- 'default': {
+ '180917': {
'deploy' : {
'r8-flags': '--no-desugaring',
- 'inputs': [os.path.join(BASE, path) for path in INPUT_JARS],
- 'pgconf': [os.path.join(BASE, path) for path in PG_CONFS],
- 'libraries': [os.path.join(BASE, path) for path in LIBRARIES],
+ 'inputs': [os.path.join(V180917_BASE, path) for path in INPUT_JARS],
+ 'pgconf': [os.path.join(V180917_BASE, path) for path in PG_CONFS],
+ 'libraries': [os.path.join(V180917_BASE, path) for path in LIBRARIES],
},
},
}
diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index 4c9a844..d085653 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -250,7 +250,7 @@
options.version = options.version or '12.22'
data = youtube_data
elif options.app == 'chrome':
- options.version = options.version or 'default'
+ options.version = options.version or '180917'
data = chrome_data
elif options.app == 'gmail':
options.version = options.version or '170604.16'
