Commit Graph

48606 Commits

Author SHA1 Message Date
Treehugger Robot
06cc75d578 Merge "Adding configuration support for Java 11" am: 5e4637dc1b am: c752b88ca8 am: 5f61c406f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1904230

Change-Id: I268d72f2ad99a0dad5ff55481ef611ef76861487
2021-12-01 23:13:06 +00:00
Treehugger Robot
5f61c406f6 Merge "Adding configuration support for Java 11" am: 5e4637dc1b am: c752b88ca8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1904230

Change-Id: I43283d18fa0871056da8866adb52ba8622a0d253
2021-12-01 22:55:50 +00:00
Treehugger Robot
c752b88ca8 Merge "Adding configuration support for Java 11" am: 5e4637dc1b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1904230

Change-Id: I4a447b98b46c0b2965d3278c458d2cc14a17b9f3
2021-12-01 22:38:58 +00:00
Treehugger Robot
5e4637dc1b Merge "Adding configuration support for Java 11" 2021-12-01 22:18:41 +00:00
Treehugger Robot
77c0431afb Merge "Ignore errors when running df in build_test.bash" am: 7c8497dc36 am: c0d39aef35 am: 0548808f44
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906865

Change-Id: I4999a5994dc0a9a6a4d3f8695169a5cf56888ebd
2021-12-01 19:35:33 +00:00
Treehugger Robot
0548808f44 Merge "Ignore errors when running df in build_test.bash" am: 7c8497dc36 am: c0d39aef35
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906865

Change-Id: I272cefb709826451c870defc512aacc1f80ee5e7
2021-12-01 19:19:13 +00:00
Treehugger Robot
c0d39aef35 Merge "Ignore errors when running df in build_test.bash" am: 7c8497dc36
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906865

Change-Id: If4069f1f8674fc8de528de4ab640052e38790649
2021-12-01 19:07:57 +00:00
Treehugger Robot
58c2927d13 Merge "Revert "Enable hwasan use after scope detection."" am: bc1d8dd659 am: 415f5ebe44 am: 1a2224e744
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907157

Change-Id: I852bed9d7cfdaa053681419eb791897faf7a6b74
2021-12-01 19:01:48 +00:00
Treehugger Robot
7c8497dc36 Merge "Ignore errors when running df in build_test.bash" 2021-12-01 18:53:09 +00:00
Treehugger Robot
1a2224e744 Merge "Revert "Enable hwasan use after scope detection."" am: bc1d8dd659 am: 415f5ebe44
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907157

Change-Id: Ie21be43afaa4f1a073e9e3837fe861386ff95c6e
2021-12-01 18:49:40 +00:00
Treehugger Robot
415f5ebe44 Merge "Revert "Enable hwasan use after scope detection."" am: bc1d8dd659
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907157

Change-Id: Ib6910fdffb322a4b18bc5517ecd012c17ffcb85e
2021-12-01 18:31:48 +00:00
Treehugger Robot
bc1d8dd659 Merge "Revert "Enable hwasan use after scope detection."" 2021-12-01 18:13:39 +00:00
Cole Faust
fa3431cf37 Ignore errors when running df in build_test.bash
On glinux, df -h prints an "Operation not permitted" error
along with the rest of the output, and exits with status code 1,
causing the rest of the build_test script to not run. Ignore this
error.

Test: Running build_test.bash
Change-Id: I5422d0459ed471671d8d99a883c9ac3fca2e91b8
2021-12-01 08:24:53 -08:00
Benjamin Brittain
66ddbf9e23 Merge "Add support for Rust JNI Libraries" am: 7c721018bb am: 9915e2dfc6 am: f842076481
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906713

Change-Id: I0dbb996224c0819f28060fec3af4b4b936f8453e
2021-12-01 15:23:56 +00:00
Benjamin Brittain
f842076481 Merge "Add support for Rust JNI Libraries" am: 7c721018bb am: 9915e2dfc6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906713

Change-Id: I384b70d42b38d3062890dbe2c078e0f772aa272f
2021-12-01 15:07:24 +00:00
Benjamin Brittain
9915e2dfc6 Merge "Add support for Rust JNI Libraries" am: 7c721018bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906713

Change-Id: Ie71118ee60636b01b3a485af404747a00d6a1272
2021-12-01 14:39:28 +00:00
Jingwen Chen
24e6623e1f Merge "Move libprotobuf-cpp-full and libprotobuf-cpp-lite to mixed builds denylist." am: a358fdb6f3 am: 8e667b8c7f am: 96e231c96d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1903457

Change-Id: I055800648507f48c6e74e60a0468ee4dab52cc05
2021-12-01 14:23:59 +00:00
Benjamin Brittain
7c721018bb Merge "Add support for Rust JNI Libraries" 2021-12-01 14:12:34 +00:00
Jingwen Chen
96e231c96d Merge "Move libprotobuf-cpp-full and libprotobuf-cpp-lite to mixed builds denylist." am: a358fdb6f3 am: 8e667b8c7f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1903457

