Commit Graph

44607 Commits

Author SHA1 Message Date
Paul Duffin
d483d1ac66 Merge "Filter blocked entries from modular flag files" am: 1f0cc77010 am: 78fc6dc40a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1788095

Change-Id: I377eee1d14a930d00f944522d1cc71cd43411175
2021-08-11 19:07:45 +00:00
Paul Duffin
78fc6dc40a Merge "Filter blocked entries from modular flag files" am: 1f0cc77010
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1788095

Change-Id: I062ea01f8854ab45edcc43c33667ae68619ef364
2021-08-11 18:54:18 +00:00
Colin Cross
9a552ba243 Merge changes from topic "presubmit-am-f604a6c6a6d9457fb6ec07ffbe0cdbc6" into sc-dev-plus-aosp
* changes:
  [automerged blank] Collect lint reports from apps in apexes 2p: 192221b55e
  Collect lint reports from apps in apexes
2021-08-11 18:43:00 +00:00
Paul Duffin
1f0cc77010 Merge "Filter blocked entries from modular flag files" 2021-08-11 18:36:37 +00:00
Joel Galenson
c72bd31130 Merge "Add libselinux to the Rust allowlist so we can run its test." am: adffbe9166 am: f21bff48d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1792447

Change-Id: Ie521c4b913145a1de3ce59d78e665e3c86303243
2021-08-11 17:51:33 +00:00
Joel Galenson
f21bff48d1 Merge "Add libselinux to the Rust allowlist so we can run its test." am: adffbe9166
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1792447

Change-Id: Iecf1d6588929da013e98c27b79efefce9a0358ec
2021-08-11 17:38:26 +00:00
Joel Galenson
adffbe9166 Merge "Add libselinux to the Rust allowlist so we can run its test." 2021-08-11 17:20:35 +00:00
satayev
4d566bea9b Merge "Fix tests to use correct fixtures for configuring (Apex)BootJars." am: 721f42d12a am: 9958b36643
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1787998

Change-Id: Id9248b6b54547e55c28bb386c867294ec20df873
2021-08-11 16:42:47 +00:00
Paul Duffin
280bae6d20 Filter blocked entries from modular flag files
Previously, the sdk snapshot would include all the entries from the
stub-flags.csv and all-flags.csv modular files generated by a single
bootclasspath_fragment. That included implementation details, i.e.
class members that are not part of a stable API or the hidden API which
meant that the sdk snapshots were implementation dependent.

This change removes the implementation details from the modular flag
files, i.e. those entries that are only marked as "blocked". When
comparing the files against the corresponding subset of the monolithic
files it assumes that any entries missing from the modular flag files
are blocked.

Bug: 194063708
Test: atest --host verify_overlaps_test signature_patterns_test
      m out/soong/hiddenapi/hiddenapi-flags.csv
      - manually change files to cause difference in flags to check
        that it detects the differences.
Change-Id: I6b67b2253cf029d6830b58a06ebb0c8fcaa0dd71
2021-08-11 17:29:47 +01:00
satayev
9958b36643 Merge "Fix tests to use correct fixtures for configuring (Apex)BootJars." am: 721f42d12a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1787998

Change-Id: Ib651ed488365ae0133f5e31333a3dec42f748c31
2021-08-11 16:24:54 +00:00
satayev
721f42d12a Merge "Fix tests to use correct fixtures for configuring (Apex)BootJars." 2021-08-11 16:13:20 +00:00
Colin Cross
a16f9d5c2c [automerged blank] Collect lint reports from apps in apexes 2p: 192221b55e
Blank merge reason: Change-Id Ie84819343f8b8ab3f43496bbc9b7876d0d0d8e70 with SHA-1 8355c1524f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15531885

Change-Id: Ic052602d02ab435a09b97e290a2d3399fee194f9
2021-08-11 16:09:02 +00:00
Colin Cross
192221b55e Collect lint reports from apps in apexes
Lint reports were only being collected from jars in apexes, not
apps.

Bug: 188772607
Test: mainline_modules_arm64 build
Change-Id: Ie84819343f8b8ab3f43496bbc9b7876d0d0d8e70
Merged-In: Ie84819343f8b8ab3f43496bbc9b7876d0d0d8e70
(cherry picked from commit 8355c1524f)
2021-08-11 09:07:57 -07:00
Treehugger Robot
f2d32c8de5 Merge "Allow //external/bazel-skylib to use existing BUILD files" am: 00caefe11e am: 3cdfd5c77e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1791908

Change-Id: I43085bc049c0d956bc5d474c4046098bd872c65c
2021-08-11 15:29:07 +00:00
Treehugger Robot
3cdfd5c77e Merge "Allow //external/bazel-skylib to use existing BUILD files" am: 00caefe11e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1791908

