diff options
| author | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 21:48:12 +0000 |
|---|---|---|
| committer | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 21:48:12 +0000 |
| commit | 7bd891779b56530e58baa770aff55b7c65956eb6 (patch) | |
| tree | 8a2d8ce25bac8f57d5faa3f56e84805dfa492431 /content/content_jni.gypi | |
| parent | e135f7e496a18a6e40e87086c79c2932b3954528 (diff) | |
| download | chromium_src-7bd891779b56530e58baa770aff55b7c65956eb6.zip chromium_src-7bd891779b56530e58baa770aff55b7c65956eb6.tar.gz chromium_src-7bd891779b56530e58baa770aff55b7c65956eb6.tar.bz2 | |
As part of the content_shell bring up, some un-upstreamed features
have been disabled in browser process main related c++ and Java file.
The disabled features are guarded by !defined(ANDROID_UPSTREAM_BRINGUP).
For Java file, the code was removed.
Fixed the dependency.
- Moved the content_jni_registrar.{h|cc} and library_loader_hooks.cc content/app/android/
- Moved the android_library_loader_hooks.h to content/public/app/
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10444121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_jni.gypi')
| -rw-r--r-- | content/content_jni.gypi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/content_jni.gypi b/content/content_jni.gypi index 230a0e9..42d2acc 100644 --- a/content/content_jni.gypi +++ b/content/content_jni.gypi @@ -9,6 +9,8 @@ # output directories (e.g. browser/jni and common/jni if needed). 'variables': { 'java_sources': [ + 'public/android/java/org/chromium/content/app/ContentMain.java', + 'public/android/java/org/chromium/content/browser/AndroidBrowserProcess.java', 'public/android/java/org/chromium/content/browser/CommandLine.java', 'public/android/java/org/chromium/content/browser/DeviceOrientation.java', 'public/android/java/org/chromium/content/browser/DownloadController.java', @@ -18,6 +20,8 @@ 'public/android/java/org/chromium/content/browser/TraceEvent.java', ], 'jni_headers': [ + '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_main_jni.h', + '<(SHARED_INTERMEDIATE_DIR)/content/jni/android_browser_process_jni.h', '<(SHARED_INTERMEDIATE_DIR)/content/jni/command_line_jni.h', '<(SHARED_INTERMEDIATE_DIR)/content/jni/device_orientation_jni.h', '<(SHARED_INTERMEDIATE_DIR)/content/jni/download_controller_jni.h', |