diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 08:09:35 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 08:09:35 +0000 |
| commit | 061b2b31085552dd6aad065eb706b92804c5bf7a (patch) | |
| tree | b57baaa92b3c955b293302fdd5607d0133bb1c31 /chrome/chrome_android.gypi | |
| parent | 878412f29e4b9fcff06fd9102174f9e473995b93 (diff) | |
| download | chromium_src-061b2b31085552dd6aad065eb706b92804c5bf7a.zip chromium_src-061b2b31085552dd6aad065eb706b92804c5bf7a.tar.gz chromium_src-061b2b31085552dd6aad065eb706b92804c5bf7a.tar.bz2 | |
Making it easier to hook a ContentViewCore to the SurfaceView.
This CL changes the way we deal with WebLayers, so that a ContentViewCore does
not need native code anymore to hook with the surface view.
The ContentViewCore now keeps track of the WebLayers as they are
attached/detached. The ContentViewRenderView is used to render a specific
ContentView by retrieving the ContentViewCore WebLlayer and adding it to the
compositor.
BUG=
TEST=ContentShell and ChromiumTestShell should still work.
Review URL: https://chromiumcodereview.appspot.com/11293264
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_android.gypi')
| -rw-r--r-- | chrome/chrome_android.gypi | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi index 9748bda..d99e143 100644 --- a/chrome/chrome_android.gypi +++ b/chrome/chrome_android.gypi @@ -14,13 +14,10 @@ 'type': 'shared_library', 'dependencies': [ 'chrome_android_core', - 'chromium_testshell_jni_headers', ], 'sources': [ 'android/testshell/chrome_main_delegate_testshell_android.cc', 'android/testshell/chrome_main_delegate_testshell_android.h', - 'android/testshell/tab_manager.cc', - 'android/testshell/tab_manager.h', 'android/testshell/testshell_entry_point.cc', "android/testshell/testshell_google_location_settings_helper.cc", "android/testshell/testshell_google_location_settings_helper.h", @@ -63,17 +60,6 @@ 'includes': [ '../build/java_apk.gypi', ], }, { - 'target_name': 'chromium_testshell_jni_headers', - 'type': 'none', - 'sources': [ - 'android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java', - ], - 'variables': { - 'jni_gen_dir': 'chromium_testshell', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - { # chromium_testshell creates a .jar as a side effect. Any java targets # that need that .jar in their classpath should depend on this target, # chromium_testshell_java. Dependents of chromium_testshell receive its |