diff options
| author | dtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 21:17:00 +0000 |
|---|---|---|
| committer | dtrainor@chromium.org <dtrainor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 21:17:00 +0000 |
| commit | c8598d4fbb9f0e7535a1e94d3dbeb9da9382b949 (patch) | |
| tree | e5e0d1bae17f4c391b12c4730a7d2a1b811c02fc /chrome/chrome_android.gypi | |
| parent | 38affd13309de2d8f8f92db9bde38df3387164b0 (diff) | |
| download | chromium_src-c8598d4fbb9f0e7535a1e94d3dbeb9da9382b949.zip chromium_src-c8598d4fbb9f0e7535a1e94d3dbeb9da9382b949.tar.gz chromium_src-c8598d4fbb9f0e7535a1e94d3dbeb9da9382b949.tar.bz2 | |
Add rendering support to the TestShell.
- Tie the Compositor into the TestShell.
- Tie a really basic Tab into the TestShell.
BUG=http://crbug.com/136786
Review URL: https://chromiumcodereview.appspot.com/10968003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158654 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_android.gypi')
| -rw-r--r-- | chrome/chrome_android.gypi | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi index 25c909b..dfb2385 100644 --- a/chrome/chrome_android.gypi +++ b/chrome/chrome_android.gypi @@ -14,15 +14,19 @@ '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_stubs.cc', ], 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/android', + '<(SHARED_INTERMEDIATE_DIR)/chromium_testshell', '../skia/config', ], 'conditions': [ @@ -69,6 +73,17 @@ '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' ], + }, + { 'target_name': 'chrome_android_core', 'type': 'static_library', 'dependencies': [ |