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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/base.gyp

Issue 10386188: Fix ninja build for android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: switched to absolute_product_out Created 8 years, 7 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/java/base.xml ('k') | build/common.gypi » ('j') | build/java.gypi » ('J')
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 99c826cbf48721234be00ef67e095371cf85b7d8..6fe14107d1b40b8bd4e06f54028183b4c2f1ee4b 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -671,7 +671,7 @@
'inputs': [
'../testing/android/AndroidManifest.xml',
'../testing/android/generate_native_test.py',
- '<(PRODUCT_DIR)/lib.target/libbase_unittests.so',
+ '<(SHARED_LIB_DIR)/libbase_unittests.so',
'<(PRODUCT_DIR)/lib.java/chromium_base.jar'
],
'outputs': [
@@ -680,13 +680,13 @@
'action': [
'../testing/android/generate_native_test.py',
'--native_library',
- '<(PRODUCT_DIR)/lib.target/libbase_unittests.so',
+ '<(SHARED_LIB_DIR)/libbase_unittests.so',
'--jar',
'<(PRODUCT_DIR)/lib.java/chromium_base.jar',
'--output',
'<(PRODUCT_DIR)/base_unittests_apk',
'--ant-args',
- '-DPRODUCT_DIR=<(PRODUCT_DIR)',
+ '-DPRODUCT_DIR=<(absolute_product_out)',
'--ant-compile'
],
},
« no previous file with comments | « base/android/java/base.xml ('k') | build/common.gypi » ('j') | build/java.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698