Commit b3139550 authored by torne@chromium.org's avatar torne@chromium.org

Android WebView: add empty jarjar ruleset.

We don't have any jarjar rules yet, but add the empty file now in order
that the downstream build can enable jarjar. This way, when rules are
added later it will just work, instead of breaking the downstream build
temporarily.

Also, make sure that when a jarjar rule file is being used, it's
considered as an input to the JNI generator step, to make sure the JNI
header files get regenerated when the rules change.

BUG=

Review URL: https://chromiumcodereview.appspot.com/15888011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203141 0039d316-1c4b-4281-b951-d872f2087c98
parent 50641fcd
......@@ -1312,6 +1312,11 @@
# Copy it out one scope.
'android_webview_build%': '<(android_webview_build)',
}], # OS=="android"
['android_webview_build==1', {
# When building the WebView in the Android tree, jarjar will remap all
# the class names, so the JNI generator needs to know this.
'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt',
}],
['OS=="mac"', {
# Enable clang on mac by default!
'clang%': 1,
......
......@@ -55,6 +55,13 @@
],
'message': 'Generating JNI bindings from <(RULE_INPUT_PATH)',
'process_outputs_as_sources': 1,
'conditions': [
['jni_generator_jarjar_file != ""', {
'inputs': [
'<(jni_generator_jarjar_file)',
],
}]
],
},
],
# This target exports a hard dependency because it generates header
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment