Commit Graph

3771 Commits

Author SHA1 Message Date
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
Lukács T. Berki
8526bc95ef Merge "Rename BuildDir and NinjaBuildDir." am: 5602d33025
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1810356

Change-Id: I6af3316fb122af7a05b71de7f9cd371746bb5f21
2021-08-27 13:54:13 +00:00
Lukacs T. Berki
9f6c24a887 Rename BuildDir and NinjaBuildDir.
These are just out/ and out/soong/ and the old names were quite
confusing.

Test: Presubmits.
Merged-In: I999ca62162062f27e449f83ffb00fa580d4065b8
Merged-In: I2fcd80a9e376a6842a06aa104a9f6f5c5e16f8c7
Change-Id: Ib481d2aac40df8da1b74174dc8ec576c1cb48be0
2021-08-27 10:08:49 +02:00
Treehugger Robot
a3037d1239 Merge "Keep existing BUILD files for bazel_common_rules" am: 9da0a435ef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1807117

Change-Id: Ief2269eaa089bc5aa9c4c8185c99b3ae452fed35
2021-08-26 16:59:41 +00:00
Treehugger Robot
9da0a435ef Merge "Keep existing BUILD files for bazel_common_rules" 2021-08-26 16:41:30 +00:00
Colin Cross
8dae8cbcc1 Merge "Support musl builds in Make" am: b37a92ccc8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1797129

Change-Id: I771db86c62207bde3e4ba60569e4d3ebbfe32358
2021-08-26 01:27:24 +00:00
Colin Cross
b37a92ccc8 Merge "Support musl builds in Make" 2021-08-26 01:14:47 +00:00
Paul Duffin
826ac4d353 Remove unused key field from SdkMemberTypesRegistry
Bug: 195754365
Test: m nothing
Change-Id: I48ba50f009d53024ecb89d8d59309d49989c39fb
2021-08-25 15:08:10 +01:00
Treehugger Robot
8d3406dfd7 Merge "Suggest using add_soong_config_ macros instead of direct variable assignments" am: 0fea970b41
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1807738

Change-Id: I769f9a0feafbaa067e2c46f1efc16eff71fe974b
2021-08-24 23:09:44 +00:00
Sasha Smundak
18fd099982 Suggest using add_soong_config_ macros instead of direct variable assignments
Bug: 190051051
Test: treehugger
Change-Id: Ib77d8af8f926412f6337173927cee6bb1deda2bb
2021-08-24 14:06:20 -07:00
satayev
dbd6abe28d Merge "Make sure that classpath fragment contents appear in make vars." am: 28e5eda261
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1740313

Change-Id: I216856a16603567c623114d3b5b42506e9dc89b2
2021-08-24 13:40:05 +00:00
satayev
28e5eda261 Merge "Make sure that classpath fragment contents appear in make vars." 2021-08-24 13:29:58 +00:00
Liz Kammer
383f7cb2b1 Merge "Update HostAndDevice* documentation" am: f32f2d6b6d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1806337

Change-Id: I7de835f65f774040d04af4f94b3f652391726a18
2021-08-24 12:45:51 +00:00
Jingwen Chen
5e49b82e59 Keep existing BUILD files for bazel_common_rules
Test: presubmits

Bug: 197589841
Change-Id: I6a528fc8e66ce6322e87db975f7656571407c7a1
2021-08-24 05:14:22 +00:00
Liz Kammer
8631cc7327 Update HostAndDevice* documentation
Clarify that HostAndDeviceSupported builds _only_ Device by default,
and add information on how to built host variations.
For HostAndDeviceDefault, clarify how to disable different variants.

Change-Id: I20e30175ddf79038117f1df166d9b994237b27f5
2021-08-23 21:12:08 +00:00
Colin Cross
c74ea4b77b Support musl builds in Make
Rewrite linux_musl to linux when exporting to Make.

