diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-11-06 12:27:47 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-11-06 12:27:47 +0000 |
| commit | 0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 (patch) | |
| tree | 08e3fb2fdca3674ceb4d6cf527cb65e755cd993e /components/web_contents_delegate_android_jni_headers.target.linux-mips.mk | |
| parent | 0bdaf95291fc46702f274f40e8e5081e9ef23011 (diff) | |
| download | chromium_org-0f1bc08d4cfcc34181b0b5cbf065c40f687bf740.tar.gz | |
Merge from Chromium at DEPS revision 232870
This commit was generated by merge_to_master.py.
Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
Diffstat (limited to 'components/web_contents_delegate_android_jni_headers.target.linux-mips.mk')
| -rw-r--r-- | components/web_contents_delegate_android_jni_headers.target.linux-mips.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/web_contents_delegate_android_jni_headers.target.linux-mips.mk b/components/web_contents_delegate_android_jni_headers.target.linux-mips.mk index c2e42aa3f8..5c9809ea36 100644 --- a/components/web_contents_delegate_android_jni_headers.target.linux-mips.mk +++ b/components/web_contents_delegate_android_jni_headers.target.linux-mips.mk @@ -15,13 +15,13 @@ GYP_TARGET_DEPENDENCIES := ### Generated for rule "components_components_gyp_web_contents_delegate_android_jni_headers_target_generate_jni_headers": -# "{'inputs': ['../base/android/jni_generator/jni_generator.py', '../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java', 'web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java'], 'action': ['../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni', '--optimize_generation', '0', '--jarjar', '../android_webview/build/jarjar-rules.txt'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": +# "{'inputs': ['../base/android/jni_generator/jni_generator.py', '../android_webview/build/jarjar-rules.txt'], 'process_outputs_as_sources': '1', 'extension': 'java', 'outputs': ['$(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni/%(INPUT_ROOT)s_jni.h'], 'rule_name': 'generate_jni_headers', 'rule_sources': ['web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java', 'web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java'], 'action': ['../base/android/jni_generator/jni_generator.py', '--input_file', '$(RULE_SOURCES)', '--output_dir', '$(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni', '--optimize_generation', '0', '--jarjar', '../android_webview/build/jarjar-rules.txt', '--ptr_type', 'int'], 'message': 'Generating JNI bindings from $(RULE_SOURCES)'}": $(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni/ColorChooserAndroid_jni.h: gyp_local_path := $(LOCAL_PATH) $(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni/ColorChooserAndroid_jni.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir)) $(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni/ColorChooserAndroid_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni/ColorChooserAndroid_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) $(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni/ColorChooserAndroid_jni.h: $(LOCAL_PATH)/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) - mkdir -p $(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni; cd $(gyp_local_path)/components; ../base/android/jni_generator/jni_generator.py --input_file web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java --output_dir "$(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni" --optimize_generation 0 --jarjar ../android_webview/build/jarjar-rules.txt + mkdir -p $(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni; cd $(gyp_local_path)/components; ../base/android/jni_generator/jni_generator.py --input_file web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java --output_dir "$(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni" --optimize_generation 0 --jarjar ../android_webview/build/jarjar-rules.txt --ptr_type int .PHONY: components_web_contents_delegate_android_jni_headers_gyp_rule_trigger components_web_contents_delegate_android_jni_headers_gyp_rule_trigger: $(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni/ColorChooserAndroid_jni.h @@ -31,7 +31,7 @@ $(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni/WebContentsDele $(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni/WebContentsDelegateAndroid_jni.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir)) $(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni/WebContentsDelegateAndroid_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) $(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni/WebContentsDelegateAndroid_jni.h: $(LOCAL_PATH)/components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(LOCAL_PATH)/android_webview/build/jarjar-rules.txt $(GYP_TARGET_DEPENDENCIES) - mkdir -p $(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni; cd $(gyp_local_path)/components; ../base/android/jni_generator/jni_generator.py --input_file web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java --output_dir "$(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni" --optimize_generation 0 --jarjar ../android_webview/build/jarjar-rules.txt + mkdir -p $(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni; cd $(gyp_local_path)/components; ../base/android/jni_generator/jni_generator.py --input_file web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java --output_dir "$(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni" --optimize_generation 0 --jarjar ../android_webview/build/jarjar-rules.txt --ptr_type int .PHONY: components_web_contents_delegate_android_jni_headers_gyp_rule_trigger components_web_contents_delegate_android_jni_headers_gyp_rule_trigger: $(gyp_shared_intermediate_dir)/web_contents_delegate_android/jni/WebContentsDelegateAndroid_jni.h |