Commit Graph

48509 Commits

Author SHA1 Message Date
Treehugger Robot
73cac2f692 Merge "Set min_sdk_version (packages/modules/adb)" am: 0662933a18 am: 42d53e3fb3 am: 217c1c69a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895251

Change-Id: I96d9d528607eefe79f07466ed86e30e7eb32e7df
2021-11-22 23:39:05 +00:00
Treehugger Robot
5d84a075e7 Merge "Update rust prebuilt version to 1.56.1p1" am: 1125dc5317 am: a8ed7eb172 am: d22ba6922f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899283

Change-Id: Ibadda4615a5ac6552fa625bbf82c94ebc3258ad9
2021-11-22 23:38:46 +00:00
Treehugger Robot
217c1c69a3 Merge "Set min_sdk_version (packages/modules/adb)" am: 0662933a18 am: 42d53e3fb3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895251

Change-Id: I11b5699b31a25e7c951c29c0aefa4a56e9a1df7d
2021-11-22 23:21:37 +00:00
Treehugger Robot
d22ba6922f Merge "Update rust prebuilt version to 1.56.1p1" am: 1125dc5317 am: a8ed7eb172
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899283

Change-Id: I72d3c2da9f8dad313408783962724b88d6e11b88
2021-11-22 23:21:20 +00:00
Treehugger Robot
42d53e3fb3 Merge "Set min_sdk_version (packages/modules/adb)" am: 0662933a18
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895251

Change-Id: I346cee2d0949542acedcaab3badd79b07399a83a
2021-11-22 23:07:54 +00:00
Treehugger Robot
a8ed7eb172 Merge "Update rust prebuilt version to 1.56.1p1" am: 1125dc5317
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899283

Change-Id: I5980f693512ceefd2be58501706379d722b485bd
2021-11-22 23:07:08 +00:00
Treehugger Robot
0662933a18 Merge "Set min_sdk_version (packages/modules/adb)" 2021-11-22 23:00:34 +00:00
Treehugger Robot
d762ac2769 Merge "Revert "Revert "Switch to clang-r437112""" am: 3eb75a72a0 am: d9618f7e75 am: 52886846f7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895919

Change-Id: I0e8d3c7f9ae9aff8181b3fe603023d1527e0b8ba
2021-11-22 22:59:23 +00:00
Treehugger Robot
1125dc5317 Merge "Update rust prebuilt version to 1.56.1p1" 2021-11-22 22:51:02 +00:00
Treehugger Robot
52886846f7 Merge "Revert "Revert "Switch to clang-r437112""" am: 3eb75a72a0 am: d9618f7e75
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895919

Change-Id: I1c0647f3447769fdd76d1325c60f4d9e736af6c2
2021-11-22 22:42:34 +00:00
Treehugger Robot
d9618f7e75 Merge "Revert "Revert "Switch to clang-r437112""" am: 3eb75a72a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1895919

Change-Id: I5c5c1f302ea8a50d86db102a13ab21e24df1f14b
2021-11-22 22:25:04 +00:00
Treehugger Robot
3eb75a72a0 Merge "Revert "Revert "Switch to clang-r437112""" 2021-11-22 22:07:06 +00:00
sophiez
3691097ba9 NDK API coverage
Fixed typo in dist path for backed by.

Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only

Change-Id: Ic67c0bd5644dec11829f0dc2535016fec788a067
2021-11-22 11:49:49 -08:00
Colin Cross
4431bebf1f Merge "Move apex module installation into Soong" am: ab6db81276 am: a0c4b45669 am: e5046710c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897972

Change-Id: I3b4308d661909a4ad99033665b9a46ce1a2546d8
2021-11-22 18:15:38 +00:00
Colin Cross
e5046710c6 Merge "Move apex module installation into Soong" am: ab6db81276 am: a0c4b45669
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897972

Change-Id: Ic3d03f4d69bddffcca7ad2631e04c60cf9c2bf1a
2021-11-22 18:00:02 +00:00
Pirama Arumuga Nainar
1381dceeba Update rust prebuilt version to 1.56.1p1
Respin rust point release 1.56.1p1 with cherry-pick of
https://reviews.llvm.org/D104556 (needed for Rust coverage).

Bug: https://issuetracker.google.com/issues/206980172
Test: m rust
Change-Id: Ib63a7d8128c86ae9291c4f5275726cfc3bc15f48
2021-11-22 09:55:44 -08:00
Colin Cross
a0c4b45669 Merge "Move apex module installation into Soong" am: ab6db81276
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897972

