Commit Graph

50662 Commits

Author SHA1 Message Date
Colin Cross
eed308db9e Merge "Use turbine instead of kapt for kotlin annotation processors" am: edd46702e1 am: 9ad80f6486
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030724

Change-Id: I4fa56fbcd8d1c01b742f4ab610b52713b9048c44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 18:47:13 +00:00
Colin Cross
b420d23c16 Merge "Don't use ziptime or --temp_dir for turbine" am: e311abcd44 am: 79e93d626a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030723

Change-Id: I5740d64c1032b88c91acafee32539e16d846a4c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 18:46:49 +00:00
Colin Cross
9ad80f6486 Merge "Use turbine instead of kapt for kotlin annotation processors" am: edd46702e1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030724

Change-Id: I6063a9ba1100ae82bdddb8a49d3860d2ed196c8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 18:28:20 +00:00
Colin Cross
79e93d626a Merge "Don't use ziptime or --temp_dir for turbine" am: e311abcd44
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030723

Change-Id: I88dfba08c5e64a7da4673dc8674e8ea579cc85b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 18:27:18 +00:00
Colin Cross
edd46702e1 Merge "Use turbine instead of kapt for kotlin annotation processors" 2022-03-28 18:07:14 +00:00
Colin Cross
e311abcd44 Merge "Don't use ziptime or --temp_dir for turbine" 2022-03-28 18:00:49 +00:00
Jooyung Han
0ea9f70a8a Merge "Revert "Add a tool to list contents of .img file"" am: 76c255f45a am: 42f6e1f4f0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2045010

Change-Id: If522c523ad79747f896c51914c4eef62e4254b5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 10:27:00 +00:00
Jooyung Han
42f6e1f4f0 Merge "Revert "Add a tool to list contents of .img file"" am: 76c255f45a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2045010

Change-Id: Ib2b1bc21f45982e2a2fbc93a71bccb05724c00fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 10:08:28 +00:00
Jooyung Han
76c255f45a Merge "Revert "Add a tool to list contents of .img file"" 2022-03-28 09:48:10 +00:00
Jooyung Han
1df464a90b Revert "Add a tool to list contents of .img file"
Revert submission 2041990-microdroid-contents

Reason for revert: b/227144320 (broken build)
Reverted Changes:
Ie2f471d39:Add the golden list of microdroid contents
I7c4fca184:Add a tool to list contents of .img file

Change-Id: If2b5d6cb1325cb17ef2bdc4f13ded003ab2dd6d7
2022-03-28 09:44:33 +00:00
Treehugger Robot
7f1f1b7306 Merge "Add a tool to list contents of .img file" am: 23ce5b4ca2 am: 44e7cb664a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2041990

Change-Id: Idd191b0ca3e5fb21ab60f2259efc670be55974b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 05:39:16 +00:00
Treehugger Robot
44e7cb664a Merge "Add a tool to list contents of .img file" am: 23ce5b4ca2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2041990

Change-Id: Ie1811ccc3aaa56456f94c57e7dc4efcd6f817780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 05:24:07 +00:00
Treehugger Robot
23ce5b4ca2 Merge "Add a tool to list contents of .img file" 2022-03-28 05:06:55 +00:00
Treehugger Robot
509c730ec9 Merge "Dedupe libraries in both static and whole static" am: 6876d5aa5f am: 0c576c591f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032378

Change-Id: Ibbb5c9aa1ea1f15e82e23970309964dd4934c804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-26 00:54:15 +00:00
Treehugger Robot
8a52a128fc Merge "Add metrics collection to soong_build" am: 1c2d87ba83 am: 8ef2e1c7fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044963

Change-Id: Id9ceca6f2b673182eb16ac2f988abd42df589dbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-26 00:54:03 +00:00
Treehugger Robot
0c576c591f Merge "Dedupe libraries in both static and whole static" am: 6876d5aa5f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032378

Change-Id: Ife1337bd64542061d26929be94db7ba24d5a8d38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-26 00:38:09 +00:00
Treehugger Robot
8ef2e1c7fe Merge "Add metrics collection to soong_build" am: 1c2d87ba83
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044963

Change-Id: I6e0a7d386a212ae8abb50c5b86dccdb6812279f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-26 00:37:56 +00:00
Treehugger Robot
6876d5aa5f Merge "Dedupe libraries in both static and whole static" 2022-03-26 00:32:01 +00:00
Treehugger Robot
1c2d87ba83 Merge "Add metrics collection to soong_build" 2022-03-26 00:21:21 +00:00
Mitch Phillips
2c491d8302 Merge "[HWASan] Enable zero-initialization." am: c6ea944e18 am: ab50a4f910
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2037383

Change-Id: I513d96dd661300ae7ee54b11f581f5b050e0e273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 21:24:31 +00:00
Chris Parsons
715b08fd82 Add metrics collection to soong_build
Metrics are added to a materialized protobuf soong_build_metrics.pb

