Commit Graph

23458 Commits

Author SHA1 Message Date
Jingwen Chen
ce00ee318f Merge "Support multiple dists per Android.bp module, and dist output selection." am: d06f11ee71 am: 3779799731
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1335521

Change-Id: I2ca43562972b4d50f1e9fd4a801026aa9abb6816
2020-06-26 08:25:04 +00:00
Jingwen Chen
3779799731 Merge "Support multiple dists per Android.bp module, and dist output selection." am: d06f11ee71
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1335521

Change-Id: Ie9e0aee6a7360b169dd893cd42d9fe1396f98b4e
2020-06-26 08:13:25 +00:00
Jingwen Chen
d06f11ee71 Merge "Support multiple dists per Android.bp module, and dist output selection." 2020-06-26 08:03:27 +00:00
Thiébaud Weksteen
aa6a37d50d Merge "Remove duplicate Helper call" am: 9ae615fb99 am: 53dfbc8afd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1350822

Change-Id: I44ffad3760ab6cc88c7a01048267e6d1299cdc6f
2020-06-26 07:42:18 +00:00
Thiébaud Weksteen
53dfbc8afd Merge "Remove duplicate Helper call" am: 9ae615fb99
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1350822

Change-Id: I7c9380595d89681527af353d36203098c412699b
2020-06-26 07:31:23 +00:00
Thiébaud Weksteen
9ae615fb99 Merge "Remove duplicate Helper call" 2020-06-26 07:18:02 +00:00
Treehugger Robot
349ef77a6d Merge "Dist build.ninja and Android.bp.list" am: 3e2a34dd8d am: b0ae7ff40f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1350603

Change-Id: I8a27ac907edb086dfa91d1f247c6a1ed49104c8f
2020-06-25 23:09:43 +00:00
Treehugger Robot
b0ae7ff40f Merge "Dist build.ninja and Android.bp.list" am: 3e2a34dd8d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1350603

Change-Id: I1f9b292bb8e3e39e0c8df67088ad96293cc7dd97
2020-06-25 22:38:46 +00:00
Treehugger Robot
3e2a34dd8d Merge "Dist build.ninja and Android.bp.list" 2020-06-25 22:23:45 +00:00
Colin Cross
8ba7d47bba Dist build.ninja and Android.bp.list
Debugging issues on the build servers can be difficult because the
intermediate files are not visible.  Gzip ninja file and Makefiles
generated by Soong and the ninja files generated by Kati to the dist
directory, and also copy all of the finder output files.

Bug: 157656545
Test: m dist nothing
Change-Id: I48d75305e551ccae81c7a55721981cf58acd838b
2020-06-25 12:50:00 -07:00
Thiébaud Weksteen
5f2de778f4 Remove duplicate Helper call
The testRustContext function is used to prepare the environment for the
unit tests. As such, it is marked as a Helper function. Remove a
second superfluous call within its definition.

Test: m nothing
Change-Id: I37ea9a584b33498794c1cac828a7557d4bea8d7c
2020-06-25 21:25:41 +02:00
Liz Kammer
b6d7b5cc97 Merge "Add androidmk error for multiple assignments" am: d9857f83a8 am: 52f334287f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1349043

Change-Id: If3d1ccb72d1145c224de1e0a5c88c51ebed47618
2020-06-25 18:30:57 +00:00
Liz Kammer
52f334287f Merge "Add androidmk error for multiple assignments" am: d9857f83a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1349043

Change-Id: I2c8827d444baa8ab5e6314d755023f77d7934591
2020-06-25 18:19:28 +00:00
Liz Kammer
d9857f83a8 Merge "Add androidmk error for multiple assignments" 2020-06-25 18:11:07 +00:00
Martin Stjernholm
59c19b3585 Merge "Disable flattening only for unbundled apps." am: c4fe0dd3cc am: a77dc06b2b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1348984

Change-Id: If1a7768da1c1b652ec89acca4e948cc76bcb064e
2020-06-25 14:21:22 +00:00
Victor Khimenko
81e3d3cef8 Merge "Add exclude_shared_libs, expand exclude_static_libs to cover static_libs" into rvc-dev am: 82f62fdac4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11988741

Change-Id: If5763717a5c2ab87651e1093febdec25ff01fde2
2020-06-25 14:16:03 +00:00
Martin Stjernholm
a77dc06b2b Merge "Disable flattening only for unbundled apps." am: c4fe0dd3cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1348984

