• Nico Weber's avatar
    Clean up deps vs data_deps handling for repack() uses. · 00e1de67
    Nico Weber authored
    Instead of
    
    foo("bar") {
      deps = [ ":repack" ]
      data = [ "$root_out_dir/repack_output.pak" ]
    }
    
    use
    
    foo("bar") {
      data_deps = [ ":repack" ]
    }
    
    This happens to remove `$root_out_dir/locales/` from data,
    which is good for correct incremental builds (see bug).
    
    I didn't touch android and iOS, since I don't know the
    android_assets() / the copy_data_to_bundle approach used
    in iOS well.
    
    (For similar bundling reasons, most of the `data` lines were already in
    !is_mac blocks.)
    
    While comparing browser_tests.runtime_deps as described in comment 18
    on the linked bug, I noticed that we include .pak.info files in the
    isolate for repack()ed files. Since those are build-time things, remove
    them from repack() outputs, so that data_deps doesn't add these to the
    .runtime_deps files. (For the build, the removal is harmless since deps
    are still tracked through the action stamp files.)
    
    One side effect of this change is that most test binaries defined
    in chrome/test now get all locales in their isolate, instead of just
    en-US or en-US and fr previously.
    
    The target that includes ui_tests.pak is //ui/resources:ui_test_pak_data,
    switch to that in a few places -- the previous ui_test_pak target
    pulled in ui/en-US.pak which apparently isn't needed anywhere.
    
    TBR=torne,sergeyu
    
    Bug: 912946
    Change-Id: I0d9c6ff0d3b00cd5a876443b61b083a1aabf24d9
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1989515
    Commit-Queue: Nico Weber <thakis@chromium.org>
    Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#729946}
    00e1de67
BUILD.gn 1.92 KB