Bug: 190084016
Test: m USE_HOST_MUSL=true adb
Change-Id: I48eed5bd7380a07c5106a9b2bd96899fb58f7a7f
2021-08-18 22:02:54 +00:00
Liz Kammer
680bd2dd0a Merge "Don't create a new module for bp2build conversion." am: 380dbb9327
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1792714

Change-Id: Ie7d6d5908d06f14121691f7aa0f57c7c7303e67a
2021-08-18 19:44:01 +00:00
Liz Kammer
380dbb9327 Merge "Don't create a new module for bp2build conversion." 2021-08-18 19:28:20 +00:00
Liz Kammer
ba85722ffa Merge "Handle arch-specific/not properties the same." am: 5641096e7f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1792708

Change-Id: Id7960374816f1c7198e3c4b1dbb919ad66a7ff45
2021-08-18 16:16:29 +00:00
Liz Kammer
2ada09a546 Don't create a new module for bp2build conversion.
A performance improvement for bp2build as Blueprint/Soong no longer have
the overhead of additional modules. The creation of these modules
results in:
* traversal of additional modules for each subsequent mutator
* synchronization over a go channel to collect newly created modules:
https://cs.android.com/android/platform/superproject/+/master:build/blueprint/context.go;l=2594,2600;drc=1602226f23181b8c3fbfcaf3358f0297e839d7d3

We avoid both of these by storing the information directly in the
underlying module.

Also as a fringe benefit, removes some necessary boilerplate for
conversion.

For benchmarks, reduces runtime ~1% for 1% converted, ~24% for 100%
converted. See more: go/benchmarks-for-https:-r.android.com-1792714

Test: ran benchmarks/tests in bp2build
Test: build/bazel/ci/bp2build.sh
Change-Id: Ie9273b8cbab5bc6edac1728067ce184382feb211
2021-08-17 15:57:09 -04:00
Xin Li
8ded89b1bf Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master 2021-08-17 18:14:22 +00:00
Liz Kammer
135bf55281 Handle arch-specific/not properties the same.
Refactor arch-handling code to return a "no-config" axis which allows
handling non-arch configed properties the same way as arch-configed
properties.

Test: build/bazel/ci/bp2build.sh
Change-Id: I485b35fd91c28501fe2055234dc9b278488bf4b5
2021-08-17 13:06:54 -04:00
Lukacs T. Berki
f7e36d80ff Remove Srcdir() from BootstrapConfig.
It was always ".".

Test: Presubmits.
Change-Id: I5381002b3f2986122f1b335a88119cead0a86d75
2021-08-16 17:05:09 +02:00
Lukacs T. Berki
f9008075d9 Define command line args in soong_build .
They used to be defined in Blueprint but since it doesn't have a
separate existence anymore, we can consolidate all command line
arguments here.

Note that Blueprint is called directly from soong_ui, but that happens
by a simple Go function call and not by invoking a separate binary, so
command line arguments are not needed there.

Test: Presubmits.
Change-Id: Ifa2c101ddbe424b76fc5a508d3d41c329e7353ca
2021-08-16 15:29:02 +02:00
satayev
d34eb0c4a6 Make sure that classpath fragment contents appear in make vars.
The source of truth for what jars are in BOOTCLASSPATH and
SYSTEMSERVERCLASSPATH is make; adding a classpath fragment in soong
with a new jar in the contents without having it declared in make
is wrong (excluding test apexes).

Bug: 191369843
Test: m nothing
Change-Id: Ifd313776ee7ad206031244534ed3870126e4f835
2021-08-16 12:00:25 +01:00
Xin Li
3eaa6bcecf Merge sc-dev-plus-aosp-without-vendor@7634622
Merged-In: I10ff6a5df76852f0a22fe3ac22df764528f07423
Change-Id: I71f2397f425a46d346e49ac422d256d7e049c7a2
2021-08-14 06:30:56 +00:00
Jingwen Chen
76738b1c45 Merge "Revert "Exempt prebuilts/jdk and build/bazel/examples/java BUILD..."" 2021-08-13 05:18:56 +00:00