Recorded events have scoped names and recorded runtimes.
For example, mixedbuilds includes the following events:

mixedbuilds.prepare
mixedbuilds.analyze.write_files
mixedbuild     (this is a total of all mixedbuild events)

Test: Manually verified materialized protos for mixedbuild, bp2build,
and legacy build.

Change-Id: I2e72d4502c0373bee0279bb1320b2e4dd586129c
2022-03-25 17:19:44 -04:00
Mitch Phillips
ab50a4f910 Merge "[HWASan] Enable zero-initialization." am: c6ea944e18
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2037383

Change-Id: Iecb84d51be0c5ebfc9bca66f2f17a1a6c28e16a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 21:08:24 +00:00
Mitch Phillips
c6ea944e18 Merge "[HWASan] Enable zero-initialization." 2022-03-25 20:53:02 +00:00
Colin Cross
f61766e987 Use turbine instead of kapt for kotlin annotation processors
Follow Bazel by using turbine instead of kapt to run annotation
processors.  This still requires using kapt to generate java stubs
of kotlin soruces, then uses turbine to run annotation processors
on the java stubs and any java sources to generate sources and
resources, and passes the annotation processor generated sources
to kotlinc and javac.

Bug: 225013372
Test: m checkbuild
Test: TestKapt
Change-Id: I9c6fc496a9fba64658bb062538bc5f7b9478b07a
2022-03-25 10:28:50 -07:00
Colin Cross
411647e8f4 Don't use ziptime or --temp_dir for turbine
Turbine sets dates to 2010 and doesn't need ziptime any more, and
ignores the --temp_dir flag.

Bug: 225013372
Test: m checkbuild
Change-Id: I6122f27d873ca671050e4dc0d65641bb52e90e99
2022-03-25 10:26:47 -07:00
Spandan Das
667639eda2 Merge "Do not propagate strict_updatability linting to conscrypt and framework-media java_sdk_libraries" am: 183ed1044c am: d2f5f1c690
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2043123

Change-Id: I3b95c331c3a99edba0c76bd93eab811d3cbde261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:17:25 +00:00
Trevor Radcliffe
04d3400178 Merge "Allow appending artifact in dist with product name" am: dadc037ef3 am: 2705a090ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034743

Change-Id: Id4bc35c39e167bcaf6559ddcaff8916bc11555dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:16:28 +00:00
Spandan Das
d2f5f1c690 Merge "Do not propagate strict_updatability linting to conscrypt and framework-media java_sdk_libraries" am: 183ed1044c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2043123

Change-Id: Ice945ab22199b5b552a9a68f31b8eea9c4d879d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:02:53 +00:00
Trevor Radcliffe
2705a090ca Merge "Allow appending artifact in dist with product name" am: dadc037ef3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034743

Change-Id: I0b6fbfbbc340b2d278057a1d8b030a9cdb51fe39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 16:59:04 +00:00
Spandan Das
183ed1044c Merge "Do not propagate strict_updatability linting to conscrypt and framework-media java_sdk_libraries" 2022-03-25 15:05:06 +00:00
Trevor Radcliffe
dadc037ef3 Merge "Allow appending artifact in dist with product name" 2022-03-25 14:34:23 +00:00
Yi Kong
8b5f050b64 Merge "Update to clang-r450784" am: 846a25912d am: 5c1c1cc020
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2027885

Change-Id: I574da4949e60a9cf9ef86dbe733edecdc2af75db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 06:32:57 +00:00
Yi Kong
5c1c1cc020 Merge "Update to clang-r450784" am: 846a25912d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2027885

Change-Id: I91d23b723f4d1fd4871a88e44d36cc966b086050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 06:07:49 +00:00
Yi Kong
846a25912d Merge "Update to clang-r450784" 2022-03-25 05:49:48 +00:00
Yi Kong
75ce5d3320 Update to clang-r450784
Test: presubmit
Bug: 219872355
Change-Id: I3cd5f42d887b07929906e08d7d9f1a677b8a4403
2022-03-25 04:30:53 +00:00
Spandan Das
2cf278e75b Do not propagate strict_updatability linting to conscrypt
and framework-media java_sdk_libraries

Tmp fix for
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=errorprone&lkgb=8352129&lkbb=8353967&fkbb=8352538

Test: m
out/soong/.intermediates/external/conscrypt/conscrypt.module.public.api.stubs.system/android_common/lint/lint-baseline.xml
Test: (internal CI target) https://android-build.googleplex.com/builds/abtd/run/L67700000953708519
Bug: 182349282
Bug: 226637002
Bug: 226608044

Change-Id: I17e540877200f59bfd51e69e57d8bcca6cf3850f
2022-03-25 02:31:20 +00:00
Jooyung Han
b3a3a2893b Add a tool to list contents of .img file
list_image <img> lists the contents of the file.