Change-Id: Ib0c1e4a6cbfad28fd83a8d99a1e320c05a648c76
2021-11-22 17:48:57 +00:00
Colin Cross
ab6db81276 Merge "Move apex module installation into Soong" 2021-11-22 17:29:11 +00:00
Anton Hansson
99919c93f5 Merge "Silence unpack-prebuilt-apex" am: c5eac1cf47 am: 52a390ffa8 am: 8cea14f559
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899012

Change-Id: Ifdcf46dd6c227d2496ebba4baf6ef17dd09f316f
2021-11-22 17:27:36 +00:00
Anton Hansson
8cea14f559 Merge "Silence unpack-prebuilt-apex" am: c5eac1cf47 am: 52a390ffa8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899012

Change-Id: Iadb2582eb96a146265dae31bada34b10ade547a9
2021-11-22 17:09:25 +00:00
Anton Hansson
52a390ffa8 Merge "Silence unpack-prebuilt-apex" am: c5eac1cf47
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899012

Change-Id: Iab9b08eb1949c3241802db91a9f4249bc5581162
2021-11-22 16:51:34 +00:00
Anton Hansson
c5eac1cf47 Merge "Silence unpack-prebuilt-apex" 2021-11-22 16:36:49 +00:00
Anton Hansson
ff2804e195 Silence unpack-prebuilt-apex
Build tools should not output anything on success, as it clutters
the terminal.

Test: No
Change-Id: Iadfc326be58b32d5cb4f40dd114d3f0a54dbd9b4
2021-11-22 15:07:35 +00:00
Treehugger Robot
18a7d7a56a Merge "Make CompOS library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS" am: 07549129e2 am: 469da3abde am: 89a66bc57e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1892439

Change-Id: Iaf1c5be12af6213acf66688a5d0c12cbe47f1009
2021-11-22 11:22:46 +00:00
Treehugger Robot
89a66bc57e Merge "Make CompOS library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS" am: 07549129e2 am: 469da3abde
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1892439

Change-Id: Ib547e5d3b9ac8034ad7e8f7e9904cbab999f4d12
2021-11-22 11:05:30 +00:00
Treehugger Robot
469da3abde Merge "Make CompOS library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS" am: 07549129e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1892439

Change-Id: I372ab729757626af46e7c4d8708c1c4d07c358d8
2021-11-22 10:48:30 +00:00
Treehugger Robot
07549129e2 Merge "Make CompOS library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS" 2021-11-22 10:31:59 +00:00
Jooyung Han
4f71e12cc7 Set min_sdk_version (packages/modules/adb)
Many modules requiring min_sdk_version have been used without setting
it, but hard-coded in allowlist.

Bug: 158059172
Test: m
Change-Id: I6d11425f9c5db11cd52dd81f7500e4424555bfb5
2021-11-22 10:20:53 +09:00
Treehugger Robot
03f10ce200 Merge "sbox: run commands using script for large commands" am: ec014011ea am: 170652045d am: 109303ac11
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1881273

Change-Id: I39816dec48d3e29b667083f5d6a07142763bd196
2021-11-20 02:32:47 +00:00
Colin Cross
7e793651f5 Prepend header jar for sharded javac compilation am: 3d56ed5605 am: 5336a09b91 am: 287985d4c4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897430

Change-Id: I068a5dbc131d1c42554bfb8ea21ccd5b65b47509
2021-11-20 02:32:37 +00:00
Colin Cross
834649db81 Merge "Revert "Move apex module installation into Soong"" am: 500bba1b20 am: d4ce0c64f5 am: 85d3c93a85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897971

Change-Id: Iad482471d6dc53582de85261e925a0eeb76994de
2021-11-20 02:32:31 +00:00
Yuntao Xu
e596da3246 Merge "Revert^2 "Add seapp_contexts to allowlist of makefile goal"" am: ac69c239d1 am: 77bd4841a7 am: 76267be6fc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897105

Change-Id: Iec3c699a590e06290ad0007d284ea68ff1d0d038
2021-11-20 02:31:23 +00:00
Colin Cross
0118e502de Merge "Move apex module installation into Soong" am: 50f6f869a2 am: a3675380c6 am: 0cc52a39ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1896051

Change-Id: If58ac86d3782a768f4479d4179896ffa48427f20
2021-11-20 02:31:09 +00:00
Treehugger Robot
109303ac11 Merge "sbox: run commands using script for large commands" am: ec014011ea am: 170652045d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1881273

