Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(692)

Unified Diff: base/base.gypi

Issue 9443018: Upstream Android's PathUtils implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased patch Created 8 years, 9 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
Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index c82011eb0cbe6349538d82b403367c392226999e..f5bf4a9dddc62f1dd6a7861cf38a8dcec2724ba8 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -487,8 +487,6 @@
['include', '^worker_pool_linux\\.cc$'],
# TODO(michaelbai): The below files are excluded because of the
# missing JNI, add them back when JNI is ready.
- ['exclude', '^android/path_utils\\.cc$'],
- ['exclude', '^base_paths_android\\.cc$'],
['exclude', '^message_pump_android\\.cc$'],
],
}],
@@ -666,6 +664,10 @@
'dependencies': [
'symbolize',
'../third_party/ashmem/ashmem.gyp:ashmem',
+ 'base_jni_headers',
+ ],
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)/base',
],
'link_settings': {
'libraries': [
« base/base.gyp ('K') | « base/base.gyp ('k') | base/test/test_stub_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698