Commit Graph

6123 Commits

Author SHA1 Message Date
Rupert Shuttleworth
c28344a852 Add support for per-target exported includes. am: 375451edfe am: 0190e56ad0 am: cb584b1731
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686625

Change-Id: Iee0049ab7a2e129cc34ba7c3e7619dc37eab8e8c
2021-04-26 14:25:47 +00:00
Rupert Shuttleworth
375451edfe Add support for per-target exported includes.
Test: Added unit test
Change-Id: I8ab58ddc73c15d5ec0f515e43407542bd4e8081a
2021-04-26 07:49:08 -04:00
Treehugger Robot
a7a7781907 Merge "Incorporate cc_library_headers into mixed builds" am: 459c532e44 am: f3a8a7aeaf am: fc49cc7de6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1673770

Change-Id: I2234c40a8b091e82da7417de483f92624870d6f1
2021-04-23 16:05:18 +00:00
Treehugger Robot
459c532e44 Merge "Incorporate cc_library_headers into mixed builds" 2021-04-23 15:14:55 +00:00
Treehugger Robot
bc2cb768b5 Merge "Revert^3 "Add debug ramdisk variant"" am: 39e03144a0 am: f842949de1 am: af0fb26f44
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1684312

Change-Id: I3eed155076e03d06e190e0262e80522fefdaea3b
2021-04-23 14:02:48 +00:00
Liz Kammer
b6a55bf065 Incorporate cc_library_headers into mixed builds
Test: go soong tests
Test: bp2build generate & sync; mixed build libc; mixed build su (su is
      an Android.mk target that relies on converted a cc_library_headers)
Bug: 181552740
Change-Id: I9efd587970551fd41f642a208f0aa0a80e8694e0
2021-04-23 09:37:33 -04:00
Treehugger Robot
39e03144a0 Merge "Revert^3 "Add debug ramdisk variant"" 2021-04-23 13:09:24 +00:00
Colin Cross
9bc6905cdb Merge changes from topic "remove_llndk_library1" am: 7c6a485f64 am: c8f4b51a87 am: 5a20f23b51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1611943

Change-Id: Ief354bff9b8593f1d27b6cd1ec729edf6089b482
2021-04-23 00:41:47 +00:00
Colin Cross
8bb1e2b2c3 Dedup include dir paths am: c82e6e2e8f am: e9b1ad346d am: 31e3f9984f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682925

Change-Id: If688b048d1fc233cc4ad6fa2bb4e1d45ade2a6a0
2021-04-23 00:41:44 +00:00
Colin Cross
e9b1ad346d Dedup include dir paths am: c82e6e2e8f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682925

Change-Id: Iada0f88cd8c9609e39b749ecc42c998c8ed30f72
2021-04-23 00:01:19 +00:00
Colin Cross
7c6a485f64 Merge changes from topic "remove_llndk_library1"
* changes:
  Support cc_library as LLNDK without llndk_library
  Dedup include dir paths
2021-04-22 23:33:29 +00:00
Inseob Kim
aeb6bad073 Revert^3 "Add debug ramdisk variant"
836a8f3d61

Change-Id: If59529238e26a197bc33b10245b88f538f280ed0
2021-04-22 23:14:58 +00:00
Florian Mayer
602af75c16 Merge "Revert^2 "Add debug ramdisk variant"" am: 4d48aa5255 am: 723ac288a4 am: 17c91a2916
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683875

Change-Id: I9486725cf4cd1b49f58af62f54a4d3749d5933e9
2021-04-22 17:22:19 +00:00
Florian Mayer
4d48aa5255 Merge "Revert^2 "Add debug ramdisk variant"" 2021-04-22 16:40:24 +00:00
Florian Mayer
836a8f3d61 Revert^2 "Add debug ramdisk variant"
78ea2f5eac

Change-Id: I6a6a2ee82e2807045364bab105ec03a1934b411f
2021-04-22 16:38:47 +00:00
Treehugger Robot
0b3271220f Merge "Revert "Add debug ramdisk variant"" am: f9c6744e28 am: ae210266fd am: e6bdf43b20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1684345

Change-Id: Ic652022b750d9aad6f88f2feb742e0b84426cf9e
2021-04-22 16:18:05 +00:00
Treehugger Robot
f9c6744e28 Merge "Revert "Add debug ramdisk variant"" 2021-04-22 15:28:06 +00:00
Jingwen Chen
26cb01c4a4 bp2build: refactor/standardize cc_* bp2build converters am: ed9c17d033 am: 0a52f7276e am: 8bddaab06a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1674326

Change-Id: I5874807a960a030a8f7367d3ce877b2542100b84
2021-04-22 11:28:47 +00:00
Jingwen Chen
ed9c17d033 bp2build: refactor/standardize cc_* bp2build converters
This CL refactors the cc* bp2build converters to use the common
attribute extractors in cc/bp2build.go.

This also adds include_build_directory to be handled by the compiler
attr extractor to generate recursive headers as inputs.

