Commit Graph

66239 Commits

Author SHA1 Message Date
Trevor Radcliffe
59b3729825 Update apex_comparison_test.sh to support CFI
The CFI transition being applied creates a situation where Bazel
clears its convenience symlinks. This change points the script
directly to the location of the deapexer artifact instead of the
symlink.

Bug: 261733820
Test: Ran the tests
Change-Id: I23951f0fe75ce1fbc3c0dd969244a797ac1ff983
2023-06-05 18:07:42 +00:00
Kelvin Zhang
dc14fbba1d Clean $OUT/ramdisk_16k dir during installclean
This dir is added during aosp/2595672 for building a 16K page sized
ramdisk.
Bug: 253827893

Change-Id: I0f4b1adff12d2b140aa73fd1b8ee1c606d917a47
2023-06-05 10:20:50 -07:00
Kousik Kumar
5c5c57d039 Allowlist gcert and prodcertstatus binaries
In-order to automatically detect which type of authentication to use for
RBE, we need to be able to run these binaries in bootstrap. Hence
allowlisting them.

Bug: 283828386
Change-Id: I1e0e021acc8283ec3e66c96f6676c6095bf0892b
2023-06-05 11:00:57 -04:00
Mark Teffeteller
0f2bff7eeb Merge "Add use_platform_libs to fuzz config" am: 3bc9c57dc4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2582930

Change-Id: I7f5b6d4561d69ab287abbf0e9b81e072fbaf51d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 15:00:52 +00:00
Mark Teffeteller
3bc9c57dc4 Merge "Add use_platform_libs to fuzz config" 2023-06-05 14:41:51 +00:00
Jiakai Zhang
9ec2a5568e Merge "Add an allowlist for modules that have broken optional_uses_libs." am: 4f8b23e8e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2612151

Change-Id: Ie850923a489eefabfde1a90805ae6e378505cf04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 14:37:28 +00:00
Jiakai Zhang
4f8b23e8e2 Merge "Add an allowlist for modules that have broken optional_uses_libs." 2023-06-05 14:05:49 +00:00
Yi Kong
ed79fa382b Use a less hacky way to detect if a module is Fuzzer enabled
Bug: 169004486
Test: presubmit
Change-Id: I7fad86041622979b9befb7c86897a13f604bdf3d
2023-06-05 14:21:48 +09:00
Anton Hansson
e3f31cfd1e Allow Bluetooth to use privapp_allowlist
Apparently there's some special case-code in package manager that
scans apps as privileged regardless of their location. BT is one
such app -- so allow it to specify a privapp allowlist even though
it isn't in priv-app.

Bug: 284500052
Test: use privapp_allowlist in Bluetooth and its overriddes
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a91268a690e2aa98a0fa7b376a948a48f41b1265)
Merged-In: Ib9ac86ebc45087a176100fe8df07db7bf81a85a7
Change-Id: Ib9ac86ebc45087a176100fe8df07db7bf81a85a7
2023-06-03 08:53:47 +00:00
Yabin Cui
e729e75e3d Merge changes from topic "clang_stable_r498229" am: 48fa309aa3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2611890

Change-Id: Ibc742edfb094aeda429fea010f77f1f85dc006f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 02:42:35 +00:00
Yabin Cui
faa57bfd7f Suppress performance-avold-endl clang-tidy warning am: 2c336fe5b5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2609437

Change-Id: I18fc6d489a2152a4382f189db33c7d59a11cab12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 02:42:32 +00:00
Yabin Cui
48fa309aa3 Merge changes from topic "clang_stable_r498229"
* changes:
  Suppress clang-tidy warnings causing build errors after clang update
  Suppress performance-avold-endl clang-tidy warning