Change-Id: I252054d7bcd670da0b999d93344c8043cea25d46
2020-06-25 14:05:30 +00:00
Victor Khimenko
82f62fdac4 Merge "Add exclude_shared_libs, expand exclude_static_libs to cover static_libs" into rvc-dev 2020-06-25 14:02:04 +00:00
Martin Stjernholm
c4fe0dd3cc Merge "Disable flattening only for unbundled apps." 2020-06-25 13:49:30 +00:00
Jingwen Chen
40fd90ae52 Support multiple dists per Android.bp module, and dist output selection.
This CL adds "dists" to the base property struct to support multiple
dist file configurations, and generic tag support to dist tagged outputs
of modules.

Fixes: b/152834186
Test: soong tests and `m sdk dist`

Change-Id: I80c86bc9b7b09e671f640a4480c45d438bdd9a2a
Signed-off-by: Jingwen Chen <jingwen@google.com>
2020-06-25 12:42:07 +00:00
Treehugger Robot
73672049ff Merge "Avoid race condition over ExportedSystemIncludeDirs" am: 670ed3d97d am: a3cba8ecd9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1348762

Change-Id: I04f45a0afb4c3b58504da3964b8df96addc0be8c
2020-06-25 08:14:00 +00:00
Treehugger Robot
a3cba8ecd9 Merge "Avoid race condition over ExportedSystemIncludeDirs" am: 670ed3d97d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1348762

Change-Id: I50c177ec82bd607ca33617b1516968469656935d
2020-06-25 07:58:36 +00:00
Treehugger Robot
670ed3d97d Merge "Avoid race condition over ExportedSystemIncludeDirs" 2020-06-25 07:35:54 +00:00
Jooyung Han
7b5284bf33 Merge "apex: add apex_manifest.pb in file_contexts" am: dd85fd89b0 am: 5b811c02e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1348942

Change-Id: I558889c69e09e79455b75c4399826fcaab9101fc
2020-06-25 06:54:28 +00:00
Jooyung Han
5b811c02e2 Merge "apex: add apex_manifest.pb in file_contexts" am: dd85fd89b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1348942

Change-Id: I1f7e1e6653665faa4cc7a8bc640b3a365a728a23
2020-06-25 06:40:25 +00:00
Jooyung Han
dd85fd89b0 Merge "apex: add apex_manifest.pb in file_contexts" 2020-06-25 06:21:40 +00:00
Jooyung Han
fc2c927cb7 Merge "Check base property before using it" am: 83f107cdfb am: 85164317ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1345378

Change-Id: I3d59d49a51f6ec21cc6a642fee05f6a25cabd57d
2020-06-25 03:48:00 +00:00
Jooyung Han
85164317ab Merge "Check base property before using it" am: 83f107cdfb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1345378

Change-Id: I12b2bf1485a4dc7fdb6664de15a422bf257152f1
2020-06-25 03:31:18 +00:00
Jooyung Han
83f107cdfb Merge "Check base property before using it" 2020-06-25 03:13:16 +00:00
Treehugger Robot
ced31605c3 Merge "Only look for profiles when we have a profile dir" am: 0acb0fb2b7 am: 12db810dc7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1349324

Change-Id: Ie094b01dac1e3cc9f107977ca86d9627f1722dd7
2020-06-25 01:47:43 +00:00
Jooyung Han
14135e4c26 Merge "apex/apk: enforce min_sdk_version of all deps" am: 14a08f5b28 am: afdc5239b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1287253

Change-Id: I63074e39f5f319789920e55802d4f7934b556e0a
2020-06-25 01:47:24 +00:00
Treehugger Robot
12db810dc7 Merge "Only look for profiles when we have a profile dir" am: 0acb0fb2b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1349324

Change-Id: I1009cba45c59b01c8374f35d6885556b5b6e9635
2020-06-25 01:35:52 +00:00
Jooyung Han
afdc5239b8 Merge "apex/apk: enforce min_sdk_version of all deps" am: 14a08f5b28
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1287253

Change-Id: Ibfaeb242fb32ed11735938091fe4cb8fb88b5370
2020-06-25 01:35:43 +00:00
Treehugger Robot
0acb0fb2b7 Merge "Only look for profiles when we have a profile dir" 2020-06-25 01:28:52 +00:00
Jooyung Han
14a08f5b28 Merge "apex/apk: enforce min_sdk_version of all deps" 2020-06-25 01:18:52 +00:00
Jooyung Han
5c17ac003a Check base property before using it
OverrideModule's `base` property should point a valid
module(OverridableModule).