Change-Id: I9d72c57b0f6ffaa8501b7f78d7b4ebad9769636e
2021-12-01 14:07:11 +00:00
Jingwen Chen
8e667b8c7f Merge "Move libprotobuf-cpp-full and libprotobuf-cpp-lite to mixed builds denylist." am: a358fdb6f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1903457

Change-Id: I5ce6066162fb9b6b9342356d778a565043182e8e
2021-12-01 13:49:24 +00:00
Jingwen Chen
a358fdb6f3 Merge "Move libprotobuf-cpp-full and libprotobuf-cpp-lite to mixed builds denylist." 2021-12-01 13:32:27 +00:00
Jiakai Zhang
33ea009498 Merge "Add entries for STANDALONE_SYSTEMSERVER_JARS to systemserverclasspath.pb" am: 2258b889bf am: 1d7dad1f09 am: 0cb50b1036
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1876173

Change-Id: I6575d890e0e9ca81d0ca4ad7c511601712e7e433
2021-12-01 13:00:01 +00:00
Jiakai Zhang
0cb50b1036 Merge "Add entries for STANDALONE_SYSTEMSERVER_JARS to systemserverclasspath.pb" am: 2258b889bf am: 1d7dad1f09
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1876173

Change-Id: I3f652c22234c237d05a560c2191db85035c5bc63
2021-12-01 12:43:17 +00:00
Jiakai Zhang
1d7dad1f09 Merge "Add entries for STANDALONE_SYSTEMSERVER_JARS to systemserverclasspath.pb" am: 2258b889bf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1876173

Change-Id: I17917da17c91a241082c407a2ac893091af540ee
2021-12-01 12:37:48 +00:00
Jiakai Zhang
2258b889bf Merge "Add entries for STANDALONE_SYSTEMSERVER_JARS to systemserverclasspath.pb" 2021-12-01 12:29:37 +00:00
Florian Mayer
77d0035a07 Revert "Enable hwasan use after scope detection."
This reverts commit 753dd32123.

Reason for revert: Broke hwasan postsubmit and https://r.android.com/1906006 does not seem to fix it. Reverting while investigating.

Change-Id: I0033314ac936e7062dc785b3b362ead0b5e9d8f0
2021-12-01 02:31:45 +00:00
Treehugger Robot
ada1b19121 Merge "Remove python 2 support from manifest_utils" am: f517a9c631 am: 4674a20939 am: 292c80c755
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906866

Change-Id: I7b5f673f9d8ac280416bac034f368e87606fa0df
2021-11-30 22:55:37 +00:00
Treehugger Robot
292c80c755 Merge "Remove python 2 support from manifest_utils" am: f517a9c631 am: 4674a20939
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906866

Change-Id: I914ed7e32e5bf36ca182705d7cef5b104028fe0c
2021-11-30 22:37:57 +00:00
Treehugger Robot
4674a20939 Merge "Remove python 2 support from manifest_utils" am: f517a9c631
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1906866

Change-Id: Ie5f5cf0738bf2d215a5937b534a4ddf5856b1160
2021-11-30 22:26:39 +00:00
Treehugger Robot
f517a9c631 Merge "Remove python 2 support from manifest_utils" 2021-11-30 22:12:17 +00:00
Colin Cross
fddadb4982 Merge "Switch default for InstallBypassMake to true" am: 9579f4c05d am: d8c4562f7b am: 33efd2114f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889721

Change-Id: I7addbed78fb4e9a87875a0b31a8d9781faf9dd15
2021-11-30 21:20:50 +00:00
Colin Cross
33efd2114f Merge "Switch default for InstallBypassMake to true" am: 9579f4c05d am: d8c4562f7b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889721

Change-Id: I1ed0c3a8b5b63de3a60bc5f7d91f8e6dc0d8a23b
2021-11-30 21:02:44 +00:00
Colin Cross
d8c4562f7b Merge "Switch default for InstallBypassMake to true" am: 9579f4c05d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889721

Change-Id: If05a5d88c3e86553936634b75706c2ae167c742f
2021-11-30 20:47:13 +00:00
Colin Cross
9579f4c05d Merge "Switch default for InstallBypassMake to true" 2021-11-30 20:31:26 +00:00
Cole Faust
c903f00e3f Remove python 2 support from manifest_utils
Bug: 203436762
Test: Presubmits
Change-Id: If93033a428aa1aa0dd2db973666d4790af8f0912
2021-11-30 12:24:02 -08:00
Florian Mayer
4b76f726c2 Merge "Enable hwasan use after scope detection." am: 413da04189 am: 06ca0a8871 am: 695c537a25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894675

Change-Id: Ie13bb41f58cf8d23f955aaae3db0a2346af4533c
2021-11-30 19:22:21 +00:00
Florian Mayer
695c537a25 Merge "Enable hwasan use after scope detection." am: 413da04189 am: 06ca0a8871
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894675