2023-06-03 02:05:19 +00:00
Liz Kammer
1e75324ebd Correct genrule path references
Test: b build `bmod robolectric_tzdata`
Test: go test bp2build tests
Change-Id: I98333f2b9f480019ddca11944b455d484a47cf8e
2023-06-02 19:09:35 -04:00
Jiakai Zhang
48203e3dee Add an allowlist for modules that have broken optional_uses_libs.
Bug: 282877248
Test: m nothing
Change-Id: I1afe9d523af0633f0428d4c15e1417db1dae4e93
2023-06-02 23:42:53 +01:00
Zi Wang
b9d36bcb6b Remove truth-prebuilt and truth-host-prebuilt from denylist
truth-prebuilt and truth-host-prebuilt are able to be
built by bazel now.

Bug:285001041

Test: presubmit
Change-Id: I49ca0c4ccd55a0df591176554eab4e82c95e4699
2023-06-02 15:29:49 -07:00
Jooyung Han
be95390729 vendor apex: label apex_manifest as vendor_apex_metadata_file
Since vendor APEXes are installed in vendor partition, there shouldn't
be system_file according to Treble. Instead, we can force-label / and
/apex_manifest.pb as vendor_apex_metadata_file so that apexd (and other
system components) can still read them.

Bug: 285075529
Test: m nothing (soong test)
Change-Id: Idb36b8c4c68b29e2235dbda38ee323d4b781e1d5
2023-06-02 22:11:16 +00:00
Spandan Das
3eee54a841 Merge "Always convert xsd_config module type" am: 82f0e5daae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2604128

Change-Id: I84c5a0a645cb68ead510427fe61a06cd711f8b77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 20:49:56 +00:00
Spandan Das
82f0e5daae Merge "Always convert xsd_config module type" 2023-06-02 20:07:48 +00:00
Jiakai Zhang
e36c0fa333 Merge "Drop INTERNAL_PLATFORM_MISSING_USES_LIBRARIES." am: f508c252bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2611189

Change-Id: I9e3043b40c29e2268b1831bf44b79eeea8fc5957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 15:47:57 +00:00
Jiakai Zhang
f508c252bb Merge "Drop INTERNAL_PLATFORM_MISSING_USES_LIBRARIES." 2023-06-02 14:59:10 +00:00
Jeongik Cha
a87506f5e8 Use HINT_FROM_SOONG if ninja_log doesn't exist
In non-incremental build, there is no ninja_log. For this case, use
HINT_FROM_SOONG as an alternative solution.

Bug: 273947040
Test: 1.m after removing out/.ninja_log
      2.check if non-incremental CI build uses HINT_FROM_SOOONG
      3.check if incremental CI build uses NINJA_LOG
      4.check if there is no regression in CUJ
Change-Id: I00cd216df096cb2288eeab233729acefb0d1b73c
2023-06-02 15:50:02 +01:00
Mark
f736b924db Add use_platform_libs to fuzz config
BUG: b/279082026
TEST: mma <java_fuzz>
Change-Id: Ia3dba44f66ec18d1076f1b13cc654a35b31c02d4
WANT_LGTM=ccross
2023-06-02 14:46:53 +00:00
Treehugger Robot
fde5ae3331 Merge "Support test runnner option in auto generated test configs" am: b25cbb3449
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2606111

Change-Id: I62979a8ecc89592556f0541cb3a1495d1776b4c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 12:09:32 +00:00
Treehugger Robot
b25cbb3449 Merge "Support test runnner option in auto generated test configs" 2023-06-02 11:20:23 +00:00
Anton Hansson
d7f7d41b34 Merge "Change install name of privapp allowlists" am: 672c1467d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2611191

Change-Id: I77e897dd644b55cb78cfb4145383f570162ad181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 09:12:11 +00:00
Anton Hansson
672c1467d5 Merge "Change install name of privapp allowlists" 2023-06-02 08:19:21 +00:00
Anton Hansson
0e486a4198 Change install name of privapp allowlists
Use the APK's filename as the on-device filename for the allowlist.
Previously the filename of the source xml file was used, which leads to
a problem when the same source file is used for different apps (even
if only one of those modules ends up being installed).

