Commit Graph

51357 Commits

Author SHA1 Message Date
Lukács T. Berki
2928c292e6 Merge "Make java_fuzz_host not implement Sanitizeable." am: 53c6c67cbb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096734

Change-Id: Ic100bd6c127db9c22e5d57a930b9621f4eb23226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 07:11:40 +00:00
Lukács T. Berki
53c6c67cbb Merge "Make java_fuzz_host not implement Sanitizeable." 2022-05-18 06:43:42 +00:00
Treehugger Robot
5015558a51 Merge "bp2build: add support for planting unresolved symlinks in the symlink forest." am: 478db1a882
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096573

Change-Id: I6acc0803e0789ed177275720a26086de58b44907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-17 20:34:42 +00:00
Treehugger Robot
7a8e610703 Merge "Fix prebuilts of overridden apps" am: 822029166d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2099730

Change-Id: I8e00672797535abfe4ba46470d7e183c57180622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-17 20:34:22 +00:00
Treehugger Robot
478db1a882 Merge "bp2build: add support for planting unresolved symlinks in the symlink forest." 2022-05-17 19:39:42 +00:00
Treehugger Robot
822029166d Merge "Fix prebuilts of overridden apps" 2022-05-17 19:03:42 +00:00
Jingwen Chen
d4b1dc8b2a bp2build: add support for planting unresolved symlinks in the symlink forest.
In the isDir check, there's a possibility that the Stat check fails
because the path is an unresolved symlink. Verify it with Lstat (which
would succeed, since it doesn't follow links), and treat it like a file
if Lstat succeeds.

Test: new integration test
Fixes: 232370097
Change-Id: I9807ca363a5dbdc20639b489b54627bd2cc1ca60
2022-05-17 12:17:53 +00:00
Lukacs T. Berki
8c77ae369a Make java_fuzz_host not implement Sanitizeable.
Also remove a tiny bit of state mutation from sanitizerMutator. Every
little bit helps!

Test: Prebuilts + comparing soong/build.ninja .
 Your branch is up to date with 'aosp/master'.

Change-Id: I73b28b660b572610242765d87b70ab081b0b43df
2022-05-17 11:25:28 +02:00
Treehugger Robot
1232d39289 Merge "Make "overrides" attribute of Android_app overridable" am: 7583481570
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2099732

Change-Id: I6d890192430ce34ccb7553e2c2668c5eff7ac6d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-17 07:03:46 +00:00
Treehugger Robot
7583481570 Merge "Make "overrides" attribute of Android_app overridable" 2022-05-17 06:38:19 +00:00
Colin Cross
aaa0c1ffcd Fix prebuilts of overridden apps
AndroidApp had its own HideFromMake method and flag that shadowed
the one in ModuleBase.  This caused performOverrideMutator to set the
AndroidApp flag, but ModuleBase.skipInstall to read the ModuleBase
flag, resulting in a conflicting install rule being created.  Remove
AndroidApp's HideFromMake in favor of the ModuleBase one.

Bug: 232788722
Test: TestOverrideAndroidAppWithPrebuilt
Change-Id: I8c0dfcb50ff4dc1e4d0574f150b10d79908f46aa
2022-05-16 18:27:00 -07:00
zhidou
198f589222 Make "overrides" attribute of Android_app overridable
Move overrides attribute from appProperties to overridableAppProperties

Bug: 220029162
Test: m
Change-Id: I6f527df3173f142311734333ad37018c83d5e279
Merged-In: I6f527df3173f142311734333ad37018c83d5e279
(cherry picked from commit a2ce78f80d)
2022-05-16 18:26:52 -07:00
Mark Dacek
0ad31129c3 Merge "Grammar nit. Test: N/A" am: 0de6fdde4d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097638

Change-Id: Icb1699e13b7bdcc9e209ef6c02c1f4422485ddcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:16:40 +00:00
Mark Dacek
0de6fdde4d Merge "Grammar nit. Test: N/A" 2022-05-16 19:37:07 +00:00
Alix Espino
be2d27b673 Merge "convert Dynamic_list property" am: 5b75bf1d7e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2078468

Change-Id: I9bf7b93f4b71f45abb54dfb7be1484b8a9fa2fe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 16:57:43 +00:00
Alix Espino
5b75bf1d7e Merge "convert Dynamic_list property" 2022-05-16 16:33:51 +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
MarkDacek
7564127cf2 Grammar nit.
Test: N/A

Change-Id: Ied10037b662cd49573680d392cddd11b628618ff
2022-05-13 20:44:07 +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