Commit Graph

3897 Commits

Author SHA1 Message Date
Treehugger Robot
b8d4e69927 Merge "Allows prebuilts in override_apex." am: e267bc8f74
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1811097

Change-Id: I732915686e54509c30f6855ea29d562bc83cf680
2021-09-03 16:13:56 +00:00
Treehugger Robot
e267bc8f74 Merge "Allows prebuilts in override_apex." 2021-09-03 16:01:31 +00:00
Daniel Norman
5a3ce13c6a Allows prebuilts in override_apex.
Bug: 197787336
Test: Create an override_apex that uses a different `prebuilts` than its
      base. Observe built contents.
Test: apex_test.go
Change-Id: I7666ed6cfe3f2fa5dd81e5f8c1961477dabbbd3c
2021-09-02 09:28:52 -07: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
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
b838b0a147 Do not modules in files called "Blueprints".
The only case for this was Blueprint itself at build/blueprint, but with
that being a part of Soong, this special case is not necessary anymore.

Test: Presubmits.
Change-Id: Icc51cd80bd43f936a97018061cfbf76fc385e4c3
2021-09-02 11:46:24 +02: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
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
Lukács T. Berki
1d1772c147 Merge "Remove bootstrap_go_binary ." 2021-09-01 14:15:58 +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
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
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
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
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
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
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
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
Liz Kammer
66f3ade5d6 Revert "bp2build: build //system/core/libprocessgroup:libprocess..." am: 1fdd6fafd5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1814737

Change-Id: I326fbfa8a973f862463203fa334517a4219f428b
2021-08-31 13:48:37 +00:00
Liz Kammer
92e3b75ca4 Revert "bp2build: allowlist //external/brotli/... and build libb..." am: a73a503d90
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1814736

Change-Id: I8e2e735760704ff4358290060553df542bd7e22f
2021-08-31 13:48:34 +00:00
Liz Kammer
f4afb53d4a Revert "bp2build allowlist //external/libcxx/..."
Revert submission 1814446

Reason for revert: causes failure of mixed_droid
Reverted Changes:
If5285f161:bp2build allowlist //external/libcxx/...
I4e7787374:bp2build: build //system/core/libprocessgroup:libp...
Ibec6d5fbe:bp2build: allowlist //external/brotli/... and buil...

Change-Id: I37327057a3df44cbb6e57d7f54120b3448da6057
2021-08-31 13:18:45 +00:00
Liz Kammer
1fdd6fafd5 Revert "bp2build: build //system/core/libprocessgroup:libprocess..."
Revert submission 1814446

Reason for revert: causes failure of mixed_droid
Reverted Changes:
If5285f161:bp2build allowlist //external/libcxx/...
I4e7787374:bp2build: build //system/core/libprocessgroup:libp...
Ibec6d5fbe:bp2build: allowlist //external/brotli/... and buil...

Change-Id: Idcacf7b8e48e1cd156717d6b7a6d1f9534207d49
2021-08-31 13:18:45 +00:00
Liz Kammer
a73a503d90 Revert "bp2build: allowlist //external/brotli/... and build libb..."
Revert submission 1814446

Reason for revert: causes failure of mixed_droid
Reverted Changes:
If5285f161:bp2build allowlist //external/libcxx/...
I4e7787374:bp2build: build //system/core/libprocessgroup:libp...
Ibec6d5fbe:bp2build: allowlist //external/brotli/... and buil...

Change-Id: I0486afb20cbd0d994c4821969ce0fdb3e35a9e43
2021-08-31 13:18:45 +00:00
Jingwen Chen
7490e0c1c1 bp2build: allowlist //external/brotli/... and build libbrotli. am: 60da00eb83
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1814446

Change-Id: I7d693046d55591730c5d0616f1905f6e49de6c40
2021-08-31 11:53:24 +00:00
Jingwen Chen
c4867e32e7 bp2build: build //system/core/libprocessgroup:libprocessgroup_headers am: 60eaabbe75
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1814445

Change-Id: I0b2299ec5d643c1ea01f7baf639881524645894b
2021-08-31 11:53:22 +00:00
Jingwen Chen
1fb3f219cb bp2build allowlist //external/libcxx/... am: d2fec261fc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1814444

