content/content.gyp - Issue 141223002: Move the android library loader from content to base

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/content.gyp

Issue 141223002: Move the android library loader from content to base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« base/android/library_loader/library_loader_hooks.cc ('K') | « content/app/android/library_loader_hooks.cc ('k') | content/content_jni.gypi » ('j') | content/public/app/android_library_loader_hooks.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content.gyp

diff --git a/content/content.gyp b/content/content.gyp

index 97a158f2e5ec34f006d3cbd04667a232306f8aa5..af2aed5dd12f273fdfd3fdc6b97b7f1f2fd793b0 100644

--- a/content/content.gyp

+++ b/content/content.gyp

@@ -371,21 +371,6 @@

'includes': [ '../build/java_aidl.gypi' ],

{

- 'target_name': 'content_native_libraries_gen',

- 'type': 'none',

- 'sources': [

- 'public/android/java/templates/NativeLibraries.template',

- ],

- 'variables': {

- 'package_name': 'org/chromium/content/app',

- 'include_path': 'public/android/java/templates',

- 'template_deps': [

- 'public/android/java/templates/native_libraries_array.h'

- ],

- },

- 'includes': [ '../build/android/java_cpp_template.gypi' ],

- },

- {

'target_name': 'content_java',

'type': 'none',

'dependencies': [

@@ -400,11 +385,9 @@

'result_codes_java',

'speech_recognition_error_java',

'top_controls_state_java',

- 'content_native_libraries_gen',

'variables': {

'java_in_dir': '../content/public/android/java',

- 'jar_excluded_classes': [ '*/NativeLibraries.class' ],

'has_java_resources': 1,

'R_package': 'org.chromium.content',

'R_package_relpath': 'org/chromium/content',