Commit Graph

56990 Commits

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

Change-Id: Iea6ea2f668a11c8ef0ea3ab6822987c7bcb2d373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 22:50:02 +00:00
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
f1526a56dd Merge "Deterministic aquery details in mixed builds" am: 58c43e9694 am: 1bf08694c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097673

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

Change-Id: Ic840d8ddbfe8bc7c372ec911a560533809974a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:30:07 +00:00
Elliott Hughes
a142a0f91b Merge "Now gnu11 is the default, bump experimental to gnu17." am: 51cb2d9374 am: 1b9dbb8712
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097173

Change-Id: I093577943ca148279c7f5875166d31eb829a8b13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:29:44 +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
7ee1422274 Merge "Clean up hard-coded min_sdk_version/apex_available" am: 1c87db50ca am: 793c10dcc7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2089563

Change-Id: I789fa4687a2bdac6f0130543b21c58cd7707d12f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 10:21:55 +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
11ce77e3aa Merge "Try to bump the C default to C11." am: 94361dc903 am: 4f8ee857f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2043314

Change-Id: I4b17328f340d40c95d571e5c85469c6cf5119e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 17:57:33 +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
Colin Cross
cf75f72060 Merge "Remove references to *_HOST_DALVIK_*" am: d2ee3a6afa am: 3137263855
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2060211

Change-Id: I4abf20f54936209f6f7d99958985cb061a7644fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 16:54:18 +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
366fae54a1 Merge "Add bp2build converter for override_apex." am: 49611b39a9 am: 9acec92f04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092595

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

Change-Id: I01e87ced03eee152edef2f42ddc6a6fe259e2bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 08:01:56 +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
Thiébaud Weksteen
61aacdad9b Merge "java/lint: enable lint on non-generated srcjar" am: 5471f4ea83 am: 161080466b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2086850

Change-Id: I861533e0e24e854f2ad9cc0103bf333b5111c25a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 07:22:46 +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
1efd56b6f8 Merge "Add Go proto for metrics. The current output is different from head. Test: N/A" am: 5736589122 am: 8afaf623e1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2095885

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

Change-Id: I7eb6160b088b91f31190609840dea83bd3a45c9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 01:22:59 +00: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
904e8d18f0 Merge "Ensure that *bootclasspath* module types depend on device variants" am: 1a6305f9e0 am: 9bc494bc08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2095251

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

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

Change-Id: I05e2c8f527e3f38139d0bb6b9d8c75e27a61570c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:49:08 +00:00
Anton Hansson
ddbf242004 Merge "Use lint database from api_versions_public" am: b82b392423 am: 17094ecba8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092228

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

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

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

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

Change-Id: I553a73673be5fb34c4c6756809611d61c93856ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:46:46 +00:00