diff options
author | jbudorick <jbudorick@chromium.org> | 2015-12-04 06:27:43 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-04 14:28:57 +0000 |
commit | 0c2a94ab87e6351b924a19932442e85a8f786fa0 (patch) | |
tree | c6bb5b9b68b03883ee55e54d6a0f27b0731cab64 /build/java_apk.gypi | |
parent | 5db2dfe090fe92cd03e101d8592c360eceb3ebe2 (diff) | |
download | chromium_src-0c2a94ab87e6351b924a19932442e85a8f786fa0.zip chromium_src-0c2a94ab87e6351b924a19932442e85a8f786fa0.tar.gz chromium_src-0c2a94ab87e6351b924a19932442e85a8f786fa0.tar.bz2 |
[Android] Add a configurable environment for devil/. (RELAND 2)
This is a reland of https://codereview.chromium.org/1399273002
BUG=476719
Review URL: https://codereview.chromium.org/1416703003
Cr-Commit-Position: refs/heads/master@{#363204}
Diffstat (limited to 'build/java_apk.gypi')
-rw-r--r-- | build/java_apk.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build/java_apk.gypi b/build/java_apk.gypi index 2a62d97..93913b2 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -548,6 +548,7 @@ '--apk=<(incomplete_apk_path)', '--stamp=<(link_stamp)', '--configuration-name=<(CONFIGURATION_NAME)', + '--output-directory=<(PRODUCT_DIR)', ], }, ], @@ -695,6 +696,7 @@ '--install-record=<(apk_install_record)', '--configuration-name=<(CONFIGURATION_NAME)', '--android-sdk-tools', '<(android_sdk_tools)', + '--output-directory', '<(PRODUCT_DIR)', ], 'conditions': [ ['create_abi_split == 1', { |