diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-10-23 06:42:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-23 13:42:37 +0000 |
| commit | 814dac5c6b2e257aa493fc7b0541412a04440ff2 (patch) | |
| tree | 53c7a98885b8a71cf8b64c354b7e67b57a138cdd /build/java_apk.gypi | |
| parent | f15687fe1858585d48970916e6e1e4a6e1d592ef (diff) | |
| download | chromium_src-814dac5c6b2e257aa493fc7b0541412a04440ff2.zip chromium_src-814dac5c6b2e257aa493fc7b0541412a04440ff2.tar.gz chromium_src-814dac5c6b2e257aa493fc7b0541412a04440ff2.tar.bz2 | |
Revert of [Android] Add a configurable environment for devil/. (RELAND) (patchset #12 id:220001 of https://codereview.chromium.org/1399273002/ )
Reason for revert:
broke cluster telemetry: https://code.google.com/p/skia/issues/detail?id=4506
Original issue's description:
> [Android] Add a configurable environment for devil/. (RELAND)
>
> This is a reland of https://codereview.chromium.org/1316413003/
>
> BUG=476719
>
> Committed: https://crrev.com/06869eebcab4b41d21e96ea2df732a2b40914fe4
> Cr-Commit-Position: refs/heads/master@{#355683}
TBR=aiolos@chromium.org,nednguyen@google.com,mikecase@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=476719
Review URL: https://codereview.chromium.org/1415413005
Cr-Commit-Position: refs/heads/master@{#355774}
Diffstat (limited to 'build/java_apk.gypi')
| -rw-r--r-- | build/java_apk.gypi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/build/java_apk.gypi b/build/java_apk.gypi index aa7fbf0..174ec4d 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -542,7 +542,6 @@ '--apk=<(incomplete_apk_path)', '--stamp=<(link_stamp)', '--configuration-name=<(CONFIGURATION_NAME)', - '--output-directory=<(PRODUCT_DIR)', ], }, ], @@ -690,7 +689,6 @@ '--install-record=<(apk_install_record)', '--configuration-name=<(CONFIGURATION_NAME)', '--android-sdk-tools', '<(android_sdk_tools)', - '--output-directory', '<(PRODUCT_DIR)', ], 'conditions': [ ['create_abi_split == 1', { |