Revert "Lookup in library classes before program classes"
This reverts commit d62e2d5b59aaaa5ba06fec796670297a29896853.
Reason for revert: Failure on Android Platform build. b/120884788#comment6
Change-Id: Icc0503085dc1688087bc243ff712c478cbb4fb04
diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index b8bd0ed..a480214 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -15,7 +15,6 @@
import gmscore_data
import golem
import nest_data
-from sanitize_libraries import SanitizeLibraries
import toolhelper
import utils
import youtube_data
@@ -302,14 +301,9 @@
if options.compiler == 'r8':
if 'pgconf' in values and not options.k:
- 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
+ for pgconf in values['pgconf']:
+ args.extend(['--pg-conf', pgconf])
+ app_provided_pg_conf = True
if options.k:
args.extend(['--pg-conf', options.k])
if 'maindexrules' in values:
