summaryrefslogtreecommitdiffstats
path: root/content/content_common.gypi
diff options
context:
space:
mode:
authorsievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-18 18:48:55 +0000
committersievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-18 18:48:55 +0000
commit380a2ce2f7d0f14221183409cdd667a9d0dddc1a (patch)
tree39b3da5e5a517f7499dd4f80a1726a65474fd25e /content/content_common.gypi
parent0c249039587a988a50ea0bdaf6d85c77893cf5d2 (diff)
downloadchromium_src-380a2ce2f7d0f14221183409cdd667a9d0dddc1a.zip
chromium_src-380a2ce2f7d0f14221183409cdd667a9d0dddc1a.tar.gz
chromium_src-380a2ce2f7d0f14221183409cdd667a9d0dddc1a.tar.bz2
Upstream some more content/ DEPS-related cleanup.
This eliminates differences vs. downstream. CommandLine, TraceEvent -> content/common, since they are used from browser, renderer, app LibraryLoader.java -> content/app to match native Remove JNIHelper which has bitmap helper tools. It was misleadingly named and incorrectly included (nothing depends on it upstream). It yet needs to find its right place. Review URL: https://chromiumcodereview.appspot.com/10532155 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_common.gypi')
-rw-r--r--content/content_common.gypi4
1 files changed, 4 insertions, 0 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 610c2b8..d368fac 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -102,10 +102,14 @@
'common/android/address_parser.h',
'common/android/address_parser_internal.cc',
'common/android/address_parser_internal.h',
+ 'common/android/command_line.cc',
+ 'common/android/command_line.h',
'common/android/surface_callback.cc',
'common/android/surface_callback.h',
'common/android/surface_texture_peer.cc',
'common/android/surface_texture_peer.h',
+ 'common/android/trace_event_binding.cc',
+ 'common/android/trace_event_binding.h',
'common/appcache/appcache_backend_proxy.cc',
'common/appcache/appcache_backend_proxy.h',
'common/appcache/appcache_dispatcher.cc',