Commit Graph

51339 Commits

Author SHA1 Message Date
Paul Duffin
fe844bb3f8 Merge "Pass pointer to dependencyTag instead of copying struct" am: 4dd76eb26c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096446

Change-Id: I8c4217c56e3d11f3d39780931dd6603dc0770b9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 22:20:53 +00:00
Paul Duffin
4dd76eb26c Merge "Pass pointer to dependencyTag instead of copying struct" 2022-05-13 21:46:11 +00:00
Christopher Parsons
1bf08694c8 Merge "Deterministic aquery details in mixed builds" am: 58c43e9694
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097673

Change-Id: I0b47451d66a970de114628385ca856d77d02a78f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:28:30 +00:00
Sam Delmerico
ec2519b0b9 Merge "disable usage of plugins as static libs" am: 1cb1c45e8c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076860

Change-Id: If7f1bd6e9b866acecc65cb615e0d2324d78c9bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:27:56 +00:00
Christopher Parsons
58c43e9694 Merge "Deterministic aquery details in mixed builds" 2022-05-13 18:04:23 +00:00
Sam Delmerico
1cb1c45e8c Merge "disable usage of plugins as static libs" 2022-05-13 17:57:15 +00:00
Elliott Hughes
1b9dbb8712 Merge "Now gnu11 is the default, bump experimental to gnu17." am: 51cb2d9374
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097173

Change-Id: I7cc6b02ea9535e2a7d32de930e54a61f8d7c8935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:52:21 +00:00
Chris Parsons
0bfb1c0556 Deterministic aquery details in mixed builds
This change constitutes a number of fixes which cause mixed builds to
have deterministic ninja file output:

1. Depsets are identified based on a hash of their contents instead of
   an arbitrary ID integer from Bazel
