Prepare for "lookup in library classes before program classes"
This reverts commit 7464530e9286ec3b6841208c66eec7bbb2dd54f2, adding
a flag to switch between "lookup in library classes before program
classes" and "lookup in program classes before library classes".
The default is kept as "lookup in program classes before library
classes"
This option for switching is only intended to temporary until
the related definitionFor issues have been resolved, and the
compilation setup for all clients has been fixed.
Bug: 120884788
Change-Id: I861739ffbd18cd5927fd6088a380a24cb8804883
diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index a480214..b8bd0ed 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -15,6 +15,7 @@
import gmscore_data
import golem
import nest_data
+from sanitize_libraries import SanitizeLibraries
import toolhelper
import utils
import youtube_data
@@ -301,9 +302,14 @@
if options.compiler == 'r8':
if 'pgconf' in values and not options.k:
- for pgconf in values['pgconf']:
- args.extend(['--pg-conf', pgconf])
- app_provided_pg_conf = True
+ sanitized_lib_path = os.path.join(
+ os.path.abspath(outdir), 'sanitized_lib.jar')
+ sanitized_pgconf_path = os.path.join(
+ os.path.abspath(outdir), 'sanitized.config')
+ SanitizeLibraries(
+ sanitized_lib_path, sanitized_pgconf_path, values['pgconf'])
+ args.extend(['--pg-conf', sanitized_pgconf_path])
+ app_provided_pg_conf = True
if options.k:
args.extend(['--pg-conf', options.k])
if 'maindexrules' in values:
