Commit graph

44903 commits

Author SHA1 Message Date
Matthias Maennich
276f996713 ndk_library: separate abidw and abitidy into separate rules am: c2346f1c21
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1818334

Change-Id: Iee14342d6f062b7ed84305e038505c025fbbc849
2021-09-03 13:03:42 +00:00
Matthias Maennich
c2346f1c21 ndk_library: separate abidw and abitidy into separate rules
Both processes might consume a large amount of memory when analyzing
library ABIs. By chaining them via a pipe we keep the same
representation twice in memory. That can introduce a problematic peak
memory consumption. Hence, split them apart into separate rules that
depend on each other.

Bug: 191235788
Test: m out/soong/abi-dumps/ndk/28/x86_64/libc/abi.xml
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: Ia0264a5ede5b2c2a3c2e3fbe968c11d36acf33c2
2021-09-02 21:04:15 +01:00
Lukács T. Berki
e908fea7d2 Merge "Make OutDir() and SoongOutDir() be consistent." am: 5eeb6fc3f2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1815792

Change-Id: Ib28188151307381391cce50c6ee2ae998bf0c9be
2021-09-02 15:48:56 +00:00
Lukács T. Berki
5eeb6fc3f2 Merge "Make OutDir() and SoongOutDir() be consistent." 2021-09-02 15:46:57 +00:00
Ulyana Trafimovich
b8e95806f8 Merge changes I4e7aa1a3,Ic0cd2411 am: 2e380e7971
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1815791

Change-Id: Ie2a5d819d9e9e76a349c6b2e576e09b4c4551895
2021-09-02 15:44:57 +00:00
Ulyana Trafimovich
2e380e7971 Merge changes I4e7aa1a3,Ic0cd2411
* changes:
  Fix DONT_UNCOMPRESS_PRIV_APPS_DEXS for `android_app_import`.
  Add tests for uncompressed dex for `android_app_import`.
2021-09-02 15:20:58 +00:00
Treehugger Robot
02dde7fe4a Merge "bp2build: allowlist more packages." am: dadcc8af6f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1815876

Change-Id: If3f7a18de76b480aa42c366d4d650f5062c60ece
2021-09-02 15:02:36 +00:00
Treehugger Robot
dadcc8af6f Merge "bp2build: allowlist more packages." 2021-09-02 14:48:49 +00:00
Lukacs T. Berki
d6cee7e374 Make OutDir() and SoongOutDir() be consistent.
They both used to return out/soong. Unfortunately, the tests seem to
assume the old behavior, so I had to keep tests inconsistent and I was
scared of dexpreopt, too.

Test: Presubmits.
Change-Id: Ib00c7956fd2cdb28cc11d481c17e5a3ff5ad563a
2021-09-02 13:35:49 +02:00
Lukacs T. Berki
d51ffbfc98 Remove the bootstrap.Config class. am: ea1a31c07f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1817957

Change-Id: Iaba39ef38316634c024d13972a6295e883c5d1f8
2021-09-02 10:53:13 +00:00
Jingwen Chen
294e774e28 bp2build: allowlist more packages.
* //system/core/libprocessgroup:libprocessgroup_headers
* //external/brotli/... and build libbrotli.
* //external/libcxx/...

This also adds //system/core/libprocessgroup to the denylist, but
non-recursively, because there are other modules in its subpackages that
don't build yet, so CI's bp2build-incremental's `//system/...` build can keep
working.

Fixes: 186826841
Fixes: 198148733
Fixes: 197954422

Test: ran mixed_droid-clean locally
Test: presubmits
Change-Id: I5f21287f5374811c4bfcf7b7d64430fe4f9b2900
2021-09-02 10:49:58 +00:00
Lukacs T. Berki
ea1a31c07f Remove the bootstrap.Config class.
It was confusing because bootstrapping uses two configurations: the
"global" config and the special-cased bootstrap one.

This change merges them.

Test: Presubmits.
Change-Id: I82b482cbe28a343ab6991374b2a28667e1a06b48
2021-09-02 09:59:35 +02:00
Chih-hung Hsieh
e1d5c9fdd0 Merge "RBE should not copy source file back to local" am: 7686708a43
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1814116

Change-Id: Id774c8148eb900217d42d41258d6f2407395f24b
2021-09-01 20:55:02 +00:00
Chih-hung Hsieh
7686708a43 Merge "RBE should not copy source file back to local" 2021-09-01 20:43:00 +00:00
Ulya Trafimovich
0061c0d1da Fix DONT_UNCOMPRESS_PRIV_APPS_DEXS for android_app_import.
Don't uncompress priv-app dex for `android_app_import` if
DONT_UNCOMPRESS_PRIV_APPS_DEXS is true. Update expected test results.