Change-Id: I74ce53fac43ae8def031a69b56c8fd346bc6a05f
2021-08-11 15:12:30 +00:00
Treehugger Robot
00caefe11e Merge "Allow //external/bazel-skylib to use existing BUILD files" 2021-08-11 14:58:33 +00:00
Colin Cross
390babfeae Merge "Collect lint reports from apps in apexes" am: 7131982a76 am: 3dc9d726ed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1792871

Change-Id: Ibc44f45a5a8a5ecb977943a2beb26e6e1e465862
2021-08-11 14:44:08 +00:00
Colin Cross
874af37b5c Merge "Remove libjemalloc5 from default musl libraries" am: 88c5391dbe am: 35cff6ebd9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1784829

Change-Id: Icb3b186b1530211286e3ef75a89d05ab121628c0
2021-08-11 14:43:24 +00:00
Colin Cross
3dc9d726ed Merge "Collect lint reports from apps in apexes" am: 7131982a76
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1792871

Change-Id: Ic1f997e2b98cb2e18f975cbb3869543f94be5312
2021-08-11 14:30:01 +00:00
Colin Cross
35cff6ebd9 Merge "Remove libjemalloc5 from default musl libraries" am: 88c5391dbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1784829

Change-Id: I0840de20a17ce298d18c79ce05ed0136391be5ab
2021-08-11 14:29:19 +00:00
Colin Cross
7131982a76 Merge "Collect lint reports from apps in apexes" 2021-08-11 14:15:35 +00:00
Colin Cross
88c5391dbe Merge "Remove libjemalloc5 from default musl libraries" 2021-08-11 14:14:48 +00:00
Lukács T. Berki
d5f703270b Merge changes I07b0ca98,I1c2901e1 am: 4ddcd8152b am: 36de51a1d3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1793388

Change-Id: I3f2eb8d6377c4c400ff8b6a9dc8177b52c8ca590
2021-08-11 13:44:59 +00:00
Lukács T. Berki
36de51a1d3 Merge changes I07b0ca98,I1c2901e1 am: 4ddcd8152b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1793388

Change-Id: I708e41f1ac857dbe5f4d1e68b5ea5b5c16709172
2021-08-11 13:32:31 +00:00
Lukács T. Berki
4ddcd8152b Merge changes I07b0ca98,I1c2901e1
* changes:
  Cut the multiproduct_kati -> soong-ui-build dep.
  Do not create a build.Config in multiproduct_kati.
2021-08-11 13:17:47 +00:00
Lukacs T. Berki
f656b8434b Cut the multiproduct_kati -> soong-ui-build dep.
This is done by moving SetupSignals() to its own little package.

There are a number of tiny little utility packages for soong_ui we might
be better of merging, but that's for another change (maybe)

Test: Presubmits.
Change-Id: I07b0ca98bfb8884ef4223d665e632183b9896a0d
2021-08-11 15:15:02 +02:00
Lukacs T. Berki
2c40569db0 Do not create a build.Config in multiproduct_kati.
This mostly cuts the dependency from multiproduct_kati to the build
package; the remaining logic is SetupSignals which will be dealt with in
a followup change.

This requires some code duplication (e.g. ensureFileExists() and
detectTotalRAM()).

This removes a Finder invocation added in aosp/452598; it looks like
it's not a measurable performance hit. The quoted half a second does not
matter much in build_test{1,2,3,4} which take an amount of time measured
in hours.

It also makes ANDROID_QUIET_BUILD unsupported for the UI of
multiproduct_kati; the function of that variable seems to be to suppress
the output from build actions, which don't exist in multiproduct_kati so
it should not matter. In addition, I checked whether anyone sets this
flag for multiproduct_kati and it doesn't appear to be the case.

Test: Presubmits.
Change-Id: I1c2901e1ea69c3a35429e6c967a7bba845676ef7
2021-08-11 15:14:47 +02:00
Jingwen Chen
916322541a Allow //external/bazel-skylib to use existing BUILD files
Bug: 190605804
Test: bp2build-incremental
Change-Id: Ida765465532c0e98d035eef4c703d13fbf554538
2021-08-11 12:19:17 +00:00
Paul Duffin
502ad18616 Merge "Remove member signature and inner classes from signature-patterns.csv" am: 726d44a86d am: 46328c57ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1791187

Change-Id: I88bd4f32e0afc19c599fc9dc15589b3cd971e5ea
2021-08-11 09:34:57 +00:00
Paul Duffin
46328c57ce Merge "Remove member signature and inner classes from signature-patterns.csv" am: 726d44a86d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1791187