This also turns include_dirs and local_include_dirs into the
execroot-relative -I flags.

e.g. if a module in  bionic/libc has "private" in local_include_dirs,
the "-Ibionic/libc/private" copt is generated for it.

Fixes: 185139955

Test: TH
Test: Forrest for mixed_clean-droid
Change-Id: Ib67056482227e62068fbbea0455035bdf5d56319
2021-04-22 08:31:24 +00:00
cmtice
5e13f86fc8 Make DWARF v5 the default debug information format.
This makes DWARF v5 the default debug information format for C/C++
programs in the Platform that are compiled with LLVM.

Test: Testing in progress.
Bug: b/182004844
Change-Id: I9aa6a3ca05ac0fdfa54f556c2e20ffd818b25420
2021-04-22 03:17:16 +00:00
Bowgo Tsai
78ea2f5eac Revert "Add debug ramdisk variant"
This reverts commit f84e9c05e2.

Because this breaks the usage of boot-debug.img and
vendor_boot-debug.img

Bug: 185970130
Bug: 185990198
Test: make bootimage_debug
Change-Id: I7886c971982faae1d5bc34688643de8d94d6e201
2021-04-22 09:49:24 +08:00
Elliott Hughes
04d2dcefa2 Merge "Move some make variables from GNU binutils to LLVM equivalents." am: 7c0abf6f3c am: 6b4a5ab97b am: fd6c513703
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683506

Change-Id: I697975ae430c2a0760434d401b0190b87f0220bf
2021-04-22 00:31:07 +00:00
Elliott Hughes
7c0abf6f3c Merge "Move some make variables from GNU binutils to LLVM equivalents." 2021-04-21 22:59:09 +00:00
Elliott Hughes
a960a0d5de Move some make variables from GNU binutils to LLVM equivalents.
There are others still to look at, but this set doesn't seem to break
anything for me.

Bug: http://b/147452927
Test: treehugger
Change-Id: I794684e23eee1326deb34bb4d5ed5831a47b8fa3
2021-04-21 10:22:55 -07:00
Jiyong Park
146ca5c18b Merge "android_system_image that generates linker.config.pb" am: 08bd0dd8c5 am: f8fa18e066 am: 6038c75c3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1679107

Change-Id: Iea767fc21e8922bc7a921e05b1048cc6e126db6c
2021-04-21 06:05:24 +00:00
Colin Cross
0fb7fcd3a6 Support cc_library as LLNDK without llndk_library
Allow cc_library modules to configure themselves as an LLNDK library
using llndk.symbol_file instead of llndk_stubs pointing to an
llndk_library module.

Bug: 170784825
Test: TestEmbeddedLlndkLibrary
Change-Id: Id884cdada7094bbea6809a98e687e039778c5dc6
2021-04-20 22:24:11 -07:00
Jiyong Park
08bd0dd8c5 Merge "android_system_image that generates linker.config.pb" 2021-04-21 04:57:49 +00:00
Colin Cross
c82e6e2e8f Dedup include dir paths
Remove duplicates from include dir paths before setting
FlagExporterInfoProvider.  Duplicates often occur, for example due to
inheriting export_include_dirs from the static variant of a library to
the shared variant of the library that also gets the same
export_include_dirs.

Test: m checkbuild
Change-Id: I71f9e841547db64cbabcd95288ee93ef21fab4fb
2021-04-20 18:22:58 -07:00
Jiyong Park
fa616137a2 android_system_image that generates linker.config.pb
android_system_image module type is a specialization of the
android_filesystem module type. Currently, it adds a build rule for
creating linker.config.pb from the information about all the other files
in the filesystem and includes linker.config.pb to the filesystem as
well.

To do so, the filesystem module now provides a function pointer which
subtype modules like android_system_image can implement to pass extra
files that they want to package in the filesystem.

In addition, the linkerconfig package is revised to make it possible to
build linker.config.pb file outside of the package.

Bug: 185391776
Test: m microdroid and inspect etc/linker.config.pb in it.

Change-Id: Id89c40b519213062860d7306029b8413d8d36a2d
2021-04-21 09:11:21 +09:00
Elliott Hughes
3a0767a47c Merge "Move builder.go over to llvm-objcopy." am: 2cb4cfc593 am: 9584abf7a3 am: 110617e984
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1680365

Change-Id: I85471ee3271ab499f1443eff01542c99225b75dc
2021-04-20 22:40:26 +00:00
Elliott Hughes
2cb4cfc593 Merge "Move builder.go over to llvm-objcopy." 2021-04-20 21:30:58 +00:00
Treehugger Robot
5204451f6a Merge "Move cc_object tests to object_test.go" am: a0b235a9d9 am: a82efc51e5 am: b6f6770985
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1679687

