summaryrefslogtreecommitdiffstats
path: root/build/apk_test.gypi
diff options
context:
space:
mode:
authorpeter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-01 17:39:24 +0000
committerpeter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-01 17:39:24 +0000
commitca254112419d316f0e89c92d6dc9487fc80bebf1 (patch)
treead0ed3d458e446ca0cdbeab9df543b1c8fa518cd /build/apk_test.gypi
parent3ff0ff79db2034f42d39d599776edf1c782ca8af (diff)
downloadchromium_src-ca254112419d316f0e89c92d6dc9487fc80bebf1.zip
chromium_src-ca254112419d316f0e89c92d6dc9487fc80bebf1.tar.gz
chromium_src-ca254112419d316f0e89c92d6dc9487fc80bebf1.tar.bz2
Introduce the --sdk-build flag for Android's native test generator
This flag supersedes --ant-compile and takes its value from gyp's sdk_build variable. It will tell the native test generator script to use Ant for Java compilation (default) instead of the Android.mk file. BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10821128 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/apk_test.gypi')
-rw-r--r--build/apk_test.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/apk_test.gypi b/build/apk_test.gypi
index 83f88b4..557499b 100644
--- a/build/apk_test.gypi
+++ b/build/apk_test.gypi
@@ -47,7 +47,7 @@
'<(android_app_abi)',
'--ant-args',
'-DPRODUCT_DIR=<(ant_build_out)',
- '--ant-compile'
+ '--sdk-build=<(sdk_build)',
],
}],
}], # 'OS == "android" and gtest_target_type == "shared_library"