Change-Id: Icc72c7cfe4deb78d183fc64024badc9e42593fa8
2021-08-31 11:53:19 +00:00
Jingwen Chen
60da00eb83 bp2build: allowlist //external/brotli/... and build libbrotli.
Test: bp2build ci
Fixes: 198148733
Change-Id: Ibec6d5fbe73bdec649b6dd5e8e667b261ae88ba5
2021-08-31 10:11:02 +00:00
Jingwen Chen
60eaabbe75 bp2build: build //system/core/libprocessgroup:libprocessgroup_headers
This 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
Test: bp2build-incremental //system/...
Change-Id: I4e778737414364964de6328d7420512da224809c
2021-08-31 10:11:02 +00:00
Jingwen Chen
d2fec261fc bp2build allowlist //external/libcxx/...
Test: b build //external/libcxx/...
Fixes: 197954422
Change-Id: If5285f161a9e15f3401b442d699464f522124d3d
2021-08-31 10:10:01 +00:00
Lukacs T. Berki
b078ade28d Remove some unused args from Blueprint.
These are: TopFile and GeneratingPrimaryBuilder.

Also re-shuffle the list of flags to make a bit more sense and finish
the rename of BuildDir and NinjaBuildDir to SoongOutDir and OutDir,
respectively.

Test: Presubmits.
Change-Id: I103ff5f09f1c0d16f695a7da5dea13b55028e33e
2021-08-31 11:42:48 +02:00
Jingwen Chen
af9efe72d4 bp2build allowlist //development/sdk/... am: a26246db72
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1814443

Change-Id: I9e038e1c9cd361af2ebe1134c4229c9eb8a54f94
2021-08-31 07:20:12 +00:00
Jingwen Chen
a26246db72 bp2build allowlist //development/sdk/...
This builds //development/sdk:platform_tools_version.

Fixes: 198236279
Test: CI
Change-Id: Ibb3d89d07a2841d0d351b05c480caa9a87b870bf
2021-08-31 05:29:58 +00:00
Treehugger Robot
61d7bc338f Merge "cmdline property in bootimg can be customized for debuggable builds" am: 4b2435bc79
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1813356

Change-Id: Ia4491bfb3c16e139bf40bde090c2274efea73b35
2021-08-31 02:00:51 +00:00
Treehugger Robot
4b2435bc79 Merge "cmdline property in bootimg can be customized for debuggable builds" 2021-08-31 01:59:40 +00:00
Jiyong Park
16e77a9b30 cmdline property in bootimg can be customized for debuggable builds
This change adds product_variables.debuggable.cmdline so that the kernel
cmdline arguments can be augmented for the debuggable builds.

To support that the type of the property has changed to string array.

Bug: 181936135
Test: inspect build.ninja
Change-Id: I81b3ead5187ccb378efabb87d1d15fbdb59d8e2f
2021-08-31 08:32:44 +09:00
Romain Jobredeaux
51727abdad Merge "Set --noautodetect_server_javabase in mixed build bazel." am: e4447e4e97
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1811776

Change-Id: I839abc03e68b90dec195b22c6727278d1213a74a
2021-08-27 21:11:24 +00:00
Romain Jobredeaux
70905362b7 Merge "Exempt build/bazel/examples/java BUILD files from bp2build overwriting." am: 274aca4464
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1810537

Change-Id: I57698cb6e912ec33815bc3228af6be74b10aec92
2021-08-27 21:11:22 +00:00
Romain Jobredeaux
e4447e4e97 Merge "Set --noautodetect_server_javabase in mixed build bazel." 2021-08-27 20:53:47 +00:00
Romain Jobredeaux
41fd5e402f Set --noautodetect_server_javabase in mixed build bazel.
If a valid JAVA_HOME is set in the environment when running
bazel with --experimental_repository_disable_download, bazel
will unsuccessfully attempt to download rules_java. The above
flag has the practical effect of preventing the download attempt
(some clues as to why in the doc at go/aosp-bazel-jdk).

Note that this also prevents building java targets in mixed mode.
Eventually, we will pull in the java_rules into AOSP so they don't
need to be downloaded.

Test: build/bazel/ci/mixed_libc.sh
Change-Id: Icdb186c18a3334f4caa17243a8620a1cc8c1db0e
2021-08-27 17:34:16 +00:00
Anton Hansson
35c86c07ed 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.
Merged-In: I82a90b83d23b0ba3779a943c2ad444bf5cf937da
Change-Id: I82a90b83d23b0ba3779a943c2ad444bf5cf937da
2021-08-27 17:35:40 +01:00
Romain Jobredeaux
5cc9c9d8e7 Exempt build/bazel/examples/java BUILD files from bp2build overwriting.
Test: b build build/bazel/examples/java/...
Change-Id: Iab4934d99f734979350742a3a14aca7899d4cada
2021-08-27 16:14:13 +00:00