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

Unified Diff: content/content.gyp

Issue 12939021: Make the build control what library(/ies) to load (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@antpy
Patch Set: Created 7 years, 9 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
Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index 1068b7ebd21824ebdd49487311241371d44849c3..6f7104fca1ea9c1d8307803857a6b45cbcf6b98d 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -301,6 +301,21 @@
'includes': [ '../build/java_aidl.gypi' ],
},
{
+ 'target_name': 'content_native_libraries_gen',
+ 'type': 'none',
+ 'sources': [
+ 'public/android/java/templates/NativeLibraries.template',
+ ],
+ 'variables': {
+ 'package_name': 'org/chromium/content/app',
+ 'include_path': 'public/android/java/templates',
+ 'template_deps': [
+ 'public/android/java/templates/native_libraries_array.h'
+ ],
+ },
+ 'includes': [ '../build/android/java_cpp_template.gypi' ],
+ },
+ {
'target_name': 'content_java',
'type': 'none',
'dependencies': [
@@ -312,9 +327,11 @@
'content_common',
'page_transition_types_java',
'result_codes_java',
+ 'content_native_libraries_gen',
],
'variables': {
'java_in_dir': '../content/public/android/java',
+ 'jar_excluded_classes': [ '*/NativeLibraries.class' ],
'has_java_resources': 1,
'R_package': 'org.chromium.content',
'R_package_relpath': 'org/chromium/content',

Powered by Google App Engine
This is Rietveld 408576698