Commit Graph

52895 Commits

Author SHA1 Message Date
Colin Cross
32b9cd0fc2 Merge "Revert "Move apex module installation into Soong"" am: 152911f807 am: 35ee47dcbf am: ca03de2828 am: 21d7f625c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890806

Change-Id: I2647b410bb76f237367d127490193249ce04324d
2021-11-12 20:08:22 +00:00
Cole Faust
01ad9aa311 Merge "Make handleSimpleStatement also handle if statements" am: 80374405df am: 9585062240 am: 07881dd311 am: 62643010df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885112

Change-Id: I48f31af23e023206e11b921b7a96370dd1e3afc0
2021-11-12 20:08:06 +00:00
Colin Cross
21d7f625c3 Merge "Revert "Move apex module installation into Soong"" am: 152911f807 am: 35ee47dcbf am: ca03de2828
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890806

Change-Id: I98649c0cdd9929aac0b90814e287a05ce20dadd0
2021-11-12 19:49:50 +00:00
Cole Faust
62643010df Merge "Make handleSimpleStatement also handle if statements" am: 80374405df am: 9585062240 am: 07881dd311
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885112

Change-Id: I95d675e5807e309ec0f23bf4ccab56b581820d3c
2021-11-12 19:49:42 +00:00
Colin Cross
ca03de2828 Merge "Revert "Move apex module installation into Soong"" am: 152911f807 am: 35ee47dcbf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890806

Change-Id: Ia95002049419f7d59278da517bd41b3b80050823
2021-11-12 19:32:21 +00:00
Cole Faust
07881dd311 Merge "Make handleSimpleStatement also handle if statements" am: 80374405df am: 9585062240
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885112

Change-Id: Ic2a6405aee1570ba055da576cca3ec9c55466cf3
2021-11-12 19:32:14 +00:00
Colin Cross
35ee47dcbf Merge "Revert "Move apex module installation into Soong"" am: 152911f807
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890806

Change-Id: Iaa000333e09fd0a87738c66709f4c390f80a36b4
2021-11-12 19:15:13 +00:00
Cole Faust
9585062240 Merge "Make handleSimpleStatement also handle if statements" am: 80374405df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885112

Change-Id: I1e05d7e665ae80d657d7a67556749072fc8731e9
2021-11-12 19:15:06 +00:00
Colin Cross
152911f807 Merge "Revert "Move apex module installation into Soong"" 2021-11-12 19:02:30 +00:00
Cole Faust
80374405df Merge "Make handleSimpleStatement also handle if statements" 2021-11-12 19:01:41 +00:00
Colin Cross
ccba23db44 Revert "Move apex module installation into Soong"
This reverts commit e3d156a622.

Reason for revert: b/206119621

Bug: 204136549
Change-Id: I380223b86660c27bea8f5dcc2d61f32df2704c02
Fixes: 206119621
2021-11-12 19:01:29 +00:00
Colin Cross
66f1ef1e46 Merge "Move apex module installation into Soong" am: 4e278e5f68 am: 8dfdabc4c9 am: f24e7a7f4e am: 2098ff63f4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880605

Change-Id: I63132d59c3dc63e78b9cca1cb075bedc106b793b
2021-11-12 18:13:03 +00:00
Colin Cross
2098ff63f4 Merge "Move apex module installation into Soong" am: 4e278e5f68 am: 8dfdabc4c9 am: f24e7a7f4e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880605

Change-Id: I73773ae16a33399c367028b933792fde1030ff0b
2021-11-12 17:56:22 +00:00
Colin Cross
f24e7a7f4e Merge "Move apex module installation into Soong" am: 4e278e5f68 am: 8dfdabc4c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880605

Change-Id: I984d3ce684154b0089c16fc0689ef035e2a1d3d1
2021-11-12 17:38:41 +00:00
Colin Cross
8dfdabc4c9 Merge "Move apex module installation into Soong" am: 4e278e5f68
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880605

Change-Id: I152ae7b450c21f0e6c5839cc7f52f9ae2fb1b457
2021-11-12 17:21:00 +00:00
Colin Cross
4e278e5f68 Merge "Move apex module installation into Soong" 2021-11-12 17:06:08 +00:00
Colin Cross
d8804b0395 Merge "Add .PHONY for dist-for-goals targets" am: 8432238aa0 am: dbeb6b2eb7 am: 4733a58a28 am: a3a2a61ea0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889717

Change-Id: I138644fbaadef512335ff6d2d5118f79ea13b733
2021-11-12 08:18:09 +00:00
Colin Cross
a3a2a61ea0 Merge "Add .PHONY for dist-for-goals targets" am: 8432238aa0 am: dbeb6b2eb7 am: 4733a58a28
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889717