Bug: 194504107
Test: m nothing
Change-Id: I4e7aa1a3deea856f388ae5ecd9292301f8a09a2f
2021-09-01 15:44:50 +01:00
Ulya Trafimovich
55f72d706d Add tests for uncompressed dex for android_app_import.
Some of the test cases for privileged apps currently produce incorrect
results (e.g. with DONT_UNCOMPRESS_PRIV_APPS_DEXS := true); they are
marked with TODO and will be fixed in a follow-up CL.

Bug: 194504107
Test: m nothing
Change-Id: Ic0cd24113a27850a967afa0b3deb4a6324f95347
2021-09-01 15:44:28 +01:00
Treehugger Robot
a040b2065d Merge "Apply pylint to remaining scripts in hiddenapi" am: 0364846a73
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1811101

Change-Id: I455518b56be02f4d7b971f46071337b81a4f6cf6
2021-09-01 14:29:04 +00:00
Treehugger Robot
ee9477a55e Merge "Apply pylint to scripts/hiddenapi/verify_overlaps*" am: deee92ca0c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1811100

Change-Id: I55230b5992df493fda94fe6b20ba1e5f84eb3c3b
2021-09-01 14:29:02 +00:00
Treehugger Robot
9e982d7935 Merge "Apply pylint to scripts/hiddenapi/generate_hiddenapi_lists*" am: 373fe3b598
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1811099

Change-Id: I0723a7d8cd98851a03cb15d74a3a891b3e9aaca6
2021-09-01 14:29:00 +00:00
Lukács T. Berki
088d0e078c Merge "Remove bootstrap_go_binary ." am: 1d1772c147
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1815120

Change-Id: Ied2d87c387bf021eb42d6ef3107054b3e1900100
2021-09-01 14:28:44 +00:00
Treehugger Robot
0364846a73 Merge "Apply pylint to remaining scripts in hiddenapi" 2021-09-01 14:27:13 +00:00
Treehugger Robot
deee92ca0c Merge "Apply pylint to scripts/hiddenapi/verify_overlaps*" 2021-09-01 14:27:13 +00:00
Treehugger Robot
373fe3b598 Merge "Apply pylint to scripts/hiddenapi/generate_hiddenapi_lists*" 2021-09-01 14:27:13 +00:00
Lukács T. Berki
1d1772c147 Merge "Remove bootstrap_go_binary ." 2021-09-01 14:15:58 +00:00
Paul Duffin
d9e02ae775 Merge "Separate sdk member type functionality into its own file" am: 67808796e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1808899

Change-Id: I920cf025e1ea9aeb941a5cce9735da5e8b4f37b2
2021-09-01 12:43:55 +00:00
Paul Duffin
f9e90d95e8 Merge "Make sdk member type related types and vars type specific" am: eb784f1506
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1808898

Change-Id: I419e55852b2fd6a45c6393ab095ee7e8e1a4ebfc
2021-09-01 12:43:42 +00:00
Paul Duffin
67808796e6 Merge "Separate sdk member type functionality into its own file" 2021-09-01 12:26:17 +00:00
Paul Duffin
eb784f1506 Merge "Make sdk member type related types and vars type specific" 2021-09-01 12:26:06 +00:00
Lukacs T. Berki
a806e4176b Remove bootstrap_go_binary .
blueprint_go_binary is enough.

Test: Presubmits.
Change-Id: Ic95ed8533603dff396740bc1d2a7c60ff2cebf20
2021-09-01 11:55:22 +02:00
Anton Hansson
7ff2b2c722 [automerger skipped] Merge "Add support for extension version in variables" am: d841c3533a -s ours
am skip reason: Merged-In I82a90b83d23b0ba3779a943c2ad444bf5cf937da with SHA-1 b021bf8c5a is already in history

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

Change-Id: I6dfbb02d1bc0515ae0f4d8c7695f6a0199a68ce1
2021-09-01 09:19:55 +00:00
Anton Hansson
d841c3533a Merge "Add support for extension version in variables" 2021-09-01 09:00:15 +00:00
Anton Hansson
a06d2d1093 Merge "Add support for extension version in variables" into stage-aosp-master 2021-09-01 08:21:32 +00:00
Lukács T. Berki
481801406b Merge "Write logs.zip + logs to the correct place." am: 135b428936
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1807356

Change-Id: Ibb99541caf37865d93159a3097f5b4f5832ee186
2021-08-31 20:48:13 +00:00
Lukács T. Berki
135b428936 Merge "Write logs.zip + logs to the correct place." 2021-08-31 20:31:28 +00:00
Treehugger Robot
05ac706e6f Merge "Refactor SdkMemberType.AddDependencies()" am: a36ffdead5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1808897

