commit 287c186152d685b384b3fe1eb267c521ac4adbfa
author Christoffer Quist Adamsen <christofferqa@google.com> Wed May 20 15:51:12 2020 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed May 27 07:34:25 2020 +0000
tree 134b710c56d405d321097360e99c26b91697fd1e
parent 642f331ccc461924d7758d95b992e970e32564df

Add MonochromePublic.minimal.apks to continuous testing

Change-Id: Ic086f80dc47fa3f51f44d63abf263f71b4853921

build.gradle

diff --git a/build.gradle b/build.gradle
index 338df88..cec21ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -404,6 +404,7 @@
         "benchmarks/kotlin-benches",
         "chrome/chrome_180917_ffbaa8",
         "chrome/chrome_200430",
+        "chrome/monochrome_public_minimal_apks/chrome_200520",
         "classlib",
         "cf_segments",
         "desugar/desugar_20180308",

third_party/chrome/monochrome_public_minimal_apks/chrome_200520.tar.gz.sha1

diff --git a/third_party/chrome/monochrome_public_minimal_apks/chrome_200520.tar.gz.sha1 b/third_party/chrome/monochrome_public_minimal_apks/chrome_200520.tar.gz.sha1
new file mode 100644
index 0000000..a4d4e8f
--- /dev/null
+++ b/third_party/chrome/monochrome_public_minimal_apks/chrome_200520.tar.gz.sha1
@@ -0,0 +1 @@
+4a9de4ba961c2f0c953c0a88675f29959e8602a7
\ No newline at end of file

tools/chrome_data.py

diff --git a/tools/chrome_data.py b/tools/chrome_data.py
index 81f2fc7..20ddb21 100644
--- a/tools/chrome_data.py
+++ b/tools/chrome_data.py
@@ -10,6 +10,8 @@
 
 V180917_BASE = os.path.join(BASE, 'chrome_180917_ffbaa8')
 V200430_BASE = os.path.join(BASE, 'chrome_200430')
+V200520_MINIMAL_BASE = os.path.join(
+    BASE, 'monochrome_public_minimal_apks', 'chrome_200520')
 
 INPUT_JARS = [
     'out/Release/gen/chrome/android/monochrome_public_apk/monochrome_public_apk.jar',
@@ -256,4 +258,22 @@
         'min-api': ANDROID_N_API
     },
   },
+  '200520-monochrome_public_minimal_apks': {
+    'deploy' : {
+        'inputs': [os.path.join(V200520_MINIMAL_BASE, 'program.jar')],
+        'features': [
+            { 'inputs': [os.path.join(V200520_MINIMAL_BASE, 'feature-1.jar')] },
+            { 'inputs': [os.path.join(V200520_MINIMAL_BASE, 'feature-2.jar')] },
+            { 'inputs': [os.path.join(V200520_MINIMAL_BASE, 'feature-3.jar')] },
+            { 'inputs': [os.path.join(V200520_MINIMAL_BASE, 'feature-4.jar')] },
+            { 'inputs': [os.path.join(V200520_MINIMAL_BASE, 'feature-5.jar')] },
+            { 'inputs': [os.path.join(V200520_MINIMAL_BASE, 'feature-6.jar')] },
+            { 'inputs': [os.path.join(V200520_MINIMAL_BASE, 'feature-7.jar')] },
+            { 'inputs': [os.path.join(V200520_MINIMAL_BASE, 'feature-8.jar')] }
+        ],
+        'pgconf': [os.path.join(V200520_MINIMAL_BASE, 'proguard.config')],
+        'libraries': [os.path.join(V200520_MINIMAL_BASE, 'library.jar')],
+        'min-api': ANDROID_N_API
+    },
+  },
 }

tools/run_on_app.py

diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index 809a1fe..4125f84 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -565,6 +565,13 @@
   if options.r8_flags:
     args.extend(options.r8_flags.split(' '))
 
+  # Feature jars.
+  features = values['features'] if 'features' in values else []
+  for i, feature in enumerate(features, start=1):
+    feature_out = os.path.join(outdir, 'feature-%d.zip' % i)
+    for feature_jar in feature['inputs']:
+      args.extend(['--feature', feature_jar, feature_out])
+
   args.extend(inputs)
 
   t0 = time.time()