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

Unified Diff: base/base.gyp

Issue 10913083: Remove {base,net}_java dependencies from GYP client targets on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 3 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 | « no previous file | build/apk_test.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 643836c65365ea765f2130067b6e5935d058a411..6384ac9878364349bd9d1e3c772cb121c6fb5ff9 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -122,10 +122,11 @@
}],
],
'dependencies': [
+ 'base_java',
+ 'base_jni_headers',
'symbolize',
'../third_party/ashmem/ashmem.gyp:ashmem',
'../third_party/icu/icu.gyp:icuuc',
- 'base_jni_headers',
],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/base',
@@ -141,6 +142,9 @@
'sources!': [
'debug/stack_trace_posix.cc',
],
+ 'export_dependent_settings': [
+ 'base_java',
+ ],
}],
['os_bsd==1', {
'include_dirs': [
« no previous file with comments | « no previous file | build/apk_test.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698