Bug: 284500052
Test: app_test.go & presubmit boot tests
Change-Id: I0b43a35e3a310464d79d7f37e0900d639f4a479c
2023-06-02 08:18:42 +00:00
Yi Kong
d3fe72c808 Merge "Remove Full LTO support" am: a00f8efaa7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2609595

Change-Id: Ib361752f56433229495264795106b2a05b85a78d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 23:04:57 +00:00
Yi Kong
a00f8efaa7 Merge "Remove Full LTO support" 2023-06-01 22:46:23 +00:00
Zi Wang
22c9d89305 Merge "Add simple bp2build converter for java_test_host" am: 4af4ff33f0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2601786

Change-Id: I111521948bfd4e01d38dba3ed464354641c46def
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 22:44:33 +00:00
Paul Duffin
6022ce7352 Merge "Explicitly specify --api-overloaded-method-order source for metalava" am: f6b1e23448
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2611190

Change-Id: I4be94c71a5fa89cdf03b22b77837aa7b9ecf299c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 22:43:51 +00:00
Treehugger Robot
8a40a8f91f Merge "implement USE_BAZEL_VERSION for m" am: 9cae81483a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2608053

Change-Id: I836698ad2ec17112d56af6169b39885b7034d1ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 22:43:36 +00:00
Zi Wang
4af4ff33f0 Merge "Add simple bp2build converter for java_test_host" 2023-06-01 22:37:28 +00:00
Paul Duffin
f6b1e23448 Merge "Explicitly specify --api-overloaded-method-order source for metalava" 2023-06-01 22:10:24 +00:00
Treehugger Robot
9cae81483a Merge "implement USE_BAZEL_VERSION for m" 2023-06-01 22:06:17 +00:00
Bob Badour
ca3491cba8 Reclassify OFL as notice per cl/537072410
Test: m droid dist
Change-Id: I589bc26d9dfe6b77f8638b546bf1c6974e4d658b
2023-06-01 13:07:01 -07:00
Yabin Cui
c31c2fb0b0 Suppress clang-tidy warnings causing build errors after clang update
These warnings are not critical. We can fix them later.

Bug: 285361108
Bug: 285356805
Bug: 285356799
Test: build with WITH_TIDY=1 using clang-r498229
Change-Id: I594279a10ffb4fda07dfc33350b44d09c42d3f97
2023-06-01 19:15:40 +00:00
Spandan Das
922171dbdf bp2build for cc libraries that use xsd_config as gen srcs
In Soong, cc libraries depend on source files generated from xsd_config
using generated_sources and generated_headers. In Bazel, these souces
will be wrapped in a static library. Updated bp2build so that these are
written to implementation_whole_archive_deps instead.

Bug: 211678537
Test: bp2build test in sibling CL in system/tools/xsdc
Change-Id: Ib57c563a1eb7483bd7b04ba0d3852ecac17cde6c
2023-06-01 19:12:12 +00:00
Spandan Das
370f13c3bd bp2build for java libraries using xsd_config srcs
In Soong, java libraries can use src files generated from xsd_config. In
Bazel, instead of providing srcs, java_xsd_config_library will provide a
jar. Update bp2build so that all src references to xsd_config modules in
srcs get routed to deps and exports attributes

This CL creates an interface in build/soong/android to get around a
circular dependency issue. The bp2build logic needs to exist in
soong-java, but soong-java does have soong-xsdc in its package path. Use
the interface and type assertions to special case xsd_config references

Bug: 211678537
Test: bp2build test in sibling CL in system/tools/xsdc
Change-Id: Ida924bb20b1fd7eb8beeef950b070d37a9c6f3b5
2023-06-01 19:12:12 +00:00
Spandan Das
8d6bf5e59b Always convert xsd_config module type
Modules of this type have a limited set of deps (e.g. libxml2), and they
have already been converted.

compatibility_matrix_schema is a filegroup that is used in one of the
xsd_config modules in Soong, and it has been added to the allowlist as
well.