Change-Id: Ib63670f59320187fddddc609fbde75ba66a68bed
2021-11-12 08:02:45 +00:00
Colin Cross
4733a58a28 Merge "Add .PHONY for dist-for-goals targets" am: 8432238aa0 am: dbeb6b2eb7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889717

Change-Id: I5b32c398019aa9457a139703c7f509adfbdccbfd
2021-11-12 07:43:56 +00:00
Colin Cross
dbeb6b2eb7 Merge "Add .PHONY for dist-for-goals targets" am: 8432238aa0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889717

Change-Id: I959165bef217b86ff099592dad47f5f9291fc408
2021-11-12 07:27:41 +00:00
Colin Cross
8432238aa0 Merge "Add .PHONY for dist-for-goals targets" 2021-11-12 07:13:17 +00:00
Alexander Smundak
d51633d166 Merge "Display diagnostic message for each conversion error." am: 51977fca61 am: 406e121088 am: e12051ee3e am: ca5f81e12b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887516

Change-Id: I896dc8a15337286f76ef9d4b18ff766c290b950d
2021-11-12 03:37:28 +00:00
Alexander Smundak
ca5f81e12b Merge "Display diagnostic message for each conversion error." am: 51977fca61 am: 406e121088 am: e12051ee3e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887516

Change-Id: Icdb33de11f20ef14248f642741d7e4e779b5a321
2021-11-12 03:21:35 +00:00
Alexander Smundak
e12051ee3e Merge "Display diagnostic message for each conversion error." am: 51977fca61 am: 406e121088
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887516

Change-Id: I1452fe33633fe7ade33cfcd8247959d98025eefd
2021-11-12 03:08:42 +00:00
Alexander Smundak
406e121088 Merge "Display diagnostic message for each conversion error." am: 51977fca61
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887516

Change-Id: I5115ea8a41e0a338796939d928dcf0b1688a20a0
2021-11-12 02:50:58 +00:00
Alexander Smundak
51977fca61 Merge "Display diagnostic message for each conversion error." 2021-11-12 02:34:39 +00:00
Treehugger Robot
5202a3d58c Merge "Add hardware/interfaces/security to rust allow list." am: 09104df494 am: 4f80ea196b am: 5fb59ee67c am: 71f55ca534
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885948

Change-Id: I7eda5b7d56d47cf10c9eb74197cf83dfbfb9f753
2021-11-12 02:08:29 +00:00
Treehugger Robot
71f55ca534 Merge "Add hardware/interfaces/security to rust allow list." am: 09104df494 am: 4f80ea196b am: 5fb59ee67c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885948

Change-Id: I7d0515b3b5558bdea1cd07079c5b46b5d7112d2f
2021-11-12 01:49:47 +00:00
Colin Cross
e3d156a622 Move apex module installation into Soong
Move apex module installation rules into Soong by overriding
InstallBypassMake.

Soong installs don't support post install commands, so move the
symlinks into separate rules and add dependencies on them.

Bug: 204136549
Test: m checkbuild
Change-Id: If65d283abc86f18ad266da0bf16fe95971a0bf9c
2021-11-11 17:44:42 -08:00
Treehugger Robot
5fb59ee67c Merge "Add hardware/interfaces/security to rust allow list." am: 09104df494 am: 4f80ea196b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885948

Change-Id: I0db44c84481f5c9a0afd21601d145e8dac792b61
2021-11-12 01:31:53 +00:00
Treehugger Robot
4f80ea196b Merge "Add hardware/interfaces/security to rust allow list." am: 09104df494
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885948

Change-Id: Ib11f4497fb0bc2d805dc1634bf002a7383d0d1cb
2021-11-12 01:15:15 +00:00
Treehugger Robot
09104df494 Merge "Add hardware/interfaces/security to rust allow list." 2021-11-12 00:55:52 +00:00
Colin Cross
b5399c84ff Add .PHONY for dist-for-goals targets
Mac builds don't include build/make/core/tasks/general-tests.mk
which causes the general-tests target not to be marked phony.  Have
Soong mark all dist-for-goals targets as phony so it doesn't rely
on other makefiles being present.

Bug: 205928834
Test: forrest
Change-Id: I9394c9c794fc83cde9649aa12a3039526d8206f3
2021-11-12 00:36:58 +00:00
Sasha Smundak
7d934b9c47 Display diagnostic message for each conversion error.
Also, use better names for the error handling entities.

