Commit Graph

57971 Commits

Author SHA1 Message Date
Romain Jobredeaux
20f7fbc61e Merge "Bp2Build converter for android_library_import and android_library." am: aaf4f5ec8a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2165698

Change-Id: I7b1a2b36507a3354bbe35769fdfebfdeb859066a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 18:14:50 +00:00
Romain Jobredeaux
aaf4f5ec8a Merge "Bp2Build converter for android_library_import and android_library." 2022-08-09 17:46:59 +00:00
Liz Kammer
2afec9aa1d Denylist test_fips because it depends on adb am: 3d13adc9d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2179775

Change-Id: If18bf2957bb81e7b373f1ba8d6461b4ad853eb6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 15:47:25 +00:00
Liz Kammer
3d13adc9d1 Denylist test_fips because it depends on adb
Test: CI
Test: b build //external/boringssl/...
Change-Id: I278b8229cea347acef2edd9e56e2f0853f7780e0
2022-08-09 09:26:54 -04:00
Treehugger Robot
36b436e14c Merge "update bp2build tests for cc_yasm + add to CI" am: 68572c83bf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2177842

Change-Id: Ieb104fcf9a575ed7c913948c42309cdcb60c9d34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 01:54:32 +00:00
Treehugger Robot
68572c83bf Merge "update bp2build tests for cc_yasm + add to CI" 2022-08-09 01:49:37 +00:00
Treehugger Robot
c6eb659fef Merge "bp2build special case for libcrypto_for_testing" am: c120ab33bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2178197

Change-Id: Ib0c72a093dbd343a79bbd7ac46a151f1c8c1bcdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 01:46:18 +00:00
Treehugger Robot
c120ab33bc Merge "bp2build special case for libcrypto_for_testing" 2022-08-09 01:21:37 +00:00
Krzysztof Kosiński
b07fbec3eb Merge "Globally force -Wdeprecated-declarations to be a warning." am: 0b4bd22b6f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2176788

Change-Id: I9942df4478a347696718f12c5ce9a234cca62182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 01:04:48 +00:00
Krzysztof Kosiński
0b4bd22b6f Merge "Globally force -Wdeprecated-declarations to be a warning." 2022-08-09 00:45:26 +00:00
Treehugger Robot
2ef4fc8940 Merge "Increase R8 max heap size to 4GB." am: f48643dc55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2177442

Change-Id: I0d8c8e437966d03422f74299bc7054bc35c2afb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 18:29:23 +00:00
Treehugger Robot
f48643dc55 Merge "Increase R8 max heap size to 4GB." 2022-08-08 18:08:16 +00:00
Sam Delmerico
fae47f9522 bp2build special case for libcrypto_for_testing
A new module libcrypto_for_testing was added that uses the
inject_bssl_hash property, but this property is currently only available
for the libcrypto module specifically.

Test: CI
Change-Id: I1b83de02a2990b7503980bf6a85611683427baf9
2022-08-08 13:35:08 -04:00
Cory Barker
85984a894f Merge "Revert "Updated the way we build AFL++ fuzz binaries"" am: ba73a0997d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2177924

Change-Id: I64c7061a132c51d1e0fdd4ba3e01a0c675785844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 16:56:07 +00:00
Cory Barker
ba73a0997d Merge "Revert "Updated the way we build AFL++ fuzz binaries"" 2022-08-08 16:37:28 +00:00
Cory Barker
74aea6c5ee Revert "Updated the way we build AFL++ fuzz binaries"
Revert submission 2164482-Build AFL from Command line option

Reason for revert: Unit test fails on MAC builds
Reverted Changes:
Ia7a822462:Updated the way we build AFL++ fuzz binaries
I994bde63b:Updated the way we build AFL++ fuzz binaries
Ie863853b4:Updated the way we build AFL++ fuzz binaries
I577d6ae7b:Updated the way we build AFL++ fuzz binaries
Ic4fd34f8d:Updated the way we build AFL++ fuzz binaries

Change-Id: Ic2cda7733d206d7ed178f1db5e38268bc915e57b
2022-08-08 15:55:12 +00:00
Romain Jobredeaux
c9b2bba3cd Bp2Build converter for android_library_import and android_library.
Minor refactor of android_app converted to account for common attributes
between library and app.

Test: go test
Test: ../bazel/ci/bp2build.sh
Change-Id: I60b06eef6d2b9bc2d91f8b83522747ebbe76bbb6
Bug: 215230093
Bug: 215230095
2022-08-08 11:23:02 -04:00
Sam Delmerico
c9a49dff90 update bp2build tests for cc_yasm + add to CI
This test got missed in the change to export the bp2build testing
functionality because it wasn't listed in the Android.bp file to be run
as tests in CI.

