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

Unified Diff: ui/ui_unittests.gypi

Issue 10386188: Fix ninja build for android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« base/base.gyp ('K') | « testing/android/native_test.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui_unittests.gypi
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index f9c9c78f60028d80fbb3438b1222d42ced8aa4e8..6c4b1b5426a83270cd6b82646248e4a586e5af5d 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -228,7 +228,7 @@
'inputs': [
'../testing/android/AndroidManifest.xml',
'../testing/android/generate_native_test.py',
- '<(PRODUCT_DIR)/lib.target/libui_unittests.so',
+ '<(SHARED_LIB_DIR)/libui_unittests.so',
'<(PRODUCT_DIR)/lib.java/chromium_base.jar',
],
'outputs': [
@@ -237,7 +237,7 @@
'action': [
'../testing/android/generate_native_test.py',
'--native_library',
- '<(PRODUCT_DIR)/lib.target/libui_unittests.so',
+ '<(SHARED_LIB_DIR)/libui_unittests.so',
# TODO(jrg): find a better way to specify jar
# dependencies. Hard coding seems fragile.
'--jar',
@@ -245,7 +245,7 @@
'--output',
'<(PRODUCT_DIR)/ui_unittests_apk',
'--ant-args',
- '-DPRODUCT_DIR=<(PRODUCT_DIR)',
+ '-DPRODUCT_DIR=`realpath <(PRODUCT_DIR)`',
'--ant-compile'
],
},
« base/base.gyp ('K') | « testing/android/native_test.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698