Bug: 204062171
Test: manual
Change-Id: I65869120ed08fc40d9ec6267c882e53aaedde9ed
2021-11-11 15:14:20 -08:00
Chris Parsons
1355908e96 Remove modules from denylist after host C++ support am: 393002a913 am: 998284da66 am: 119106d3fd am: c0df0faef0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889455

Change-Id: I509cd5b52b0f4b336ca28983272f314fb140d1ce
2021-11-11 20:53:13 +00:00
Chris Parsons
c0df0faef0 Remove modules from denylist after host C++ support am: 393002a913 am: 998284da66 am: 119106d3fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889455

Change-Id: I3889812d935ed0b235bf5d0f611fe95a862a43a7
2021-11-11 20:35:03 +00:00
Chris Parsons
119106d3fd Remove modules from denylist after host C++ support am: 393002a913 am: 998284da66
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889455

Change-Id: Ie6ff893174f3a5799938af4b705f580e852c96ff
2021-11-11 20:14:33 +00:00
Chris Parsons
998284da66 Remove modules from denylist after host C++ support am: 393002a913
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889455

Change-Id: I2289ad65d279cb496c9da43a1a6de3484cac9de7
2021-11-11 19:47:00 +00:00
Chris Parsons
393002a913 Remove modules from denylist after host C++ support
Test: mixed_droid
Change-Id: If9b04625b0ad4fce52283eb683f1342e24bb97f2
2021-11-11 13:56:56 -05:00
Christopher Parsons
f13f05e439 Merge "Support host platform cc builds" am: 4f5b548e74 am: 063cd58d11 am: 79f7491e78 am: d1da8a1fb1 am: 039183d116
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885868

Change-Id: I1d876756a323f788cd56816713d8022594f61835
2021-11-11 18:29:09 +00:00
Christopher Parsons
039183d116 Merge "Support host platform cc builds" am: 4f5b548e74 am: 063cd58d11 am: 79f7491e78 am: d1da8a1fb1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885868

Change-Id: I2b27a39083f8e4b439efd485f57dded4a3f7116e
2021-11-11 18:10:03 +00:00
Christopher Parsons
d1da8a1fb1 Merge "Support host platform cc builds" am: 4f5b548e74 am: 063cd58d11 am: 79f7491e78
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885868

Change-Id: Ifa13cdf293a480230941d4ce5a06edf0441b15bb
2021-11-11 17:53:27 +00:00
Christopher Parsons
79f7491e78 Merge "Support host platform cc builds" am: 4f5b548e74 am: 063cd58d11
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885868

Change-Id: I83810d9fd57feeaa8ffa9e648bbb015b7f9ff990
2021-11-11 17:42:32 +00:00
Christopher Parsons
063cd58d11 Merge "Support host platform cc builds" am: 4f5b548e74
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885868

Change-Id: I097ad09de5c237fda8c5d8a493afdc82e3bffce3
2021-11-11 17:30:28 +00:00
Christopher Parsons
4f5b548e74 Merge "Support host platform cc builds" 2021-11-11 17:18:15 +00:00
Treehugger Robot
e558319465 Merge changes I9e38ac73,I9412147f am: 45da465ef6 am: 0a93afc2b9 am: 331599f461 am: 76df6461c5 am: 0d3522cece
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887532

Change-Id: Ia74c51187284aad60b8e700c488a60a0083f4cfc
2021-11-11 07:35:58 +00:00
Treehugger Robot
0d3522cece Merge changes I9e38ac73,I9412147f am: 45da465ef6 am: 0a93afc2b9 am: 331599f461 am: 76df6461c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887532

Change-Id: Ie19685e00abd7ed0bbd5d996e4a8c0ff8d196f97
2021-11-11 07:15:46 +00:00
Treehugger Robot
76df6461c5 Merge changes I9e38ac73,I9412147f am: 45da465ef6 am: 0a93afc2b9 am: 331599f461
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887532

Change-Id: I250db810ea0fb14a771020ca5a8b97412b0d3a3f
2021-11-11 06:53:11 +00:00
Treehugger Robot
331599f461 Merge changes I9e38ac73,I9412147f am: 45da465ef6 am: 0a93afc2b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887532

Change-Id: I5ed46ac3c26cb140f641eb2c5d0db10632124f19
2021-11-11 06:42:38 +00:00
Treehugger Robot
0a93afc2b9 Merge changes I9e38ac73,I9412147f am: 45da465ef6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887532

Change-Id: Iafcd3607b170c25f1585bf152397ee86105c8be4
2021-11-11 06:28:38 +00:00