Test: bp2build.sh
Bug: 211678537
Change-Id: Idcbafe7c8413134b9dd7abb0dee53473f3e1d2e8
2023-06-01 19:12:05 +00:00
Treehugger Robot
fa522823d0 Merge "Only pass "-Xgc:CMC" when building for Android." am: f618c60df6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2611009

Change-Id: Idca64ff479f714f8ab29e6eb305516ff31ceddbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 18:13:22 +00:00
Treehugger Robot
f618c60df6 Merge "Only pass "-Xgc:CMC" when building for Android." 2023-06-01 17:59:45 +00:00
Paul Duffin
ac61c9a2c6 Explicitly specify --api-class-resolution api for metalava am: 5b7035f850
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2611010

Change-Id: Ieb79b63210ae9dd74dab9a94f990c9ae26cfc875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 17:52:15 +00:00
Paul Duffin
7202ffebf9 Explicitly specify --api-overloaded-method-order source for metalava
Previously, `--api-overloaded-method-order source` was the default if
that option was not specified but the other change in this topic is
switching it to `--api-overloaded-method-order signature` to match the
behavior in AndroidX. This change explicitly specifies the option
needed by Soong's use of metalava.

Bug: 285140653
Test: m checkapi
Change-Id: I00e049e0d991e650ab9940a3d495ed2b6e7480f8
2023-06-01 18:45:51 +01:00
Chris Parsons
c83398ffb4 implement USE_BAZEL_VERSION for m
This allows USE_BAZEL_VERSION to be set for m builds, which will use
Bazelisk for any Bazel invocations during those builds.

This should be used only for manual debugging, typically to either test
new Bazel features, verify Bazel compatibility with Android, or culprit
find new Bazel breakages.

Test: Manually run builds with USE_BAZEL_VERSION, toggled off and on to
ensure the build was rerun. Tested with a broken commit, a working
commit, and 'last_green' special term

Change-Id: I8b475dca5c8d4bd849ee3724a8c3aca9b631bcb8
2023-06-01 17:42:18 +00:00
Zi Wang
65b36729c3 Add simple bp2build converter for java_test_host
Bug:281551424

Test: java_test_host_conversion_test.go and presubmits
Change-Id: I43ed26df0bacd63ef402de4d9733d19604005c35
2023-06-01 10:37:09 -07:00
Paul Duffin
5b7035f850 Explicitly specify --api-class-resolution api for metalava
Previously, `--api-class-resolution api` was the default if that option
was not specified but the other change in this topic is switching it to
`--api-class-resolution api:classpath` to match the behavior in
AndroidX. This change explicitly specifies the option needed by Soong's
use of metalava.

Bug: 285140653
Test: m checkapi
Change-Id: Ief3c7f9dfdfa946f21cb048a579ec90309fb350f
2023-06-01 15:26:40 +01:00
Jiakai Zhang
4f65a03d30 Drop INTERNAL_PLATFORM_MISSING_USES_LIBRARIES.
Bug: 282877248
Test: Presubmit build tests.
Change-Id: Idd69433f308f5f47973ff0d5340a2399a27cb32c
2023-06-01 15:21:42 +01:00
Jiakai Zhang
225c4767ac Only pass "-Xgc:CMC" when building for Android.
The runtime always uses CC on host unless CMC is explicitly asked
(http://cs/android-internal/art/runtime/gc/collector/mark_compact.cc;l=212-214;rcl=50fe05b4f4650bc0888d2c218a1bfa476f811ea0).
This CL matches the build system behavior with the runtime.

Bug: 285228269
Test: m test-art-host-gtest-art_dex2oat_tests
Change-Id: I652ad6f754ab8c51283e5fb0e9e1ba644629fa11
2023-06-01 13:27:25 +00:00
Yu Liu
a4765eb3d8 Merge "Refactor the genrule allowlists code to support internal allowlists" am: b2cd6f6963
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2604127

Change-Id: Ia1116cc61bbd2771bf116e641c8262309bd17ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01 03:32:28 +00:00