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

Unified Diff: components/safe_json.gypi

Issue 1203083002: Add a JSON sanitizer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build files Created 5 years, 5 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
« no previous file with comments | « components/components_tests.gyp ('k') | components/safe_json/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/safe_json.gypi
diff --git a/components/safe_json.gypi b/components/safe_json.gypi
index dcf28244576f26b744c4671f41f77931e2c7569f..bda849467add0eda279af8e6b9839d8dc8a94700 100644
--- a/components/safe_json.gypi
+++ b/components/safe_json.gypi
@@ -13,17 +13,37 @@
'../base/base.gyp:base',
'../components/components_strings.gyp:components_strings',
'../content/content.gyp:content_browser',
+ '../content/content.gyp:content_common',
'../ui/base/ui_base.gyp:ui_base',
],
'include_dirs': [
'..',
],
'sources': [
+ 'safe_json/android/component_jni_registrar.cc',
+ 'safe_json/android/component_jni_registrar.h',
+ 'safe_json/json_sanitizer.cc',
+ 'safe_json/json_sanitizer.h',
+ 'safe_json/json_sanitizer_android.cc',
'safe_json/safe_json_parser.cc',
'safe_json/safe_json_parser.h',
+ 'safe_json/safe_json_parser_android.cc',
+ 'safe_json/safe_json_parser_android.h',
'safe_json/safe_json_parser_impl.cc',
'safe_json/safe_json_parser_impl.h',
],
+ 'conditions': [
+ ['OS == "android"', {
+ 'dependencies': [
+ 'safe_json_jni_headers',
+ ],
+ 'sources!': [
+ 'safe_json/json_sanitizer.cc',
+ 'safe_json/safe_json_parser_impl.cc',
+ 'safe_json/safe_json_parser_impl.h',
+ ],
+ }],
+ ],
},
{
'target_name': 'safe_json_test_support',
@@ -45,7 +65,7 @@
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
- '../content/content.gyp:content_browser',
+ '../content/content.gyp:content_utility',
'../ipc/ipc.gyp:ipc',
],
'include_dirs': [
@@ -59,4 +79,34 @@
],
},
],
+ 'conditions': [
+ ['OS=="android"', {
+ 'targets': [
+ {
+ # GN version: //components/safe_json/android:safe_json_java
+ 'target_name': 'safe_json_java',
+ 'type': 'none',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ ],
+ 'variables': {
+ 'java_in_dir': 'safe_json/android/java',
+ },
+ 'includes': [ '../build/java.gypi' ],
+ },
+ {
+ # GN version: //components/safe_json:jni
+ 'target_name': 'safe_json_jni_headers',
+ 'type': 'none',
+ 'sources': [
+ 'safe_json/android/java/src/org/chromium/components/safejson/JsonSanitizer.java',
+ ],
+ 'variables': {
+ 'jni_gen_package': 'safe_json',
+ },
+ 'includes': [ '../build/jni_generator.gypi' ],
+ },
+ ],
+ }],
+ ]
}
« no previous file with comments | « components/components_tests.gyp ('k') | components/safe_json/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698