diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-10-27 16:30:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-27 23:32:16 +0000 |
| commit | 7d704ad1e04405e345dc97352474652baa6e42eb (patch) | |
| tree | 40e8417b8802270b4edee026a46484591554befd /build | |
| parent | a0921ade6d8b06be814772050307e0d02cef3e85 (diff) | |
| download | chromium_src-7d704ad1e04405e345dc97352474652baa6e42eb.zip chromium_src-7d704ad1e04405e345dc97352474652baa6e42eb.tar.gz chromium_src-7d704ad1e04405e345dc97352474652baa6e42eb.tar.bz2 | |
Revert of Fix sandbox_linux_unittests_deps on GN & Android (patchset #3 id:80001 of https://codereview.chromium.org/1415533008/ )
Reason for revert:
breaks content_unittests (and presumably other suites that depend on device_forwarder), e.g. http://build.chromium.org/p/chromium.linux/builders/Android%20GN/builds/31756
Original issue's description:
> Fix sandbox_linux_unittests_deps on GN & Android
>
> BUG=510485
>
> Committed: https://crrev.com/34b5bbdceab40058ab331e62b6e619175706d4fc
> Cr-Commit-Position: refs/heads/master@{#356312}
TBR=dpranke@chromium.org,jln@chromium.org,pkotwicz@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=510485
Review URL: https://codereview.chromium.org/1424903002
Cr-Commit-Position: refs/heads/master@{#356432}
Diffstat (limited to 'build')
| -rw-r--r-- | build/config/android/rules.gni | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni index a10360a..7bd22b43 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -1905,7 +1905,6 @@ template("android_aidl") { # dist_dir: Directory for the exe and libraries. Everything in this directory # will be deleted before copying in the exe and libraries. # binary: Path to (stripped) executable. -# include_main_binary: Whether |binary| should be copied to |dist_dir|. # # Example # create_native_executable_dist("foo_dist") { @@ -1959,22 +1958,17 @@ template("create_native_executable_dist") { visibility = [ ":$template_name" ] clear_dir = true - inputs = [ + binary, libraries_list, ] - if (defined(invoker.include_main_binary) && invoker.include_main_binary) { - inputs += [ binary ] - } - dest = dist_dir - + rebased_binaries_list = rebase_path([ binary ], root_build_dir) rebased_libraries_list = rebase_path(libraries_list, root_build_dir) - args = [ "--files=@FileArg($rebased_libraries_list:lib_paths)" ] - if (defined(invoker.include_main_binary) && invoker.include_main_binary) { - rebased_binaries_list = rebase_path([ binary ], root_build_dir) - args += [ "--files=$rebased_binaries_list" ] - } + args = [ + "--files=$rebased_binaries_list", + "--files=@FileArg($rebased_libraries_list:lib_paths)", + ] deps = [ ":$find_deps_target_name", |