diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 14:16:12 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 14:16:12 +0000 |
| commit | b31395502f844ed1de3f6189247859bc0747dbf1 (patch) | |
| tree | b469bf8a84dc617e56b30691da769e1c413ede00 | |
| parent | 50641fcd9e224d94cbdc39243f1979254e0b86bb (diff) | |
| download | chromium_src-b31395502f844ed1de3f6189247859bc0747dbf1.zip chromium_src-b31395502f844ed1de3f6189247859bc0747dbf1.tar.gz chromium_src-b31395502f844ed1de3f6189247859bc0747dbf1.tar.bz2 | |
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
| -rw-r--r-- | android_webview/build/jarjar-rules.txt | 0 | ||||
| -rw-r--r-- | build/common.gypi | 5 | ||||
| -rw-r--r-- | build/jni_generator.gypi | 7 |
3 files changed, 12 insertions, 0 deletions
diff --git a/android_webview/build/jarjar-rules.txt b/android_webview/build/jarjar-rules.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/android_webview/build/jarjar-rules.txt diff --git a/build/common.gypi b/build/common.gypi index 5516c63..69aad88 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -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, diff --git a/build/jni_generator.gypi b/build/jni_generator.gypi index a5b9db6..680a0ee 100644 --- a/build/jni_generator.gypi +++ b/build/jni_generator.gypi @@ -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 |