Test: go test ./bp2build
Change-Id: Ic8f16bb0d5d75084592caa4ea3018384c1c7a30c
2022-08-08 10:52:27 -04:00
Cory Barker
72885b84ee Merge "Updated the way we build AFL++ fuzz binaries" am: edadcdb17c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2164482

Change-Id: I08becb57b4b6b530d390bf142d0aeb7462b07f6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:47:02 +00:00
Cory Barker
edadcdb17c Merge "Updated the way we build AFL++ fuzz binaries" 2022-08-08 14:24:16 +00:00
Treehugger Robot
45cbeb28ff Merge "Clean up android/module.go" am: 8e77db3b36
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2175946

Change-Id: Ib8d11d3057a0b184fbe04920d5abb0ac683fd84d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 11:59:33 +00:00
Treehugger Robot
8e77db3b36 Merge "Clean up android/module.go" 2022-08-08 11:43:36 +00:00
Jordan Demeulenaere
c33f79996f Increase R8 max heap size to 4GB.
Bug: 241220562
Test: Manual
Change-Id: I983ded61b3a588e3d3b5c8e71596f80aaa2d59e6
2022-08-08 11:40:15 +02:00
Krzysztof Kosiński
6934b0ee64 Globally force -Wdeprecated-declarations to be a warning.
Some code compiles with -Werror, which makes it very hard to mark
anything as deprecated without breaking the build. This option
will ensure that we can still mark things as deprecated without
breaking such code. Among other things, this will allow us to
undo a local change to protobuf which disables deprecation
warnings.

Bug: 203713560
Test: presubmit
Change-Id: I718de31c3ff685dba4104f3c9e7bd5d169d89f7e
2022-08-07 07:00:41 +00:00
Treehugger Robot
e6f2bd54e1 Merge changes I70159a49,I1809c0fc am: bfe0342e73
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2175583

Change-Id: I666fb2657f4015e5acc80eaf66285a1fb822775d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-06 07:43:17 +00:00
Treehugger Robot
bfe0342e73 Merge changes I70159a49,I1809c0fc
* changes:
  bp2build: Allowlist and build fastboot with Bazel.
  bp2build: Allowlist //external/toybox.
2022-08-06 07:14:13 +00:00
Spandan Das
83df960615 Merge "Set targetSdkVersion to 10000 for MTS tests targeting current" am: 0264058aea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2164782

Change-Id: Ifff15aa2a63aed775150aa6d6147e6300633cbfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-06 01:50:06 +00:00
Spandan Das
0264058aea Merge "Set targetSdkVersion to 10000 for MTS tests targeting current" 2022-08-05 22:52:27 +00:00
Spandan Das
d6068de346 Merge "Spellcheck" am: 6b7c1dbf88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2175925

Change-Id: I19195f0a91317762b24bb99c10c06bab79fcf455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 21:50:03 +00:00
Cory Barker
cecb7546db Updated the way we build AFL++ fuzz binaries
Test: Built AFL fuzzers individually and built all using haiku command
and built libfuzzers individually and also by using haiku command. Ran
selected fuzzers manually to ensure fuzzing still worked.

Description: Previously we needed to add cc_afl_fuzz to build an afl fuzz binary,
however, to turn current libFuzzers into AFL fuzzers this would required
an update to each Android.bp file which is a lot of work, and would also
require an approval from each Android.bp file owner, which is even more
work.

To get around this (and also to match how AFL fuzzers are built in G3)
we will build AFL++ fuzz binaries by command line option FUZZ_FRAMEWORK.
When FUZZ_FRAMEWORK=AFL is set, all cc_fuzz modules will be built
for AFL rather than libFuzzer. Devs can also specify if a cc_fuzz module
is only for libFuzzer or AFL by using fuzzing_frameworks. If
fuzzing_frameworks is left blank then it will be assumed that the
cc_fuzz module can be built for all available fuzzing frameworks.

Change-Id: Ia7a8224627f2de61606b410d1d1a56d7bdc0955f
2022-08-05 21:46:26 +00:00
Spandan Das
6b7c1dbf88 Merge "Spellcheck" 2022-08-05 20:56:02 +00:00
Treehugger Robot
c57e3e2661 Merge "Show module's type and path when reporting dependency problems" am: 39291b9682
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2175945

Change-Id: I5cb37e4a5c115c8d9f81dcafe37ff463f06b5307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 19:59:50 +00:00
Treehugger Robot
920fbac11a Merge "Fix invalid json when product variables have quotes" am: ab8581a1f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2175955

Change-Id: Icca744c4a87625cbe7b03db9ee3b29efaf1acd26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 19:58:53 +00:00
Treehugger Robot
39291b9682 Merge "Show module's type and path when reporting dependency problems" 2022-08-05 19:44:11 +00:00
Treehugger Robot
ab8581a1f8 Merge "Fix invalid json when product variables have quotes" 2022-08-05 19:20:12 +00:00
Spandan Das
a5f39a12de Spellcheck
This should fix a spelling error that crept in during a documentation CL