For example:
  $ m microdroid
  $ list_image <path to microdroid.img>
  ./
  ./apex/
  ./bin
  ..

Bug: 195425111
Bug: 225121718
Test: list_image .img
Change-Id: I7c4fca184751ba20066fd25fa4c366a955dbabf6
2022-03-25 02:44:36 +09:00
Spandan Das
db71cd071c Merge changes I4c373b29,I9ccda6fc,I1b390b0e,I30151217 am: ad40fffa64 am: 3dd2985871
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1977412

Change-Id: I499bec2b5349a698d3a64887dc9e66f3ddc2586d
2022-03-24 17:25:10 +00:00
Spandan Das
3dd2985871 Merge changes I4c373b29,I9ccda6fc,I1b390b0e,I30151217 am: ad40fffa64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1977412

Change-Id: I94b4d8667a3fb5fcb4e7212250b34452cf42634d
2022-03-24 17:04:15 +00:00
Spandan Das
ad40fffa64 Merge changes I4c373b29,I9ccda6fc,I1b390b0e,I30151217
* changes:
  Do not propagate strict updatability linting to libcore/
  Create allowlist to skip strict updatability lint check
  Propagate strict_updatability_linting to transitive deps of updatable apexes
  Export LintDepSetsIntf from java package
2022-03-24 16:38:20 +00:00
Andrei-Valentin Onea
bb8e21aace Merge "Revert "Prevent unspecified values in soong_config_string_variable"" am: b47e89f2d1 am: dc8995fb1f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2041963

Change-Id: I56d0f1556fa40c0a895628f88898aea29019e875
2022-03-24 15:09:06 +00:00
Trevor Radcliffe
90727f4576 Allow appending artifact in dist with product name
Some modules need to have their artifacts copied to dist with the
product name appended. This CL enables that functionality in a
boolean Soong property called append_artifact_with_product.

Fixes: 224561567
Test: Unit tests and build relevant target/modules
Change-Id: I4b824d4001679cebf0a9059be2d090d33a310933
2022-03-24 14:46:18 +00:00
Andrei-Valentin Onea
dc8995fb1f Merge "Revert "Prevent unspecified values in soong_config_string_variable"" am: b47e89f2d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2041963

Change-Id: Id0fbdaaed89124e22b00d743c4518bd4e4dc93c2
2022-03-24 14:32:35 +00:00
Andrei-Valentin Onea
b47e89f2d1 Merge "Revert "Prevent unspecified values in soong_config_string_variable"" 2022-03-24 14:11:18 +00:00
Andrei-Valentin Onea
38944c70c4 Revert "Prevent unspecified values in soong_config_string_variable"
This reverts commit 542905a280.

Reason for revert: This check is breaking multiple builds, creating fixes to minimize re-land work.

Change-Id: I6431bd0864f49781910dad787e1ba9375b9931b3
2022-03-24 13:52:58 +00:00
Treehugger Robot
055c213828 Merge "Prevent unspecified values in soong_config_string_variable" am: 1da556928a am: 7ab5956663
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030432

Change-Id: I3d5201c85140f4ce21fa5b79c8535630205b47bf
2022-03-24 04:35:15 +00:00
Treehugger Robot
7ab5956663 Merge "Prevent unspecified values in soong_config_string_variable" am: 1da556928a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030432

Change-Id: I06c567c8c442d27111e55f5b6ed1587bce245865
2022-03-24 04:10:08 +00:00
Treehugger Robot
1da556928a Merge "Prevent unspecified values in soong_config_string_variable" 2022-03-24 00:44:47 +00:00
Mitch Phillips
597605603a [HWASan] Enable zero-initialization.
Previously, we use to fill memory with 0xbe bytes. This caused a lot of
problems that necessitated disablement. For example, 0xbe-filled mutexes
are apparently locked, and there were a few instances of
uninitialized-mutex use.

Given that zero-fill is now the default behaviour, enable zero-init in
HWASan as well.

For now, only fill the first page. It would be preferable to fill the
whole allocation, but I don't want to spin for too many cycles filling
huge secondary pages. In future, we might change the behaviour to have
an explicit "zero initialize" option that completely fills the primarily
allocations, and knows it's unnecessary for the secondary.

Bug: 226078464
Test: Boot w/ HWASan (done by presubmit robot)

Change-Id: I7de3a7f9fa2fdeb5116e5bf6586babe4d06fcb91
2022-03-22 18:38:34 +00:00
Colin Cross
9c495b2617 Merge "Collect deps from r8" am: 057beb2146 am: c20adfad25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034623

Change-Id: I46aa9831a8ff4cd4f7a7f0eca886c824a47e7fbe
2022-03-22 17:21:19 +00:00