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' ], |
+ }, |
+ ], |
+ }], |
+ ] |
} |