diff options
| author | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-05 23:26:49 +0000 |
|---|---|---|
| committer | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-05 23:26:49 +0000 |
| commit | 01e40bdb8a3951786ef47294eac3d7e8072cc6b4 (patch) | |
| tree | 85f85872a18bf93f0e826ef22dbedb4f7c3bb073 /android_webview | |
| parent | 915a8c5baaba4f03bf817b70fa06d14e64aeb605 (diff) | |
| download | chromium_src-01e40bdb8a3951786ef47294eac3d7e8072cc6b4.zip chromium_src-01e40bdb8a3951786ef47294eac3d7e8072cc6b4.tar.gz chromium_src-01e40bdb8a3951786ef47294eac3d7e8072cc6b4.tar.bz2 | |
[Android] Add chrome/ Java code to android_webview.
Due to the fact that we share JNI registration code with the
chrome/ layer we require the chrome/ Java code to be present in
the APK. Luckily we can include the Java chrome/ layer code in
the APK without adding it to the android_webview classpath, which
means it's not possible to accidentally add a Java dependency
from android_webview/ to chrome/.
BUG=146547
Review URL: https://chromiumcodereview.appspot.com/10911101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/android_webview.gyp | 11 | ||||
| -rw-r--r-- | android_webview/java/android_webview_apk.xml | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 3322ed7..ae37a53 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -128,6 +128,16 @@ 'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_content.jar'], 'action': ['cp', '<@(_inputs)', '<@(_outputs)'], }, + # TODO: This should be removed once we stop sharing the chrome/ layer JNI + # registration code. We currently include this because we reuse the + # chrome/ layer JNI registration code (which will crash if these classes + # are not present in the APK). + { + 'action_name': 'copy_chrome_jar', + 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_chrome.jar'], + 'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_chrome.jar'], + 'action': ['cp', '<@(_inputs)', '<@(_outputs)'], + }, { 'action_name': 'copy_web_contents_delegate_android_java', 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_web_contents_delegate_android.jar'], @@ -193,6 +203,7 @@ '<(PRODUCT_DIR)/android_webview/java/libs/chromium_net.jar', '<(PRODUCT_DIR)/android_webview/java/libs/chromium_media.jar', '<(PRODUCT_DIR)/android_webview/java/libs/chromium_content.jar', + '<(PRODUCT_DIR)/android_webview/java/libs/chromium_chrome.jar', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', diff --git a/android_webview/java/android_webview_apk.xml b/android_webview/java/android_webview_apk.xml index 8d37948..67ec7b3 100644 --- a/android_webview/java/android_webview_apk.xml +++ b/android_webview/java/android_webview_apk.xml @@ -21,6 +21,7 @@ <path id="out.dex.jar.input.ref"> <fileset file="${out.dir}/java/libs/chromium_base.jar"/> + <fileset file="${out.dir}/java/libs/chromium_chrome.jar"/> <fileset file="${out.dir}/java/libs/chromium_content.jar"/> <fileset file="${out.dir}/java/libs/chromium_media.jar"/> <fileset file="${out.dir}/java/libs/chromium_net.jar"/> |