build/java_apk.gypi - 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: build/java_apk.gypi

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') | « base/base.gypi ('k') | chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java » ('j') | content/public/app/android_library_loader_hooks.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/java_apk.gypi

diff --git a/build/java_apk.gypi b/build/java_apk.gypi

index 036d569a878dd88eafafaaa0f79c462a98ff734e..3cacbd1eb10ab0b71a1271e932cf58166db96657 100644

--- a/build/java_apk.gypi

+++ b/build/java_apk.gypi

@@ -81,10 +81,7 @@

'compile_input_paths': [],

'package_input_paths': [],

'ordered_libraries_file': '<(intermediate_dir)/native_libraries.json',

- # TODO(cjhopman): build/ shouldn't refer to content/. The libraryloader and

- # nativelibraries template should be moved out of content/ (to base/?).

- # http://crbug.com/225101

- 'native_libraries_template': '<(DEPTH)/content/public/android/java/templates/NativeLibraries.template',

+ 'native_libraries_template': '<(DEPTH)/base/android/java/templates/NativeLibraries.template',

'native_libraries_java_dir': '<(intermediate_dir)/native_libraries_java/',

'native_libraries_java_file': '<(native_libraries_java_dir)/NativeLibraries.java',

'native_libraries_java_stamp': '<(intermediate_dir)/native_libraries_java.stamp',