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

Side by Side Diff: trunk/src/mojo/mojo_public.gypi

Issue 326603002: Revert 275652 "Remove unneeded JNI registrations." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/build/jni_generator.gypi ('k') | trunk/src/mojo/mojo_services.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'targets': [ 2 'targets': [
3 { 3 {
4 'target_name': 'mojo_system', 4 'target_name': 'mojo_system',
5 'type': 'static_library', 5 'type': 'static_library',
6 'defines': [ 6 'defines': [
7 'MOJO_SYSTEM_IMPLEMENTATION', 7 'MOJO_SYSTEM_IMPLEMENTATION',
8 ], 8 ],
9 'include_dirs': [ 9 'include_dirs': [
10 '..', 10 '..',
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 'GLES2_USE_MOJO', 59 'GLES2_USE_MOJO',
60 ], 60 ],
61 }, 61 },
62 'sources': [ 62 'sources': [
63 'public/c/gles2/gles2.h', 63 'public/c/gles2/gles2.h',
64 'public/c/gles2/gles2_export.h', 64 'public/c/gles2/gles2_export.h',
65 'public/gles2/gles2_private.cc', 65 'public/gles2/gles2_private.cc',
66 'public/gles2/gles2_private.h', 66 'public/gles2/gles2_private.h',
67 ], 67 ],
68 'conditions': [ 68 'conditions': [
69 ['OS=="android"', {
70 'ldflags!': [
71 # Remove default export list because this lib has different exports.
72 '-Wl,--version-script=<(android_linker_script)',
73 ],
74 'ldflags': [
75 # Don't export symbols from statically linked libraries.
76 '-Wl,--exclude-libs=ALL',
77 ],
78 }],
79 ['OS=="mac"', { 69 ['OS=="mac"', {
80 'xcode_settings': { 70 'xcode_settings': {
81 # Make it a run-path dependent library. 71 # Make it a run-path dependent library.
82 'DYLIB_INSTALL_NAME_BASE': '@loader_path', 72 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
83 }, 73 },
84 }], 74 }],
85 ], 75 ],
86 }, 76 },
87 { 77 {
88 'target_name': 'mojo_test_support', 78 'target_name': 'mojo_test_support',
89 'type': 'shared_library', 79 'type': 'shared_library',
90 'defines': [ 80 'defines': [
91 'MOJO_TEST_SUPPORT_IMPLEMENTATION', 81 'MOJO_TEST_SUPPORT_IMPLEMENTATION',
92 ], 82 ],
93 'include_dirs': [ 83 'include_dirs': [
94 '..', 84 '..',
95 ], 85 ],
96 'direct_dependent_settings': { 86 'direct_dependent_settings': {
97 'include_dirs': [ 87 'include_dirs': [
98 '..', 88 '..',
99 ], 89 ],
100 }, 90 },
101 'sources': [ 91 'sources': [
102 'public/c/test_support/test_support.h', 92 'public/c/test_support/test_support.h',
103 'public/c/test_support/test_support_export.h', 93 'public/c/test_support/test_support_export.h',
104 'public/tests/test_support_private.cc', 94 'public/tests/test_support_private.cc',
105 'public/tests/test_support_private.h', 95 'public/tests/test_support_private.h',
106 ], 96 ],
107 'conditions': [ 97 'conditions': [
108 ['OS=="android"', {
109 'ldflags!': [
110 # Remove default export list because this lib has different exports.
111 '-Wl,--version-script=<(android_linker_script)',
112 ],
113 'ldflags': [
114 # Don't export symbols from statically linked libraries.
115 '-Wl,--exclude-libs=ALL',
116 ],
117 }],
118 ['OS=="mac"', { 98 ['OS=="mac"', {
119 'xcode_settings': { 99 'xcode_settings': {
120 # Make it a run-path dependent library. 100 # Make it a run-path dependent library.
121 'DYLIB_INSTALL_NAME_BASE': '@loader_path', 101 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
122 }, 102 },
123 }], 103 }],
124 ], 104 ],
125 }, 105 },
126 { 106 {
127 'target_name': 'mojo_public_test_utils', 107 'target_name': 'mojo_public_test_utils',
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 }, 402 },
423 'dependencies': [ 403 'dependencies': [
424 'mojo_public_java', 404 'mojo_public_java',
425 ], 405 ],
426 'includes': [ '../build/java.gypi' ], 406 'includes': [ '../build/java.gypi' ],
427 }, 407 },
428 ], 408 ],
429 }], 409 }],
430 ], 410 ],
431 } 411 }
OLDNEW
« no previous file with comments | « trunk/src/build/jni_generator.gypi ('k') | trunk/src/mojo/mojo_services.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698