Test: N/A
Change-Id: I085f7fd1399f06e3b8808ed54963abce0e06f7fe
2022-08-05 02:36:36 +00:00
Remi NGUYEN VAN
85d5ed4bb2 Merge "Make ignorewarnings optional in optimize" am: 439fbfc25f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2173927

Change-Id: Ibe0ed43f6fab59054946ab1377fb27440a028141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 01:39:21 +00:00
Remi NGUYEN VAN
439fbfc25f Merge "Make ignorewarnings optional in optimize" 2022-08-05 01:24:57 +00:00
Cole Faust
082c5f31cc Fix invalid json when product variables have quotes
Go's json encoder will escape quotes with backslashes.
But we put the encoded json into a Starlark string
literal, which will evaluate the \" into just a regular
quote, so they won't be escaped when the json.parse()
gets to them.

Escape all backslashes so this doesn't happen.

Test: lunch sdk_phone_x86_64-userdebug; b build //build/bazel/examples/apex/minimal:build.bazel.examples.apex.minimal
Change-Id: I473e6c42968fcf73d47dec61670956a7ac9a6c88
2022-08-04 15:51:58 -07:00
Sasha Smundak
e198eafaf6 Clean up android/module.go
Test: treehugger
Change-Id: I41973dfc6805009d44323f3f1a89f923abf39c79
2022-08-04 15:49:11 -07:00
Sasha Smundak
f2bb26f492 Show module's type and path when reporting dependency problems
Test: treehugger
Change-Id: I25c3eddbeeb10bd6b9bfa9e869f6fbc98d2a6ec4
2022-08-04 14:49:25 -07:00
Spandan Das
9f7ae7f565 Set targetSdkVersion to 10000 for MTS tests targeting current
MTS tests built on unstable branches (e.g. git_master) should be testable on
old system images (e.g. S). However, they run into an error during installation
on older images:
`Requires development platform $<current_codename>, but this is a
release platform`

This CL fixes this issue by updating the target_sdk_version of MTS test apps
targeting current to the magical sdk_version 10000

Bug: 227473065
Test: go build ./java
Test: TH
Change-Id: Ic0358a48a19dc239defbb4ee8ec99225cce75584
2022-08-04 21:23:14 +00:00
Liz Kammer
b44a9e9f5c Merge "export common bp2build testing functions" am: 3a0355f99c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2132793

Change-Id: I4ea95df9214aacb73eed93713ececfc4a5b6fe3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 20:02:02 +00:00
Liz Kammer
3a0355f99c Merge "export common bp2build testing functions" 2022-08-04 18:11:16 +00:00
Jingwen Chen
9009dc2d8f bp2build: Allowlist and build fastboot with Bazel.
Test: $ b build //system/core/fastboot:fastboot --config=linux_x86_64 &&
bazel-bin/system/core/fastboot/fastboot --help

Change-Id: I70159a49e7fdfbb8a0b653161e9ea2a9eeeab977
2022-08-04 15:26:46 +00:00
Jingwen Chen
5012e07bae bp2build: Allowlist //external/toybox.
Test: $ b build //external/toybox:toybox --config=linux_x86_64 && bazel-bin/external/toybox/toybox ls
Change-Id: I1809c0fcc3ae4a1965ee4bff0653266f9f64f23f
2022-08-04 15:04:43 +00:00
Alexei Nicoara
342945df01 Merge "Overriding placeholder version in updatable apks" am: 075571b5e7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2167106

Change-Id: Ie411cb4fb7ba5c4c8b402bff916ac55fa1b6def8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 08:52:28 +00:00
Alexei Nicoara
075571b5e7 Merge "Overriding placeholder version in updatable apks" 2022-08-04 08:28:16 +00:00
Remi NGUYEN VAN
bdad314f97 Make ignorewarnings optional in optimize
This allows targets to opt-in to running R8 without the -ignorewarnings
flag. Ignored warnings can cause code to be optimized incorrectly, so
this makes the build safer for such targets.

Ideally ignore_warnings should default to false, but all targets need to
be fixed for that to happen. As a first step, provide a mechanism for
individual targets to ensure they do not introduce regressions.

Bug: 229727645
Bug: 180878971
Bug: 226127213
Bug: 239990030
Test: m (runs dex_test)
Change-Id: Ic0eef29598c1ee47e958da8a5048d9696165a235
2022-08-04 13:23:47 +09:00
Alexander Smundak
d3252715f2 Merge changes Id3de4ede,Iae326016 am: fe57ecfdef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2172556

Change-Id: I06844917d9ee27bbb3f5ab85d976c5231f6ff695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 03:01:53 +00:00