Change-Id: Iebcf9981307b08f83d69f69d28952f383551a98b
2021-04-19 23:49:32 +00:00
Treehugger Robot
a0b235a9d9 Merge "Move cc_object tests to object_test.go" 2021-04-19 22:48:15 +00:00
Chris Parsons
5db4828abb Add a denylist for specifically mixed builds am: bab4d7e3bc am: 2678212a0f am: cd40ec4e44
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1677624

Change-Id: Ie9b5de425df4cc868fb851b49fefa0039900f50c
2021-04-19 20:12:36 +00:00
Elliott Hughes
2e70f79273 Move builder.go over to llvm-objcopy.
Bug: http://b/147452927
Test: treehugger
Change-Id: I60440e44669d226ca2ef2bcd8d0dbba59f01d43f
2021-04-19 12:58:43 -07:00
Liz Kammer
25f369fdca Move cc_object tests to object_test.go
Test: go test cc tests
Change-Id: I6a138482f678b6168b06b523ddbfeb639bf70364
2021-04-19 12:44:51 -04:00
Chris Parsons
bab4d7e3bc Add a denylist for specifically mixed builds
This allows us to, for certain modules, enable bp2build, but disable
mixed builds.
This facilitates easier iteration on these two features, as modules can
be incrementally "fixed" for bp2build, even if they are not ready for
mixed builds integration.

Test: USE_BAZEL_ANALYSIS=1 m libc
Test: Manually verified that note_* modules exist in bionic/libc/BUILD
Test: bazel build //bionic/....
Change-Id: I3462c8398680140cfc953443d96196143b8ad0a3
2021-04-19 12:30:02 -04:00
Treehugger Robot
a211c218df Merge "Add LLNDK stubs and headers to VNDK snapshot" am: 266fcfb850 am: 04d916ba64 am: 2ed0d7346e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1677930

Change-Id: I3143fc53087f14939126db6af6595b3e1282211b
2021-04-17 15:00:59 +00:00
Treehugger Robot
266fcfb850 Merge "Add LLNDK stubs and headers to VNDK snapshot" 2021-04-17 13:46:32 +00:00
Treehugger Robot
33accf0115 Merge changes from topic "tvts-test-host-jni" am: aef14db78a am: 3640bc3f70 am: af25c6cab8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560314

Change-Id: I1894a0a5bc90eba3a8151813834864344c881790
2021-04-17 05:53:34 +00:00
Treehugger Robot
aef14db78a Merge changes from topic "tvts-test-host-jni"
* changes:
  Add jni_libs property to java tests
  Add Target to cc.SharedLibraryInfo
2021-04-17 04:35:24 +00:00
Pirama Arumuga Nainar
8428b29596 Merge "Switch to clang r416183b 12.0.5." am: 27b5e614c8 am: a455f80d4d am: e1f3386154
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1677305

Change-Id: If614f76a682029efe07d2b7e04138bc52f7935aa
2021-04-16 17:53:50 +00:00
Pirama Arumuga Nainar
27b5e614c8 Merge "Switch to clang r416183b 12.0.5." 2021-04-16 16:39:34 +00:00
Justin Yun
450ae72314 Add LLNDK stubs and headers to VNDK snapshot
LLNDK stubs and headers are required to build the vendor modules
against VNDK snapshot libraries. Add the LLNDK stubs and headers to
the VNDK snapshot prebuilt files.
The stub libraries will be included in shared/llndk-stub directory.

Bug: 181815415
Test: development/vndk/snapshot/build.sh --build-artifacts
Change-Id: If518f3e91080e69fa1da94af0aa27320d4e71a08
2021-04-16 23:02:04 +09:00
Treehugger Robot
3199760848 Merge "Document stubs in cc_library." am: 0b21bf60b6 am: f9851054b9 am: 22971e3562
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1538221

Change-Id: Ief99c6f0d4fdcf550d21c9d8756f4ed2bc966ed6
2021-04-16 13:08:16 +00:00
Treehugger Robot
0b21bf60b6 Merge "Document stubs in cc_library." 2021-04-16 11:57:32 +00:00
Jiyong Park
cc7628c5fa Merge changes Ib07d4410,I0b306292 am: 7b4fb51919 am: 24f37728ee am: 08956ce9b5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1675766

Change-Id: If2a5d89e4e51b6a8813daf082a910f2dea91f604
2021-04-16 00:27:39 +00:00
Treehugger Robot
2619faa441 Merge "Remove draft API support." am: 7548b1ad05 am: 0ccb169046 am: c1499a90e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1674968

Change-Id: I281cb957b9214fdd9d90c6ec6e95c5c69a4f5c96
2021-04-16 00:27:22 +00:00
Jiyong Park
7b4fb51919 Merge changes Ib07d4410,I0b306292
* changes:
  ApexInfo doesn't pass MinSdkVersion as string, but as ApiLevel
  Remove nativeApiLevelFromUserWithDefault
2021-04-15 23:21:55 +00:00
Treehugger Robot
7548b1ad05 Merge "Remove draft API support." 2021-04-15 22:58:15 +00:00