Change-Id: If5ba85da06ae3d70d9ff8b6e655f2e26875e3b4c
2021-08-11 09:21:27 +00:00
Paul Duffin
726d44a86d Merge "Remove member signature and inner classes from signature-patterns.csv" 2021-08-11 09:08:01 +00:00
Treehugger Robot
1db600754a Merge "[scripts] Print full clang prebuilt dir from get_clang_version.py" am: 1dde1fade7 am: 65dd881e22
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1788869

Change-Id: I9d9c66f95a680ae00bd85a68cbd19c505955dafd
2021-08-11 07:26:44 +00:00
Treehugger Robot
65dd881e22 Merge "[scripts] Print full clang prebuilt dir from get_clang_version.py" am: 1dde1fade7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1788869

Change-Id: I4e3487e2ba8280f2d5b905762a302015eb60000a
2021-08-11 07:13:04 +00:00
Treehugger Robot
1dde1fade7 Merge "[scripts] Print full clang prebuilt dir from get_clang_version.py" 2021-08-11 06:57:27 +00:00
Lukács T. Berki
4dd964552b Merge "Make multiproduct_kati call soong_ui.bash ." am: 3eff609379 am: a6450430de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1791927

Change-Id: I31f4e503c5f64eb79e99c843c7ffe3a9ccd67302
2021-08-11 06:36:58 +00:00
Lukács T. Berki
a6450430de Merge "Make multiproduct_kati call soong_ui.bash ." am: 3eff609379
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1791927

Change-Id: I30da50f8c11816f45e0f8458be74c65492e43c3e
2021-08-11 06:27:14 +00:00
Lukács T. Berki
3eff609379 Merge "Make multiproduct_kati call soong_ui.bash ." 2021-08-11 06:12:06 +00:00
Treehugger Robot
27cdf79780 Merge "Removed commented out code" am: 95048e9625 am: fabf5098a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1792190

Change-Id: I6130af0438fb7ab500125caa869a99ef68a934fa
2021-08-11 05:58:12 +00:00
Treehugger Robot
fabf5098a4 Merge "Removed commented out code" am: 95048e9625
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1792190

Change-Id: I34c39befac2c3c6ab9d3a61a7a44d2d8d6fe99e6
2021-08-11 05:43:22 +00:00
Treehugger Robot
95048e9625 Merge "Removed commented out code" 2021-08-11 05:30:45 +00:00
Colin Cross
21141d20ce Merge "Add symbols for start and end of embedded linker" am: 0bcba80823 am: 45048716c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1780488

Change-Id: I09fc63ac8a20bbde93e429634f8e38b7f8707c9b
2021-08-11 02:56:42 +00:00
Colin Cross
45048716c1 Merge "Add symbols for start and end of embedded linker" am: 0bcba80823
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1780488

Change-Id: I4116649f1fdc7f7641c29cba06d6ddf15a94f8fc
2021-08-11 02:39:03 +00:00
Colin Cross
0bcba80823 Merge "Add symbols for start and end of embedded linker" 2021-08-11 02:28:38 +00:00
Colin Cross
8355c1524f Collect lint reports from apps in apexes
Lint reports were only being collected from jars in apexes, not
apps.

Bug: 188772607
Test: mainline_modules_arm64 build
Change-Id: Ie84819343f8b8ab3f43496bbc9b7876d0d0d8e70
2021-08-10 19:25:59 -07:00
Christopher Parsons
69dcdd1024 Merge "Support rtti in bp2build" am: 9f7c388337 am: 13923bc3d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1792107

Change-Id: I8747084d228958c31d532b360a44077845c67495
2021-08-10 21:09:06 +00:00
Christopher Parsons
13923bc3d6 Merge "Support rtti in bp2build" am: 9f7c388337
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1792107

Change-Id: Iffe3ea4cb6537727a9ddfc67c37c23860d978e77
2021-08-10 20:18:22 +00:00
Christopher Parsons
9f7c388337 Merge "Support rtti in bp2build" 2021-08-10 20:05:44 +00:00
Yabin Cui
c51eaf9d7c Merge "Revert^2 "Switch to clang r428724 13.0.1."" am: 39ff202748 am: 3ce0f54b9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1792067

Change-Id: Id28c7d9899700adc52687b6f51fae6c0291c3056
2021-08-10 19:54:04 +00:00
Yabin Cui
3ce0f54b9e Merge "Revert^2 "Switch to clang r428724 13.0.1."" am: 39ff202748
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1792067

Change-Id: I7482c45ebba23cf4d2472707ec578e81a38410bb
2021-08-10 19:38:01 +00:00
Yabin Cui
39ff202748 Merge "Revert^2 "Switch to clang r428724 13.0.1."" 2021-08-10 19:22:15 +00:00