diff options
| author | Rupert Shuttleworth <ruperts@google.com> | 2021-04-06 16:37:15 +0000 |
|---|---|---|
| committer | Rupert Shuttleworth <ruperts@google.com> | 2021-04-08 09:43:04 +0000 |
| commit | c58d3d214ea25d2ef56c1bc13374243dc699a44a (patch) | |
| tree | 8b6f6bf7280c058612d2b1172e8e0c76db0ed12a /bp2build/cc_library_static_conversion_test.go | |
| parent | f247ff73ae5c0b9f13ca2a6136046129bbce0a18 (diff) | |
Be more explicit about headers in cc_library_static targets.
Test: bp2build-sync.py write; bazel build //bionic/...
Change-Id: I253b55f4d3cbe76805691b32e761016950871601
Diffstat (limited to 'bp2build/cc_library_static_conversion_test.go')
| -rw-r--r-- | bp2build/cc_library_static_conversion_test.go | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/bp2build/cc_library_static_conversion_test.go b/bp2build/cc_library_static_conversion_test.go index 467b0b286..ef528e96b 100644 --- a/bp2build/cc_library_static_conversion_test.go +++ b/bp2build/cc_library_static_conversion_test.go @@ -101,6 +101,9 @@ func TestCcLibraryStaticBp2Build(t *testing.T) { "export_include_dir_1/export_include_dir_1_b.h": "", "export_include_dir_2/export_include_dir_2_a.h": "", "export_include_dir_2/export_include_dir_2_b.h": "", + // NOTE: Soong implicitly includes headers in the current directory + "implicit_include_1.h": "", + "implicit_include_2.h": "", }, bp: soongCcLibraryStaticPreamble + ` cc_library_headers { @@ -203,34 +206,65 @@ cc_library_static { "include_dir_2", "local_include_dir_1", "local_include_dir_2", + ".", ], linkstatic = True, srcs = [ "foo_static1.cc", "foo_static2.cc", + "implicit_include_1.h", + "implicit_include_2.h", + "include_dir_1/include_dir_1_a.h", + "include_dir_1/include_dir_1_b.h", + "include_dir_2/include_dir_2_a.h", + "include_dir_2/include_dir_2_b.h", + "local_include_dir_1/local_include_dir_1_a.h", + "local_include_dir_1/local_include_dir_1_b.h", + "local_include_dir_2/local_include_dir_2_a.h", + "local_include_dir_2/local_include_dir_2_b.h", ], )`, `cc_library_static( name = "static_lib_1", + includes = [ + ".", + ], linkstatic = True, srcs = [ + "implicit_include_1.h", + "implicit_include_2.h", "static_lib_1.cc", ], )`, `cc_library_static( name = "static_lib_2", + includes = [ + ".", + ], linkstatic = True, srcs = [ + "implicit_include_1.h", + "implicit_include_2.h", "static_lib_2.cc", ], )`, `cc_library_static( name = "whole_static_lib_1", + includes = [ + ".", + ], linkstatic = True, srcs = [ + "implicit_include_1.h", + "implicit_include_2.h", "whole_static_lib_1.cc", ], )`, `cc_library_static( name = "whole_static_lib_2", + includes = [ + ".", + ], linkstatic = True, srcs = [ + "implicit_include_1.h", + "implicit_include_2.h", "whole_static_lib_2.cc", ], )`}, |