Commit graph

46786 commits

Author SHA1 Message Date
Treehugger Robot
eea12c1be9 Merge "Add Sh_binaries property" am: abd43ec406
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899131

Change-Id: Ib1f905e9492d25ea6040775fe9e788c23b575a7a
2021-12-02 01:08:03 +00:00
Treehugger Robot
abd43ec406 Merge "Add Sh_binaries property" 2021-12-02 00:52:23 +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
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
7c8497dc36 Merge "Ignore errors when running df in build_test.bash" 2021-12-01 18:53:09 +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
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
Benjamin Brittain
7c721018bb Merge "Add support for Rust JNI Libraries" 2021-12-01 14:12:34 +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
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
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
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
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
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
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
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
Chris Parsons
8a4981617f Unravel much of the bp2build denylist.
This change involves adding a number of packages to the bp2build allowlist,
and subsequently adding several specific modules to the denylist (with reasoning).

The end result is that:
1. It's more clear why certain modules are denylisted, either via their unsupported
   dependencies or unsupported properties.
2. This increases the number of converted targets to 320, up from 284.

Test: mixed_droid.sh
Test: bp2build.sh

Change-Id: I9f50869401455033a191c6c41d3836509afe1071
2021-11-29 12:07:25 -05:00
Sorin Basca
c0244da203 Adding configuration support for Java 11
Bug: 195387073
Test: m
Change-Id: Ibf26f35b83b300acacae800f9962a00916869412
2021-11-26 17:26:33 +00:00
Martin Stjernholm
7867136695 Merge "Fix prebuilt selection logic for cc_prebuilt_library_headers." am: a3ee4aadce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1900779

Change-Id: I7376f0c305346f15a2b66d817b6bd1d75d573f4c
2021-11-26 11:32:31 +00:00
Martin Stjernholm
a3ee4aadce Merge "Fix prebuilt selection logic for cc_prebuilt_library_headers." 2021-11-26 11:19:42 +00:00
Treehugger Robot
8fea65b2dd Merge "Add //build/bazel/examples/soong_config_variables/... to bp2build allowlist." am: fe87ccef2a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1901436

Change-Id: I2c890905c25ff528779d576ff85ade5ae6d13cc6
2021-11-26 08:05:25 +00:00
Treehugger Robot
fe87ccef2a Merge "Add //build/bazel/examples/soong_config_variables/... to bp2build allowlist." 2021-11-26 07:51:43 +00:00
Treehugger Robot
e1ce0800cf Merge "Do not pass --compiler-filter=speed-profile with --profile-file." am: b0879c843f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899014

Change-Id: Ib8260eddc20f9250e5295666f73b341dd3282f00
2021-11-25 20:52:57 +00:00
Treehugger Robot
b0879c843f Merge "Do not pass --compiler-filter=speed-profile with --profile-file." 2021-11-25 20:42:31 +00:00
Treehugger Robot
87feed1f91 Merge changes Iecf7edd6,Iaca5cf23,I01d57919 am: 8a0dd0265b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1901600

Change-Id: Ibcf03af1323e36afd04cf6443f3aac75612dbf0e
2021-11-25 12:38:36 +00:00
Pedro Loureiro
4b495f1a5c Perform validation of shared library attributes am: c362142438
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1901599

Change-Id: I9af9c79cc0808854129c728ea21cd2bb117f5843
2021-11-25 12:38:35 +00:00
Pedro Loureiro
913ab0d8cd Add support for new permissions library tag attributes am: 9956e5e281
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1901598

Change-Id: Ib126103022eae02d90f6f9f659a194dd437c13ec
2021-11-25 12:38:33 +00:00
Treehugger Robot
8a0dd0265b Merge changes Iecf7edd6,Iaca5cf23,I01d57919
* changes:
  Fix attribute names in generated permissions.xml
  Perform validation of shared library attributes
  Add support for new permissions library tag attributes
2021-11-25 12:22:37 +00:00
Sundong Ahn
80c04891de Add Sh_binaries property
The sh_binary module is not supported the vendor variant. So, even if
there is "vendor: true" in sh_binary module, the image variant is
"image:" instead of "image:vendor.Tiramisu".
But the vendor APEX has vendor variant, so vendor APEX module and
sh_binary module have different variants and the sh_binary cannot be
added to vendor apex.
So the Sh_binaries property is added, and the image variant is removed
at DepsMutator.

Bug: 205065320
Test: make -j40 && sh_binary is added to vendor APEX && install check
Change-Id: I30e2d96a73b45e7b06eff24550542cb010008c41
2021-11-25 03:43:57 +00:00
Cole Faust
afb25de476 Merge "Change type of Unbundled_build_apps from bool to []string" am: b3a4ff4fa5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1901371

Change-Id: I114bab43127ac09e49f8ad0b60d59543f862ce71
2021-11-25 01:27:02 +00:00
Cole Faust
b3a4ff4fa5 Merge "Change type of Unbundled_build_apps from bool to []string" 2021-11-25 01:06:53 +00:00
Martin Stjernholm
e65c3aee02 Fix prebuilt selection logic for cc_prebuilt_library_headers.
Unlike other prebuilt modules it doesn't have a srcs property of any
kind, so android.Prebuilt cannot defer to the source module just
because its srcsSupplier would return nil.

Test: m nothing
Bug: 202192894
Change-Id: Iafcf165569bad6eae37820cf71aa0fcacb720e02
2021-11-24 20:48:04 +00:00
Treehugger Robot
1c323016f7 Merge "Rename rbc_product_config.sh to rbc_regression_test.sh" am: a5524e3272
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1901176

Change-Id: Ic2b52609f8d61b5adb99fbd338bb466223fdf0eb
2021-11-24 18:23:19 +00:00
Treehugger Robot
a5524e3272 Merge "Rename rbc_product_config.sh to rbc_regression_test.sh" 2021-11-24 18:03:09 +00:00
Pedro Loureiro
ba6682fabf Fix attribute names in generated permissions.xml
Previously it would write min_device_sdk whereas the correct name should
be min-device-sdk. This happened for all shared libs attributes.

Test: m nothing
Test: manually installed an apex with a shared lib and made sure PM used
the attributes as expected

Bug: 191978330

Change-Id: Iecf7edd6bae98c7af908d3f320f10ae4973d0396
Merged-In: Iecf7edd6bae98c7af908d3f320f10ae4973d0396
(cherry picked from commit bde653e5fd)
2021-11-24 17:09:20 +00:00
Pedro Loureiro
c362142438 Perform validation of shared library attributes
Perform consistency checks as per http://go/updatable-shared-libraries

These include:
  * no attribute can specified can be less than T
  * max-device-sdk can't be less than min-device-sdk
  * min and max-device-sdk need to be at least the module's
  min_sdk_version
  * using on-bootclasspath-before implies that the module's
  min_sdk_version is at least T or the library has min-device-sdk of at
  least T

Test: m nothing

Bug: 191978330

Change-Id: Iaca5cf23fb0bc7e65effb3529c8e829560894c2e
Merged-In: Iaca5cf23fb0bc7e65effb3529c8e829560894c2e
(cherry picked from commit f9e584dd20)
2021-11-24 17:09:19 +00:00