Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1073)

Unified Diff: base/android/jni_generator/jni_generator.py

Issue 255613003: Move ui and content resources into one location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/android/jni_generator/jni_generator.py
diff --git a/base/android/jni_generator/jni_generator.py b/base/android/jni_generator/jni_generator.py
index 12df8cf7926ae873ca286e776c3b71fbcc2f30fe..e5d711b95047ed7897aa5d8876a0d08481dd1561 100755
--- a/base/android/jni_generator/jni_generator.py
+++ b/base/android/jni_generator/jni_generator.py
@@ -324,12 +324,14 @@ class JniParams(object):
"""Parse jarjar mappings from a string."""
JniParams._remappings = []
for line in mappings.splitlines():
- keyword, src, dest = line.split()
- if keyword != 'rule':
+ rule = line.split()
+ if rule[0] != 'rule':
continue
- assert src.endswith('.**')
+ _, src, dest = rule
+ assert src.endswith('**')
src = src[:-2].replace('.', '/')
dest = dest.replace('.', '/')
+
if dest.endswith('@0'):
JniParams._remappings.append((src, dest[:-2] + src))
else:

Powered by Google App Engine
This is Rietveld 408576698