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

Unified Diff: base/base.gypi

Issue 9358028: Upstream Android JNI code, allowing us to use more ScopedJava references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased and added a TODO Created 8 years, 10 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
« no previous file with comments | « base/android/scoped_java_ref_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index d4a86ff3ec3299f74abb5cc50986bdaeb194b3a5..36400ede21bb17ff9ac306bf97258c3bf30ac79a 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -474,11 +474,7 @@
['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/'],
- ['include', 'android/jni_android.cc'],
- ['include', 'android/jni_android.h'],
- ['include', 'android/scoped_java_ref.cc'],
- ['include', 'android/scoped_java_ref.h'],
+ ['exclude', '^android/path_utils\\.cc$'],
['exclude', '^base_paths_android\\.cc$'],
['exclude', '^message_pump_android\\.cc$'],
],
« no previous file with comments | « base/android/scoped_java_ref_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698