2. Depset definitions in the ninja file are sorted by the above hashes
3. BuildStatements (action information from Bazel's aquery) are sorted
   by their contents

Test: Ran `USE_BAZEL_ANALYSIS=1 m nothing` three times and verified the
md5sum of out/soong/build.ninja was identical all three runs.
Test: mixed_droid

Change-Id: Iffdf6cc62c31d76fbbfa78726827497516171f4f
2022-05-13 13:45:56 -04:00
Elliott Hughes
51cb2d9374 Merge "Now gnu11 is the default, bump experimental to gnu17." 2022-05-13 17:22:42 +00:00
Paul Duffin
520917af9d Pass pointer to dependencyTag instead of copying struct
A follow up change will add some more fields to the tag which will make
passing the struct around by value will get more expensive. Switching
to pointers will make this slightly more efficient.

Changing the type of the tags from dependencyTag to *dependencyTag
broke a test. Rather than simply patch the test and then maybe have to
patch it again in the next change this adds a a String() method that
will insulate the test from being affected by changes in the
dependencyTag contents.

Bug: 232401814
Test: m nothing
Change-Id: I23da742ebffb74ef3b9b68f772519ceb38332f5f
2022-05-13 16:06:36 +00:00
Treehugger Robot
793c10dcc7 Merge "Clean up hard-coded min_sdk_version/apex_available" am: 1c87db50ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2089563

Change-Id: I529687bcb7644a3413a367196b3779da8898c87d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 09:28:52 +00:00
Treehugger Robot
1c87db50ca Merge "Clean up hard-coded min_sdk_version/apex_available" 2022-05-13 04:56:59 +00:00
Elliott Hughes
4f8ee857f6 Merge "Try to bump the C default to C11." am: 94361dc903
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2043314

Change-Id: I2f640a2aa85516a8a3a6ec1de23b9cb4c1731b1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 17:06:27 +00:00
Elliott Hughes
6741d0eaa9 Now gnu11 is the default, bump experimental to gnu17.
Bug: http://b/232413369
Test: treehugger
Change-Id: I8a2b1eef744c219811c32ad46688437a1ba3f21e
2022-05-12 09:53:11 -07:00
Elliott Hughes
94361dc903 Merge "Try to bump the C default to C11." 2022-05-12 16:23:47 +00:00
Colin Cross
3137263855 Merge "Remove references to *_HOST_DALVIK_*" am: d2ee3a6afa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2060211

Change-Id: I9e9b539d9a817b26143f2f554057504e87f290f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 16:18:27 +00:00
Colin Cross
d2ee3a6afa Merge "Remove references to *_HOST_DALVIK_*" 2022-05-12 15:44:20 +00:00
Wei Li
9acec92f04 Merge "Add bp2build converter for override_apex." am: 49611b39a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092595

Change-Id: Ife8885f0339d08de481de8d448f1682b543259c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 07:30:01 +00:00
Treehugger Robot
f452f69744 Merge "bp2build: allowlist system/memory/libmemunreachable" am: c983b97a8b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096073

Change-Id: I55871a658378f9c95c3b82f698fd654eea75afce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 07:29:51 +00:00
Wei Li
49611b39a9 Merge "Add bp2build converter for override_apex." 2022-05-12 07:22:52 +00:00
Treehugger Robot
c983b97a8b Merge "bp2build: allowlist system/memory/libmemunreachable" 2022-05-12 07:01:33 +00:00
Thiébaud Weksteen
161080466b Merge "java/lint: enable lint on non-generated srcjar" am: 5471f4ea83
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2086850

Change-Id: I64cfb7d36861629da385c7f73e04d12d3322b07a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 06:54:01 +00:00
Thiébaud Weksteen
5471f4ea83 Merge "java/lint: enable lint on non-generated srcjar" 2022-05-12 06:26:41 +00:00
Wei Li
1c66fc74d2 Add bp2build converter for override_apex.
Bug: 216442475
Test: m nothing
Change-Id: I2f106d15c1d235583b8b1a8f0ac4b48162ff4fdd
2022-05-11 22:22:04 -07:00
Mark Dacek
8afaf623e1 Merge "Add Go proto for metrics. The current output is different from head. Test: N/A" am: 5736589122
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2095885

Change-Id: Ia701e95a7f37698bcb84b023f9b96127c2f69455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 00:57:22 +00:00
Treehugger Robot
1c7539c0a4 Merge "Switch the namespace tests to fully use test fixtures" am: b53efcfc97
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2095255

Change-Id: I839a06fff7a77bae190d206524748de5e208b19e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 00:55:40 +00:00
Jingwen Chen
b184d3130b bp2build: allowlist system/memory/libmemunreachable
A new dep on this package was added in https://android-review.googlesource.com/c/platform/bionic/+/2092709

Started failing from ab/8573658

Change-Id: If53bc4d75f95aeca9f0dcf007d7ed700860058eb
Test: CI
2022-05-12 00:28:57 +00:00
Mark Dacek
5736589122 Merge "Add Go proto for metrics. The current output is different from head. Test: N/A" 2022-05-11 23:46:27 +00:00
Treehugger Robot
b53efcfc97 Merge "Switch the namespace tests to fully use test fixtures" 2022-05-11 22:43:28 +00:00
MarkDacek
5b08fe1e9e Add Go proto for metrics. The current output is different from head.
Test: N/A

Change-Id: I3230bcec0136e4859118edee2e5e36ff502b2d0e
2022-05-11 21:55:53 +00:00
Treehugger Robot
9bc494bc08 Merge "Ensure that *bootclasspath* module types depend on device variants" am: 1a6305f9e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2095251

Change-Id: Idd2936bb753856c411a1753474671f39baca33f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:44:22 +00:00
Treehugger Robot
ff063f97fd Merge "convert java_resources with bp2build" am: 2737c25e9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042845

Change-Id: I917f7114637e0439f22be9d9d6c2521ed9c1d2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:44:12 +00:00
Sorin Basca
12dd25adda Merge "Strip annotations from library stubs" am: 61c6eef064
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092623

Change-Id: Ifd82d1e8dd7c30ebafa65c0a3ccfd814ff833e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:43:45 +00:00
Treehugger Robot
1a6305f9e0 Merge "Ensure that *bootclasspath* module types depend on device variants" 2022-05-11 20:43:30 +00:00
Anton Hansson
17094ecba8 Merge "Use lint database from api_versions_public" am: b82b392423
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092228

Change-Id: I55f152512459b043ab00996befa8a584f3ad9f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:41:59 +00:00
Spandan Das
e41be189f0 Merge changes Ie8881b85,I6c064f8a am: f923333a93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2090231

Change-Id: I3072b020c2612b7e612aee4c88cf2ab774fecaaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:40:13 +00:00
Chih-hung Hsieh
302ce27825 Merge "no out/soong/... in default header-filter" am: c275b81fc7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092485

Change-Id: Id3731511b39d957f597dc1c6ddb5580ba19a39d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:39:48 +00:00
Anton Hansson
63c05717b3 Merge "Support using api-versions.xml from another module" am: 4d92d831ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092227

Change-Id: Iddb9921f18786a6058efe6f77721bf50cb677a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:39:16 +00:00
Anton Hansson
58729fada2 Merge "Use merged annotations zip for lint" am: 3881e8d7fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092226

Change-Id: Ic12c9456d9bdea7addee0ece81cdd0317b40f623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:38:44 +00:00
Anton Hansson
adfab19c93 Merge "Write AndroidMk for api-versions.xml module" am: 55c157791e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092225

Change-Id: Ic4f89a42241988ba7b318e425b5173d5d49117c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:38:16 +00:00
Treehugger Robot
4f1ca80323 Merge "Support complicated variable references" am: b1263eef55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2080719

Change-Id: I07ca28a110c132d6768765ab0720b3b42e37a144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:38:03 +00:00
Wei Li
2ba896659d Merge "Export attestation file information to provenance metadata of an artifact if its attestation file exists." am: 8b9c23ec2d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2086465

Change-Id: Ie7aeaf8765d4ad54bc3474de997e32c1baa55543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:37:38 +00:00
Cole Faust
08f458e771 Merge "Flatten foreach calls that produce 2d lists" am: 85f8fa2c20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2088145

Change-Id: Icfa7556077990abff11022998d5e841fcc06d06f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:37:14 +00:00
Chih-hung Hsieh
28ddfd918b Merge "Disable performance-no-int-to-ptr in global default" am: 63d5ba23ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092585

Change-Id: I6552a60861486d6a75b8a4a8eb2f15ecd5e82614
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:19:30 +00:00
Treehugger Robot
635fdabe3e Merge "Reland "Update to clang-r450784e"" am: 5554b0e276
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2093183

Change-Id: Icb6b5c977047edc81f880008a97990055998803d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:19:20 +00:00
David Brazdil
f534a3e78d Add binary_test.cc to testSrcs am: 979ef5bb2a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092068

Change-Id: Ia85360419c1ce53315ee68d8feaab4e87067d18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:18:51 +00:00
David Brazdil
8cb745ae7a Fix test compilation error am: 3ac9d2bf23
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092067

Change-Id: I43f80c5ef83c409be870c7317288236dce028341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:18:39 +00:00
Treehugger Robot
2737c25e9e Merge "convert java_resources with bp2build" 2022-05-11 19:58:48 +00:00
Paul Duffin
0fc6d32c82 Switch the namespace tests to fully use test fixtures
Indented the bp contents to make it easier to differentiate between
them and the directory in which they belong.

Bug: 181070625
Test: m nothing
Change-Id: Iae7495fb7c88769dc688006a41f4d21f57cf03b8
2022-05-11 17:30:58 +00:00
Paul Duffin
b2c2173bfd Ensure that *bootclasspath* module types depend on device variants
Needed to allow change https://r.android.com/2089503 to be reapplied.

Bug: 232106778
Test: Apply the change and then run
      m EMMA_INSTRUMENT=true nothing
Change-Id: I92d19c51cc828295ba13951e65911db707f0f2ba
2022-05-11 15:20:37 +00:00