It should be checked before using it.

Bug: 159503211
Test: add `override_apex` without `base`
      m emits error, not panic.
Change-Id: I1d7c9395cc9a7461e317dd4b6ddbec3a9e68e9bf
(cherry picked from commit 3851b0c1fe8e8ffd3d30b4b8a5289f39a2c98270)
2020-06-25 09:17:59 +09:00
Dan Willemsen
78d51b00de Only look for profiles when we have a profile dir
Right now, it's looking for *.prof files at the top of the source
directory.

For devices that don't specify the profile dir (everything on AOSP,
etc), this saves a couple percent of the globs that we check during
every build (and would re-execute if you add or remove files from the
top directory)

Bug: 159845846
Test: treehugger
Change-Id: I10d43422a2b5ae25e6557d435ecc89fe43536dd7
2020-06-24 16:33:31 -07:00
David Srbecky
3a968ade8c Merge "Add SrcPath to InstallHookContext" am: 1bb4665c40 am: 5d0dfbf87b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1323754

Change-Id: I3a828c23ea633d1d1961845e3aff538daef3109d
2020-06-24 23:27:03 +00:00
David Srbecky
5d0dfbf87b Merge "Add SrcPath to InstallHookContext" am: 1bb4665c40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1323754

Change-Id: Idc4ff7bbacde07c81f119a8f1729e52d455ffafa
2020-06-24 23:08:49 +00:00
David Srbecky
1bb4665c40 Merge "Add SrcPath to InstallHookContext" 2020-06-24 22:51:31 +00:00
Makoto Onuki
60d54a45f1 [automerger skipped] Merge "Enable check for "try to expose APIs from hidden class"" am: 35dfb01d86 am: 3772aa885b -s ours
am skip reason: Change-Id I6ca2d8e3967cdc41aa2a931972472174aae2a613 with SHA-1 dbc0adad52 is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1349323

Change-Id: Ib56a256039c32e915bf23d1e79f35546d7a55015
2020-06-24 22:44:01 +00:00
Makoto Onuki
3772aa885b Merge "Enable check for "try to expose APIs from hidden class"" am: 35dfb01d86
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1349323

Change-Id: If529bc7a9ee92f7c152cb88693554606e3953870
2020-06-24 22:31:25 +00:00
Makoto Onuki
35dfb01d86 Merge "Enable check for "try to expose APIs from hidden class"" 2020-06-24 22:18:35 +00:00
Martin Stjernholm
56507b4e0d Disable flattening only for unbundled apps.
This allows the unbundled master-art branch to still use flattened
APEXes in its test builds.

Bug: 159109002
Test: art/build/apex/runtests.sh on master-art
Test: m nothing
Change-Id: I768c6b7f5afbc348cd7730e4ba96507678434778
2020-06-24 22:33:44 +01:00
Treehugger Robot
61a7d10b56 Merge "Minor tweaks to usage message." am: 6f61fa75c6 am: ac39c80b1a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1349042

Change-Id: I729e0eb8a0b7b3f54766e69c6fd4722a84495e19
2020-06-24 20:26:46 +00:00
Treehugger Robot
ac39c80b1a Merge "Minor tweaks to usage message." am: 6f61fa75c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1349042

Change-Id: I5134c63a3e6a328c92db71ba23011dac2f62bac3
2020-06-24 20:13:13 +00:00
Treehugger Robot
6f61fa75c6 Merge "Minor tweaks to usage message." 2020-06-24 20:00:31 +00:00
Colin Cross
1429cdcf87 Add exclude_shared_libs, expand exclude_static_libs to cover static_libs
Allow variants to exclude shared or static libs.

Bug: 153609531
Test: manual
Change-Id: I6ac9c445ed233c774a051743ed6760058c9918e9
2020-06-24 21:57:46 +02:00
Makoto Onuki
f51b7af2a4 Enable check for "try to expose APIs from hidden class"
Exempt-From-Owner-Approval:Cherry-pick from goog/master
Bug: 159121253
Test: treehugger (i.e. this shouldn't trigger "API has changed" error.)
Merged-in: I6ca2d8e3967cdc41aa2a931972472174aae2a613
Change-Id: I6ca2d8e3967cdc41aa2a931972472174aae2a613
2020-06-24 12:06:37 -07:00
Makoto Onuki
081afb5097 Merge "Enable check for "try to expose APIs from hidden class"" into rvc-dev-plus-aosp 2020-06-24 18:02:52 +00:00