Change-Id: I9fa3d18220beaf023b3d380cdfa3d83a6a33c5b3
2021-11-20 02:16:24 +00:00
Colin Cross
287985d4c4 Prepend header jar for sharded javac compilation am: 3d56ed5605 am: 5336a09b91
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897430

Change-Id: Ie9fd7ebd8d44bf9abecc220f93e0290dda46d104
2021-11-20 02:16:12 +00:00
Colin Cross
85d3c93a85 Merge "Revert "Move apex module installation into Soong"" am: 500bba1b20 am: d4ce0c64f5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897971

Change-Id: Idf51a940cc1da40da19a6bba1c5c7b8b1952d8b4
2021-11-20 02:15:46 +00:00
Yuntao Xu
76267be6fc Merge "Revert^2 "Add seapp_contexts to allowlist of makefile goal"" am: ac69c239d1 am: 77bd4841a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897105

Change-Id: I3a07161cbaf37f00b975ade20f23c7f3bdbbe75f
2021-11-20 02:15:18 +00:00
Colin Cross
0cc52a39ba Merge "Move apex module installation into Soong" am: 50f6f869a2 am: a3675380c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1896051

Change-Id: I0ee4f3d90dfb6dca31aca303c1487c6c74d266d3
2021-11-20 02:15:08 +00:00
Treehugger Robot
170652045d Merge "sbox: run commands using script for large commands" am: ec014011ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1881273

Change-Id: Ic3868bbf593debaf7e2f961955f6b07bb0191e1d
2021-11-20 00:09:59 +00:00
Colin Cross
5336a09b91 Prepend header jar for sharded javac compilation am: 3d56ed5605
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897430

Change-Id: Id8c71095d07439c3722dbf1585a3d18ea3b70f0f
2021-11-20 00:09:45 +00:00
Colin Cross
d4ce0c64f5 Merge "Revert "Move apex module installation into Soong"" am: 500bba1b20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897971

Change-Id: Iab473c76d7ded6a20ce87584a18c396ca0c74ed5
2021-11-20 00:09:28 +00:00
Yuntao Xu
77bd4841a7 Merge "Revert^2 "Add seapp_contexts to allowlist of makefile goal"" am: ac69c239d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1897105

Change-Id: I1287df30c9214a5e327cd1a977bdcbcb39fa7827
2021-11-20 00:08:48 +00:00
Colin Cross
a3675380c6 Merge "Move apex module installation into Soong" am: 50f6f869a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1896051

Change-Id: I71788a834e4b97d3d1a812df70f570682ab8d6e2
2021-11-20 00:08:26 +00:00
Treehugger Robot
ec014011ea Merge "sbox: run commands using script for large commands" 2021-11-19 22:06:02 +00:00
Colin Cross
3d56ed5605 Prepend header jar for sharded javac compilation
When compiling without sharding javac will prefer classes built from
source over classes in the classpath.  Compiling with sharding puts
the header classes for all the sources onto the classpath, including
the sources that are not part of the current shard.  Emulate the
behavior when building without sharding by putting the header jar
first on the classpath so classes are resolved from the rest of
the sources before the real classpath.

Also switch to using the header jar without static libs dependencies
merged in, as those will already be present in the classpath.

Test: m framework-minus-apex
Test: m services.core
Test: TestSharding
Change-Id: Id11b39c15d89ce70da27d746a5c7e6b603c3c0f9
2021-11-19 21:57:21 +00:00
Colin Cross
6340ea50d4 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.

This relands If65d283abc86f18ad266da0bf16fe95971a0bf9c with fixes
to install files into $OUT/apex and I606286e971b55d9d1fc4dcd0fbd476962de5fa79
with a fix for reversed logic.

Bug: 204136549
Test: m checkbuild
Change-Id: Ie65c53ebc7911efacdb8e11ba49059448f03c658
2021-11-19 13:37:36 -08:00
Colin Cross
500bba1b20 Merge "Revert "Move apex module installation into Soong"" 2021-11-19 21:33:46 +00:00
Colin Cross
555c52491d Revert "Move apex module installation into Soong"
This reverts commit 246e3eed67.

Reason for revert: broke aosp_bonito-userdebug build

Change-Id: Ib613f8f22532fe4588d3ec96aa001de869f8a633
2021-11-19 21:32:54 +00:00
Yuntao Xu
ac69c239d1 Merge "Revert^2 "Add seapp_contexts to allowlist of makefile goal"" 2021-11-19 19:24:55 +00:00
Colin Cross
50f6f869a2 Merge "Move apex module installation into Soong" 2021-11-19 19:24:02 +00:00