Add -ignorewarnings to run_on_app.py tests
Change-Id: I1058f3b4fbe941b197198dd2771c6d84bba0c87a
diff --git a/third_party/gmscore/ignorewarnings.rules b/src/test/ignorewarnings.rules
similarity index 100%
rename from third_party/gmscore/ignorewarnings.rules
rename to src/test/ignorewarnings.rules
diff --git a/tools/chrome_data.py b/tools/chrome_data.py
index 20ddb21..7649257 100644
--- a/tools/chrome_data.py
+++ b/tools/chrome_data.py
@@ -271,7 +271,8 @@
{ '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')],
+ 'pgconf': [os.path.join(V200520_MINIMAL_BASE, 'proguard.config'),
+ utils.IGNORE_WARNINGS_RULES],
'libraries': [os.path.join(V200520_MINIMAL_BASE, 'library.jar')],
'min-api': ANDROID_N_API
},
diff --git a/tools/gmail_data.py b/tools/gmail_data.py
index 4683458..4d1b250 100644
--- a/tools/gmail_data.py
+++ b/tools/gmail_data.py
@@ -27,7 +27,8 @@
},
'deploy' : {
'inputs': ['%s_deploy.jar' % V170604_16_PREFIX],
- 'pgconf': ['%s_proguard.config' % V170604_16_PREFIX],
+ 'pgconf': ['%s_proguard.config' % V170604_16_PREFIX,
+ utils.IGNORE_WARNINGS_RULES],
},
'proguarded' : {
'inputs': ['%s_proguard.jar' % V170604_16_PREFIX],
@@ -47,7 +48,8 @@
'inputs': ['%s_deploy.jar' % V180826_15_PREFIX],
'pgconf': [
'%s_proguard.config' % V180826_15_PREFIX,
- '%s/proguardsettings/Gmail_proguard.config' % utils.THIRD_PARTY],
+ '%s/proguardsettings/Gmail_proguard.config' % utils.THIRD_PARTY,
+ utils.IGNORE_WARNINGS_RULES],
'min-api' : ANDROID_L_API,
'allow-type-errors' : 1,
},
diff --git a/tools/gmscore_data.py b/tools/gmscore_data.py
index 23a78e1..bef5ba3 100644
--- a/tools/gmscore_data.py
+++ b/tools/gmscore_data.py
@@ -78,7 +78,7 @@
},
'deploy' : {
'pgconf': ['%s_proguard.config' % V9_PREFIX,
- os.path.join(BASE, 'ignorewarnings.rules')],
+ utils.IGNORE_WARNINGS_RULES],
'inputs': ['%s_deploy.jar' % V9_PREFIX],
'min-api' : ANDROID_L_API,
},
@@ -98,7 +98,8 @@
},
'deploy' : {
'inputs': ['%s_deploy.jar' % V10_PREFIX],
- 'pgconf': ['%s_proguard.config' % V10_PREFIX],
+ 'pgconf': ['%s_proguard.config' % V10_PREFIX,
+ utils.IGNORE_WARNINGS_RULES],
'min-api' : ANDROID_L_API,
},
'proguarded' : {
@@ -113,7 +114,8 @@
'inputs': ['%s_deploy.jar' % LATEST_PREFIX],
'pgconf': [
'%s_proguard.config' % LATEST_PREFIX,
- '%s/proguardsettings/GmsCore_proguard.config' % utils.THIRD_PARTY],
+ '%s/proguardsettings/GmsCore_proguard.config' % utils.THIRD_PARTY,
+ utils.IGNORE_WARNINGS_RULES],
'min-api' : ANDROID_L_API,
},
'proguarded' : {
diff --git a/tools/nest_data.py b/tools/nest_data.py
index a87761d..5724e43 100644
--- a/tools/nest_data.py
+++ b/tools/nest_data.py
@@ -28,7 +28,8 @@
'pgconf': [
os.path.join(V20180926_BASE, 'proguard', 'proguard.cfg'),
os.path.join(V20180926_BASE, 'proguard', 'proguard-no-optimizations.cfg'),
- os.path.join(V20180926_BASE, 'proguard', 'proguard-ignore-warnings.cfg')],
+ os.path.join(V20180926_BASE, 'proguard', 'proguard-ignore-warnings.cfg'),
+ utils.IGNORE_WARNINGS_RULES],
# Build for native multi dex
'min-api' : ANDROID_L_API,
}
diff --git a/tools/utils.py b/tools/utils.py
index 5d63a51..8b7acb7 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -82,6 +82,7 @@
BAZEL_SHA_FILE = os.path.join(THIRD_PARTY, 'bazel.tar.gz.sha1')
BAZEL_TOOL = os.path.join(THIRD_PARTY, 'bazel')
JAVA8_SHA_FILE = os.path.join(THIRD_PARTY, 'openjdk', 'jdk8', 'linux-x86.tar.gz.sha1')
+IGNORE_WARNINGS_RULES = os.path.join(REPO_ROOT, 'src', 'test', 'ignorewarnings.rules')
ANDROID_HOME_ENVIROMENT_NAME = "ANDROID_HOME"
ANDROID_TOOLS_VERSION_ENVIRONMENT_NAME = "ANDROID_TOOLS_VERSION"
diff --git a/tools/youtube_data.py b/tools/youtube_data.py
index 46b0b9d..eafe5bb 100644
--- a/tools/youtube_data.py
+++ b/tools/youtube_data.py
@@ -52,7 +52,8 @@
'deploy' : {
'inputs': ['%s_deploy.jar' % V12_10_PREFIX],
'pgconf': ['%s_proguard.config' % V12_10_PREFIX,
- '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY],
+ '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY,
+ utils.IGNORE_WARNINGS_RULES],
'min-api' : ANDROID_L_API,
}
# The 'proguarded' version cannot be handled by D8/R8 because there are
@@ -74,7 +75,8 @@
'deploy' : {
'inputs': ['%s_deploy.jar' % V12_17_PREFIX],
'pgconf': ['%s_proguard.config' % V12_17_PREFIX,
- '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY],
+ '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY,
+ utils.IGNORE_WARNINGS_RULES],
'min-api' : ANDROID_L_API,
},
'proguarded' : {
@@ -94,7 +96,8 @@
'inputs': ['%s_deploy.jar' % V12_22_PREFIX],
'pgconf': [
'%s_proguard.config' % V12_22_PREFIX,
- '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY],
+ '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY,
+ utils.IGNORE_WARNINGS_RULES],
'maindexrules' : [
os.path.join(V12_22_BASE, 'mainDexClasses.rules'),
os.path.join(V12_22_BASE, 'main-dex-classes-release.cfg'),
@@ -117,7 +120,8 @@
'inputs': ['%s_deploy.jar' % V13_37_PREFIX],
'pgconf': [
'%s_proguard.config' % V13_37_PREFIX,
- '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY],
+ '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY,
+ utils.IGNORE_WARNINGS_RULES],
# Build for native multi dex, as Currently R8 cannot meet the main-dex
# constraints.
#'maindexrules' : [
@@ -143,7 +147,8 @@
'inputs': ['%s_deploy.jar' % V14_19_PREFIX],
'pgconf': [
'%s_proguard.config' % V14_19_PREFIX,
- '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY],
+ '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY,
+ utils.IGNORE_WARNINGS_RULES],
'maindexrules' : [
os.path.join(V14_19_BASE, 'mainDexClasses.rules'),
os.path.join(V14_19_BASE, 'main-dex-classes-release-optimized.pgcfg'),
@@ -172,7 +177,8 @@
'libraries' : [os.path.join(V14_44_BASE, 'legacy_YouTubeRelease_combined_library_jars.jar')],
'pgconf': [
'%s_proguard.config' % V14_44_PREFIX,
- '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY],
+ '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY,
+ utils.IGNORE_WARNINGS_RULES],
'maindexrules' : [
os.path.join(V14_44_BASE, 'mainDexClasses.rules'),
os.path.join(V14_44_BASE, 'main-dex-classes-release-optimized.pgcfg'),
@@ -202,7 +208,8 @@
'pgconf': [
'%s_proguard.config' % V15_08_PREFIX,
'%s_proto_safety.pgcfg' % V15_08_PREFIX,
- '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY],
+ '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY,
+ utils.IGNORE_WARNINGS_RULES],
'maindexrules' : [
os.path.join(V15_08_BASE, 'mainDexClasses.rules'),
os.path.join(V15_08_BASE, 'main-dex-classes-release-optimized.pgcfg'),
@@ -231,7 +238,8 @@
'libraries' : [os.path.join(V15_09_BASE, 'legacy_YouTubeRelease_combined_library_jars.jar')],
'pgconf': [
'%s_proguard.config' % V15_09_PREFIX,
- '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY],
+ '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY,
+ utils.IGNORE_WARNINGS_RULES],
'maindexrules' : [
os.path.join(V15_09_BASE, 'mainDexClasses.rules'),
os.path.join(V15_09_BASE, 'main-dex-classes-release-optimized.pgcfg'),
@@ -261,7 +269,8 @@
'pgconf': [
'%s_proguard.config' % V15_33_PREFIX,
'%s_proguard_missing_classes.config' % V15_33_PREFIX,
- '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY],
+ '%s/proguardsettings/YouTubeRelease_proguard.config' % utils.THIRD_PARTY,
+ utils.IGNORE_WARNINGS_RULES],
'maindexrules' : [
os.path.join(V15_33_BASE, 'mainDexClasses.rules'),
os.path.join(V15_33_BASE, 'main-dex-classes-release-optimized.pgcfg'),