Change-Id: I0535c811329b9101059bf9a8953ee203335d2cb4
2021-08-31 19:08:38 +00:00
Treehugger Robot
a36ffdead5 Merge "Refactor SdkMemberType.AddDependencies()" 2021-08-31 18:53:59 +00:00
Spandan Das
559132fb98 Apply pylint to scripts/hiddenapi/verify_overlaps*
1. Run pyformat scripts/hiddenapi/verify_overlaps.py -s 4
--force_quote_type none -i to fix formatting. Some double quotes change
to single quotes since pyformat enforces consistent quotes
2. Wrap #pylint: (enable|disable)=line-too-long in tests

Test: m verify_overlaps verify_overlaps_test
Test: pylint --rcfile tools/repohooks/tools/pylintrc <file1>
<file1_test>
Bug: 195738175

Change-Id: Ieb23c04aa53a8b74917f6865296dd8740ecf20ba
2021-08-31 18:24:24 +00:00
Lukacs T. Berki
bf5bdb2f3f Write logs.zip + logs to the correct place.
I erroneously assumed that the continuous builds don't set DIST_DIR,
whereas they do.

The variable naming is quite questionable, but for now, the important
thing is that the code works and I wanted to do that with the least
amount of change possible.

Also add some more logging:
- Shell environment
- Command line arguments
- Location of logs.zip
- The logs directory

Test: Presubmits.
Change-Id: I651b1045eeef568aa860fd2457fa7799ad68ba38
2021-08-31 19:58:51 +02:00
Anton Hansson
b021bf8c5a Add support for extension version in variables
This makes the sdk extension version usable in genrule cmds via %d.

Bug: 195281582
Test: current_sdkinfo module in packages/modules/common.
Change-Id: I82a90b83d23b0ba3779a943c2ad444bf5cf937da
Merged-In: I82a90b83d23b0ba3779a943c2ad444bf5cf937da
(cherry picked from commit e720c41f67a7e9309f1e6e48d5975383be7b2d28)
2021-08-31 17:41:41 +00:00
Treehugger Robot
e3e7ca657b Merge "Deprecate group_static_libs property" am: add0b0880e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1814113

Change-Id: Ia5711d638317dcda58628e76b1ba3919f2314cb4
2021-08-31 16:47:56 +00:00
Treehugger Robot
add0b0880e Merge "Deprecate group_static_libs property" 2021-08-31 16:35:18 +00:00
Paul Duffin
4e7e202794 Separate sdk member type functionality into its own file
Bug: 195754365
Test: m nothing
Change-Id: I63effd8dbcb984d144daf266e53d33a0d07224e4
2021-08-31 17:31:34 +01:00
Paul Duffin
62782de15c Make sdk member type related types and vars type specific
Previously, some of the sdk member type related types and variables
included the words "member type" whereas others only used the word
"member" and did not include "type". This changes makes them all
include the word "type" to differentiate them from other types related
to sdk members.

Bug: 195754365
Test: m nothing
Change-Id: I913daaa1d436fd5dc857c2af0ffdee6471dcc6ed
2021-08-31 17:31:34 +01:00
Spandan Das
ab47a767d8 Merge "Skip dexbootjar check using AllowMissingDependencies flag" am: b7e5985fd5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1803934

Change-Id: I55ae4c5858330385876eb42e0fa16773ca748150
2021-08-31 16:12:21 +00:00
Paul Duffin
0c9985dc6d Merge "Remove unused key field from SdkMemberTypesRegistry" am: 45de13f93d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1808896

Change-Id: Id0b3dcd603eaea18b714902b6d4878c8adfd8de1
2021-08-31 16:12:11 +00:00
Paul Duffin
296701e35b Refactor SdkMemberType.AddDependencies()
Replaces the BottomUpMutatorContext parameter with a new
SdkDependencyContext type that extends BottomUpMutatorContext. This is
to allow the sdk to pass additional information to the implementations
of that method to allow the behavior to be more finely tuned.

Bug: 195754365
Test: m nothing
Change-Id: I69c6d2c523934eb67d7a7e6c55c241e9b8a81773
2021-08-31 17:07:07 +01:00
Spandan Das
b7e5985fd5 Merge "Skip dexbootjar check using AllowMissingDependencies flag" 2021-08-31 16:06:10 +00:00
Paul Duffin
45de13f93d Merge "Remove unused key field from SdkMemberTypesRegistry" 2021-08-31 15:57:04 +00:00
Lukács T. Berki
c846a8d6b0 Merge "Remove some unused args from Blueprint." am: c3dbead65b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1814597

Change-Id: I798a8f6bc7689660353b23134648bdcacc3ba899
2021-08-31 13:48:47 +00:00
Liz Kammer
0b81acd5a7 Revert "bp2build allowlist //external/libcxx/..." am: f4afb53d4a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1814738

Change-Id: I3787b2b773eaed546a7e2d605dff39c0a293d2a3
2021-08-31 13:48:39 +00:00