Treehugger Robot
e77d2e4197
Merge "Don't delete withres-withoutdex jar from R8 rules" into main am: 72928074f5
am: 4003606c5f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769925
Change-Id: I592565fda708934caf3089671311abd209fe951e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 20:24:23 +00:00
Treehugger Robot
4003606c5f
Merge "Don't delete withres-withoutdex jar from R8 rules" into main am: 72928074f5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769925
Change-Id: I138e00eec2622acd40b8329fe1d04b9c31c9b6c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 19:52:57 +00:00
Mark Dacek
03785bb591
Merge "Revert "Modify symlink_forest to rerun when soong_build has changed."" into main am: 4ac292ffd8
am: 4ea798d3fd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769443
Change-Id: I9f67aa06053578bf65dbb9ff5e04c450685b98a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 19:36:25 +00:00
Treehugger Robot
72928074f5
Merge "Don't delete withres-withoutdex jar from R8 rules" into main
2023-10-03 19:17:56 +00:00
Mark Dacek
4ea798d3fd
Merge "Revert "Modify symlink_forest to rerun when soong_build has changed."" into main am: 4ac292ffd8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769443
Change-Id: If1c67dc37b57f3dd11d7805ec2a55e8ebcdb9769
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 19:04:56 +00:00
Mark Dacek
4ac292ffd8
Merge "Revert "Modify symlink_forest to rerun when soong_build has changed."" into main
2023-10-03 18:39:46 +00:00
Jihoon Kang
40386ed37e
Merge changes from topic "expose_flagged_api_revert" into main am: a7e5e29ec1
am: 3d1cecda28
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769001
Change-Id: I330c0434af550bc6355342c7c27c20de47080a03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 18:32:50 +00:00
Spandan Das
f26423b0fe
Merge "Handle symlinks in isPackageBoundary" into main am: 29af2a470d
am: 063030cbb7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769118
Change-Id: I1ceeefcf41300250195366cb2bf01e2098161bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 18:32:40 +00:00
Yu Liu
60ee7d23cd
Merge "Convert java_aconfig_library to bazel." into main am: 7a90fcfa45
am: 2d7db62bcc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755429
Change-Id: I8b7b53149dc04abde9dcdaf468c0227a0384bc26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 18:32:28 +00:00
Jihoon Kang
3d1cecda28
Merge changes from topic "expose_flagged_api_revert" into main am: a7e5e29ec1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769001
Change-Id: Id1645b93c56654857c6d8ae551227c728ac76e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 18:02:14 +00:00
Spandan Das
063030cbb7
Merge "Handle symlinks in isPackageBoundary" into main am: 29af2a470d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769118
Change-Id: Id479359b55f4b75b92817cdeb3a5aaa4333c9c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 18:01:43 +00:00
Yu Liu
2d7db62bcc
Merge "Convert java_aconfig_library to bazel." into main am: 7a90fcfa45
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2755429
Change-Id: I298633470fbb8c41442104419b811ac59751d213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 18:01:26 +00:00
Jihoon Kang
a7e5e29ec1
Merge changes from topic "expose_flagged_api_revert" into main
...
* changes:
Revert^2 "Add flagged api hide conditional to droidstubs"
Revert^2 "Add soong config variable Release_expose_flagged_api"
2023-10-03 17:55:16 +00:00
Spandan Das
29af2a470d
Merge "Handle symlinks in isPackageBoundary" into main
2023-10-03 17:51:41 +00:00
Zi Wang
066f962bb6
Merge "Allowlist tradefed-common-util and some dependents for tradefed" into main am: 33befd0c58
am: 8cae29f34c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769103
Change-Id: I648da6c30478bb08824c4a91d79439164bf65cbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 17:44:04 +00:00
Yu Liu
7a90fcfa45
Merge "Convert java_aconfig_library to bazel." into main
2023-10-03 17:29:26 +00:00
Zi Wang
8cae29f34c
Merge "Allowlist tradefed-common-util and some dependents for tradefed" into main am: 33befd0c58
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769103
Change-Id: Ib863c47261892d3cd594f3afd31475491a2def04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 17:12:01 +00:00
Colin Cross
b716ceb832
Don't delete withres-withoutdex jar from R8 rules
...
R8 rules produce a depfile generated by R8. R8 sees the withres-withoutdex
jar as an input, and so adds it to the depfile. If the jar is deleted
after running R8 then ninja will always consider the rule dirty, as the
input file listed in the depfile is missing.
Fixes: 303064127
Test: m Calendar && m Calendar
Test: m framework-minus-apex && m framework-minus-apex
Change-Id: I5cbd780b56fc131b58598d6e569a8a78b7fe9395
2023-10-03 16:42:48 +00:00
Zi Wang
33befd0c58
Merge "Allowlist tradefed-common-util and some dependents for tradefed" into main
2023-10-03 16:31:29 +00:00
Vinh Tran
75530cd58b
Merge "Change bp2build to switch to using custom fdo_profile macro" into main am: 85455887b7
am: 63838903f1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2763705
Change-Id: I0df25408ad819e9193adfc9bfd1c6666c2fc49ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 16:06:41 +00:00
Vinh Tran
63838903f1
Merge "Change bp2build to switch to using custom fdo_profile macro" into main am: 85455887b7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2763705
Change-Id: I70500dc91ed9ce7784188bd7af1c5e6ce011b593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 15:34:56 +00:00
Vinh Tran
85455887b7
Merge "Change bp2build to switch to using custom fdo_profile macro" into main
2023-10-03 14:58:21 +00:00
Jihoon Kang
c831389625
Revert^2 "Add flagged api hide conditional to droidstubs"
...
This reverts commit 1180919dda
.
Test: go test ./java && m TARGET_PRODUCT=sdk TESTING_TARGET_RELEASE_NEXT=true nothing and inspect ninja command for generating stubs and verify the flag is included && m TARGET_PRODUCT=sdk TARGET_RELEASE=trunk_food nothing and inspect ninja command for generating stubs and verify the flag is not included
Bug: 299570421
Change-Id: I4967376c0236bad729398af80fa59b48dbab5f21
2023-10-03 01:04:00 +00:00
Jihoon Kang
f3aa3225b6
Revert^2 "Add soong config variable Release_expose_flagged_api"
...
This reverts commit 5548bf3053
.
Test: m nothing
Bug: 299570421
Change-Id: I9f70648fb6657bbf4f5681cd6d40517d70a8fefb
2023-10-03 01:00:42 +00:00
Thiébaud Weksteen
9e0a9d859a
Merge changes from topic "linter_integration_tests" into main am: 77b232da24
am: 11e2cee9a6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769019
Change-Id: Id42122ad6f40e317cec4a05e0989f15197d22d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 23:59:43 +00:00
Treehugger Robot
7d9a64a6db
Merge "Remove -Wsign-promo." into main am: 2eff89a8ce
am: 1b3e900e4c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2770219
Change-Id: Ibc2641ecea70435b035c260d4618825e46811977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 23:43:34 +00:00
Krzysztof Kosiński
b9d2d04d75
Merge "More documentation for C++ global config." into main am: eae6635a0f
am: 2cf4265572
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2770218
Change-Id: I0a94c6ce169a51c116994bbbb794ec0233aea603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 23:43:23 +00:00
Mark Dacek
aa5cc2cd6a
Revert "Modify symlink_forest to rerun when soong_build has changed."
...
This reverts commit 23a4120c57
.
Reason for revert: broke soong_integration
Change-Id: I4d51841756675b3745244d23e13aefda0916614b
2023-10-02 23:40:33 +00:00
Thiébaud Weksteen
11e2cee9a6
Merge changes from topic "linter_integration_tests" into main am: 77b232da24
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769019
Change-Id: I644f41e0eefef143396008663d02aa1c2f07b348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 23:30:03 +00:00
Treehugger Robot
1b3e900e4c
Merge "Remove -Wsign-promo." into main am: 2eff89a8ce
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2770219
Change-Id: I5aa4ad1382edbb1335d83e8f2170deb53ffd4618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 23:27:55 +00:00
Thiébaud Weksteen
77b232da24
Merge changes from topic "linter_integration_tests" into main
...
* changes:
Add .lint tagged output to Java modules
Add lint.suppress_exit_code attribute
2023-10-02 23:26:39 +00:00
Treehugger Robot
2eff89a8ce
Merge "Remove -Wsign-promo." into main
2023-10-02 23:14:26 +00:00
Krzysztof Kosiński
2cf4265572
Merge "More documentation for C++ global config." into main am: eae6635a0f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2770218
Change-Id: Iea1588705a75630c398bda2931123e6df94022a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 23:12:35 +00:00
Dwayne Barry
9508704561
Merge changes from topic "revert-2646423-HDQXAAHWBW" into main am: e298d42044
am: 0df7036509
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768071
Change-Id: I36637ff93bc4815cfdf438accf02bf7fa78fbb7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 22:41:16 +00:00
Krzysztof Kosiński
eae6635a0f
Merge "More documentation for C++ global config." into main
2023-10-02 22:27:21 +00:00
Dwayne Barry
0df7036509
Merge changes from topic "revert-2646423-HDQXAAHWBW" into main am: e298d42044
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2768071
Change-Id: I3efb286e8e011c2fb5ad2d3f6c4706be44e67d83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 22:07:13 +00:00
Yu Liu
f2b94010c8
Convert java_aconfig_library to bazel.
...
Bug: 297357579
Test: Unit test and AconfigJavaHostTest
Change-Id: Icf944cc0b2a7382107923d49b2d2ff0eb4113638
2023-10-02 15:04:19 -07:00
Dwayne Barry
e298d42044
Merge changes from topic "revert-2646423-HDQXAAHWBW" into main
...
* changes:
Revert "NDK library: enable feature flags for dumping ABI repres..."
Revert "NDK library: enable feature flags for diffing ABI repres..."
2023-10-02 21:40:32 +00:00
Android Culprit Assistant
cd44909edc
Revert "NDK library: enable feature flags for dumping ABI repres..."
...
This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/e18f14a6-af8b-4b9e-8f8e-73515c608887 ).
Change-Id: Ia32769fc520459ce7cb61f8e5b1def623eee93ff
2023-10-02 21:26:39 +00:00
Android Culprit Assistant
6dabfdda65
Revert "NDK library: enable feature flags for diffing ABI repres..."
...
This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/e18f14a6-af8b-4b9e-8f8e-73515c608887 ).
Change-Id: I4e0b62eea9e1c0ff49fbbf92e900606ccf93b93a
2023-10-02 21:26:39 +00:00
Wei Li
e4b6a23cb0
Merge "Change sbom_test.sh to take command line arguments for target product, release and build variant, which is for a corresponding change in CI." into main am: 0af40657ff
am: 5f49a8e36e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2770025
Change-Id: I329d2f2ae0bf088750beb21a8a98dbe6fa39d775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 20:03:45 +00:00
Christopher Parsons
dd03dde9c2
Merge "Treat src=name filegroups as handcrafted targets" into main am: aa3e435857
am: 87fbbe641d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766186
Change-Id: I0e36fe1e95afb2b080e7813f224d2f851a7d2528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 20:01:17 +00:00
Wei Li
5f49a8e36e
Merge "Change sbom_test.sh to take command line arguments for target product, release and build variant, which is for a corresponding change in CI." into main am: 0af40657ff
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2770025
Change-Id: I566856eacea24d4659d76fce37a4e8dd6b9cb171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 18:35:52 +00:00
Christopher Parsons
87fbbe641d
Merge "Treat src=name filegroups as handcrafted targets" into main am: aa3e435857
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2766186
Change-Id: Ib25d2952b0f8aca01fbe651550e1a50967e3b605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 18:35:30 +00:00
Mark Dacek
9574fb9ab2
Merge "Modify symlink_forest to rerun when soong_build has changed." into main am: e20b7589b4
am: 55c467dd51
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758108
Change-Id: I7759f157177fa248a577ec7984a131bde06bfd45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 18:33:12 +00:00
Wei Li
0af40657ff
Merge "Change sbom_test.sh to take command line arguments for target product, release and build variant, which is for a corresponding change in CI." into main
2023-10-02 18:14:33 +00:00
Christopher Parsons
aa3e435857
Merge "Treat src=name filegroups as handcrafted targets" into main
2023-10-02 17:35:44 +00:00
Zi Wang
2260933688
Allowlist tradefed-common-util and some dependents for tradefed
...
Test: CI
Bug: 283193845
Change-Id: Id9e8eefcf47080e786c62466658c7cb1f31b055d
2023-10-02 09:56:34 -07:00
Mark Dacek
55c467dd51
Merge "Modify symlink_forest to rerun when soong_build has changed." into main am: e20b7589b4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2758108
Change-Id: I6c6f2028868304284588ecf4fa6998b973e9f7bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 16:25:07 +00:00
Mark Dacek
e20b7589b4
Merge "Modify symlink_forest to rerun when soong_build has changed." into main
2023-10-02 15:36:43 +00:00