@@ -92,7 +92,7 @@ cc_library(
9292 ],
9393 hdrs = ["include/lldb/Version/Version.h" ],
9494 features = ["-layering_check" ], # Version.inc breaks this unintentionally
95- strip_include_prefix = "include" ,
95+ includes = [ "include" ] ,
9696 deps = ["//clang:basic" ],
9797)
9898
@@ -208,7 +208,7 @@ cc_library(
208208 "source/API/**/*.h" ,
209209 ]),
210210 hdrs = glob (["include/lldb/API/**/*.h" ]) + [":lldb-sbapi-dwarf-enums" ],
211- strip_include_prefix = "include" ,
211+ includes = [ "include" ] ,
212212 deps = [
213213 ":Breakpoint" ,
214214 ":Commands" ,
@@ -254,7 +254,7 @@ cc_library(
254254 name = "Breakpoint" ,
255255 srcs = glob (["source/Breakpoint/**/*.cpp" ]),
256256 hdrs = glob (["include/lldb/Breakpoint/**/*.h" ]),
257- strip_include_prefix = "include" ,
257+ includes = [ "include" ] ,
258258 deps = [
259259 ":Core" ,
260260 ":DataFormattersHeaders" ,
@@ -275,7 +275,7 @@ cc_library(
275275 "source/DataFormatters/**/*.h" ,
276276 ]),
277277 hdrs = glob (["include/lldb/DataFormatters/**/*.h" ]),
278- strip_include_prefix = "include" ,
278+ includes = [ "include" ] ,
279279 textual_hdrs = glob (["source/DataFormatters/**/*.def" ]),
280280 deps = [
281281 ":CoreHeaders" ,
@@ -292,7 +292,7 @@ cc_library(
292292 name = "Expression" ,
293293 srcs = glob (["source/Expression/**/*.cpp" ]),
294294 hdrs = glob (["include/lldb/Expression/**/*.h" ]) + [":lldb-sbapi-dwarf-enums" ],
295- strip_include_prefix = "include" ,
295+ includes = [ "include" ] ,
296296 deps = [
297297 ":Core" ,
298298 ":Headers" ,
@@ -314,7 +314,7 @@ cc_library(
314314 name = "Initialization" ,
315315 srcs = glob (["source/Initialization/**/*.cpp" ]),
316316 hdrs = glob (["include/lldb/Initialization/**/*.h" ]),
317- strip_include_prefix = "include" ,
317+ includes = [ "include" ] ,
318318 deps = [
319319 ":Core" ,
320320 ":Headers" ,
@@ -349,33 +349,33 @@ gentbl_cc_library(
349349cc_library (
350350 name = "APIHeaders" ,
351351 hdrs = glob (["include/lldb/API/**/*.h" ]),
352- strip_include_prefix = "include" ,
352+ includes = [ "include" ] ,
353353)
354354
355355cc_library (
356356 name = "InterpreterHeaders" ,
357357 hdrs = glob (["include/lldb/Interpreter/**/*.h" ]),
358- strip_include_prefix = "include" ,
358+ includes = [ "include" ] ,
359359 deps = [":APIHeaders" ],
360360)
361361
362362cc_library (
363363 name = "BreakpointHeaders" ,
364364 hdrs = glob (["include/lldb/Breakpoint/**/*.h" ]),
365- strip_include_prefix = "include" ,
365+ includes = [ "include" ] ,
366366)
367367
368368cc_library (
369369 name = "ExpressionHeaders" ,
370370 hdrs = glob (["include/lldb/Expression/**/*.h" ]) + [":lldb-sbapi-dwarf-enums" ],
371- strip_include_prefix = "include" ,
371+ includes = [ "include" ] ,
372372 deps = ["//llvm:ExecutionEngine" ],
373373)
374374
375375cc_library (
376376 name = "DataFormattersHeaders" ,
377377 hdrs = glob (["include/lldb/DataFormatters/**/*.h" ]),
378- strip_include_prefix = "include" ,
378+ includes = [ "include" ] ,
379379)
380380
381381cc_library (
@@ -420,7 +420,7 @@ cc_library(
420420 name = "Commands" ,
421421 srcs = glob (["source/Commands/**/*.cpp" ]),
422422 hdrs = glob (["source/Commands/**/*.h" ]),
423- strip_include_prefix = "source" ,
423+ includes = [ "source" ] ,
424424 deps = [
425425 ":Breakpoint" ,
426426 ":CommandOptions" ,
@@ -445,7 +445,7 @@ cc_library(
445445cc_library (
446446 name = "SymbolHeaders" ,
447447 hdrs = glob (["include/lldb/Symbol/**/*.h" ]),
448- strip_include_prefix = "include" ,
448+ includes = [ "include" ] ,
449449)
450450
451451cc_library (
@@ -473,7 +473,7 @@ cc_library(
473473 "include/lldb/Host/macosx/*.h" ,
474474 "include/lldb/Host/posix/*.h" ,
475475 ]),
476- strip_include_prefix = "include" ,
476+ includes = [ "include" ] ,
477477 deps = [":UtilityHeaders" ],
478478)
479479
@@ -483,7 +483,7 @@ cc_library(
483483 "source/Host/macosx/cfcpp/*.h" ,
484484 "source/Host/macosx/objcxx/*.h" ,
485485 ]),
486- strip_include_prefix = "source" ,
486+ includes = [ "source" ] ,
487487 tags = ["nobuildkite" ],
488488 target_compatible_with = select ({
489489 "@platforms//os:macos" : [],
@@ -545,6 +545,7 @@ cc_library(
545545 "include/lldb/Host/posix/*.h" ,
546546 ]),
547547 }),
548+ includes = ["include" ],
548549 # TODO: Move this to Config library when https://github.com/bazelbuild/bazel/issues/21884 is fixed
549550 linkopts = select ({
550551 "@platforms//os:macos" : [
@@ -566,7 +567,6 @@ cc_library(
566567 ],
567568 "//conditions:default" : [],
568569 }),
569- strip_include_prefix = "include" ,
570570 deps = [
571571 ":Headers" ,
572572 ":UtilityHeaders" ,
@@ -615,7 +615,7 @@ cc_library(
615615 "include/lldb/Core/**/*.h" ,
616616 "include/lldb/ValueObject/**/*.h" , # This should be its own library.
617617 ]),
618- strip_include_prefix = "include" ,
618+ includes = [ "include" ] ,
619619 deps = [
620620 ":BreakpointHeaders" ,
621621 ":CoreProperties" ,
@@ -642,7 +642,7 @@ cc_library(
642642 "include/lldb/Core/**/*.h" ,
643643 "include/lldb/ValueObject/**/*.h" , # This should be its own library.
644644 ]),
645- strip_include_prefix = "include" ,
645+ includes = [ "include" ] ,
646646 deps = [
647647 ":BreakpointHeaders" ,
648648 ":CoreHeaders" ,
@@ -691,7 +691,7 @@ cc_library(
691691cc_library (
692692 name = "TargetHeaders" ,
693693 hdrs = glob (["include/lldb/Target/**/*.h" ]),
694- strip_include_prefix = "include" ,
694+ includes = [ "include" ] ,
695695 deps = [
696696 ":AppleArm64ExceptionClass" ,
697697 ":BreakpointHeaders" ,
@@ -727,27 +727,27 @@ cc_library(
727727 hdrs = glob (["include/lldb/lldb-*.h" ]) + [
728728 "include/lldb/Symbol/SaveCoreOptions.h" ,
729729 ],
730- strip_include_prefix = "include" ,
730+ includes = [ "include" ] ,
731731)
732732
733733cc_library (
734734 name = "UtilityPrivateHeaders" ,
735735 hdrs = glob (["source/Utility/**/*.h" ]),
736- strip_include_prefix = "source" ,
736+ includes = [ "source" ] ,
737737 deps = [":Headers" ],
738738)
739739
740740cc_library (
741741 name = "UtilityHeaders" ,
742742 hdrs = glob (["include/lldb/Utility/**/*.h" ]),
743- strip_include_prefix = "include" ,
743+ includes = [ "include" ] ,
744744)
745745
746746cc_library (
747747 name = "Utility" ,
748748 srcs = glob (["source/Utility/**/*.cpp" ]),
749749 hdrs = glob (["include/lldb/Utility/**/*.h" ]),
750- strip_include_prefix = "include" ,
750+ includes = [ "include" ] ,
751751 deps = [
752752 ":CoreHeaders" ,
753753 ":Headers" ,
0 commit comments