Change-Id: I0372b379a09c82314c790e4d6a52614113db6faf
2021-11-30 19:06:25 +00:00
Florian Mayer
06ca0a8871 Merge "Enable hwasan use after scope detection." am: 413da04189
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1894675

Change-Id: I228226c49df69fcb8a7f861b5e10a385fdd69ef4
2021-11-30 18:48:53 +00:00
Benjamin Brittain
9edc375a06 Add support for Rust JNI Libraries
Test: Verified Rust JNI lib is in apex

Change-Id: Icb013d7b2f4c5d8ec009ea4937185689cc0cac16
2021-11-30 13:38:15 -05:00
Florian Mayer
413da04189 Merge "Enable hwasan use after scope detection." 2021-11-30 18:36:48 +00:00
Christopher Parsons
c604da7467 Merge "bp2build implementation for c_std" am: 93c3cb69bc am: cd37948bf8 am: 640ecbcd91
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1905394

Change-Id: I19fa19b75b23bc03ff5a4fe664823406583a8891
2021-11-30 16:39:18 +00:00
Christopher Parsons
640ecbcd91 Merge "bp2build implementation for c_std" am: 93c3cb69bc am: cd37948bf8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1905394

Change-Id: If4561af2b4c09ed5afd93e52bc12de143fcd3579
2021-11-30 16:20:33 +00:00
Christopher Parsons
cd37948bf8 Merge "bp2build implementation for c_std" am: 93c3cb69bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1905394

Change-Id: Ied0ea3e67262b2ed21f8c17820acf33a952e5553
2021-11-30 16:02:32 +00:00
Christopher Parsons
93c3cb69bc Merge "bp2build implementation for c_std" 2021-11-30 15:50:31 +00:00
Jiakai Zhang
cee9e19a51 Add entries for STANDALONE_SYSTEMSERVER_JARS to systemserverclasspath.pb
This CL updates platform_systemserverclasspath,
systemserverclasspath_fragment, and
prebuilt_systemserverclasspath_fragment to write entries for
STANDALONE_SYSTEMSERVER_JARS to systemserverclasspath.pb. A new property
`standalone_contents` is aded to `systemserverclasspath_fragment` and
`prebuilt_systemserverclasspath_fragment` to list the standalone system
server jars in the APEX, and entries will be written to
systemserverclasspath.pb accordingly at build time.

To add more context, these entries will be consumed by derive_classpath
in order to generate an environment variable
PRODUCT_STANDALONE_SYSTEM_SERVER_JARS. The environment variable will
then be comsumed by odrefresh to determine what jars to preopt on early
boot.

Note that the variable should not end with "CLASSPATH" because the list
is not used by runtime as a classpath. It is just a colon-separated list
of jars. System server loads the jars separately with paths hardcoded in
the code.

Bug: 203198541
Test: manual -
  1. Add some jars to PRODUCT_STANDALONE_SYSTEM_SERVER_JARS
  2. Add some other jars to PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS
     and standalone_contents.
  3. Build an image.
  4. Flash the image to a device.
  5. adb shell echo \$STANDALONE_SYSTEMSERVER_JARS
  6. See the correct list of jars.
Change-Id: I09a6fd1d3db85c194330da9b751702a9bf069e26
2021-11-30 10:51:10 +00:00
Jingwen Chen
d480859cee Move libprotobuf-cpp-full and libprotobuf-cpp-lite to mixed builds denylist.
These libraries can be built by bazel, but not in the target and product
variant as required in mixed builds. See associated TODO for more info.

Bug: 206538317
Bug: 204810610
Bug: 204811222

Test: b build //external/protobuf:all
Change-Id: I45802c682dd40874de6393708d27323152463db6
2021-11-30 02:28:29 +00:00
Chris Parsons
2b1f99ace0 Unravel much of the bp2build denylist. am: 8a4981617f am: ba9ea3fd23 am: 78dc881f8d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1900630

Change-Id: I70e1649155dfe44b3886d22d78d176558b83204b
2021-11-29 23:46:26 +00:00
Chris Parsons
79bd2b7761 bp2build implementation for c_std
Test: mixed_droid in conjunction with topic changes
Change-Id: Ic673c1b269f5082b490b32057eb60f3b73eb0940
2021-11-29 18:38:31 -05:00
Chris Parsons
78dc881f8d Unravel much of the bp2build denylist. am: 8a4981617f am: ba9ea3fd23
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1900630

Change-Id: I9fd26aba313d05c4f71cbf55af5a1b904fa57be1
2021-11-29 23:26:37 +00:00
Chris Parsons
ba9ea3fd23 Unravel much of the bp2build denylist. am: 8a4981617f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1900630

Change-Id: I39ee7c89b6dd8e5625da36f6a7c6e39b72346513
2021-11-29 23:08:42 +00:00