Commit Graph

44152 Commits

Author SHA1 Message Date
Paul Duffin
f87a63a6bc Merge "Remove fallback to classes jars from bootclasspath_fragment" am: 880a3971a6 am: b008abf0c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1772629

Change-Id: I2905f2d33f7f033e3e609aec4a307b05eea9c075
2021-07-21 11:35:57 +00:00
Paul Duffin
b008abf0c8 Merge "Remove fallback to classes jars from bootclasspath_fragment" am: 880a3971a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1772629

Change-Id: Ia42ff419111096a1467735a697a2454be5049762
2021-07-21 11:20:19 +00:00
Paul Duffin
880a3971a6 Merge "Remove fallback to classes jars from bootclasspath_fragment" 2021-07-21 11:02:32 +00:00
Hsin-Yi Chen
9ce14e7d03 Merge "Specify working directory and OUT_DIR to ABI tools" am: 1f019f945d am: 28bca125df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1760699

Change-Id: I526b9a95e11e4e36ff80a9d9387240f979a0e3b3
2021-07-21 07:45:55 +00:00
Hsin-Yi Chen
28bca125df Merge "Specify working directory and OUT_DIR to ABI tools" am: 1f019f945d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1760699

Change-Id: I57044e5741223b1963c4923f6f8c6394b6080ebb
2021-07-21 07:32:55 +00:00
Hsin-Yi Chen
1f019f945d Merge "Specify working directory and OUT_DIR to ABI tools" 2021-07-21 07:19:13 +00:00
Treehugger Robot
627ecdc0e7 Merge "apex: pass --align-file-size to signapk" am: c30a4c3f3c am: 9f354c8694
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1762581

Change-Id: I256bd030afdf7bd44b7397cdf55ca44b14239dd1
2021-07-21 00:51:09 +00:00
Treehugger Robot
9f354c8694 Merge "apex: pass --align-file-size to signapk" am: c30a4c3f3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1762581

Change-Id: I1d9b70cfc74d3933795d33ece9f2dd19ad0b904c
2021-07-21 00:36:26 +00:00
Treehugger Robot
c30a4c3f3c Merge "apex: pass --align-file-size to signapk" 2021-07-21 00:23:08 +00:00
Paul Duffin
d6a072b39d Remove fallback to classes jars from bootclasspath_fragment
Previously, the hidden API processing performed by the
platform_bootclasspath would try and get flag files from the fragments
it references but would fall back to the classes jars. This change
removes that logic as it is no longer needed as all fragments, both
source and prebuilts, provide flag files and the prebuilts no longer
provide valid classes jars.

Bug: 194063708
Test: m out/soong/hiddenapi/hiddenapi-flags.csv
      - check that this does not change the contents.
Change-Id: Ib867a08508f5a0f8858f6baedebbe99b6a825f80
2021-07-20 22:02:44 +01:00
Treehugger Robot
4760903116 Merge "Require prebuilt_bootclasspath_fragment to provide hidden API files" am: 41461f3660 am: 70d39ce053
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1772628

Change-Id: I276e323889e5a70ddf56b7ca71add649858c32a1
2021-07-20 20:38:22 +00:00
Treehugger Robot
854571f683 Merge changes I343712d7,Ic076ea85 am: 9c01fc686d am: 93ece5b8e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1772627

Change-Id: Id0587dc7c2a4e1019f3699aa3b3b7e5015e5e2e5
2021-07-20 20:38:13 +00:00
Treehugger Robot
70d39ce053 Merge "Require prebuilt_bootclasspath_fragment to provide hidden API files" am: 41461f3660
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1772628

Change-Id: Ifa8954f2cccc25f13253e418985fd6bb0b1d4bcc
2021-07-20 20:25:55 +00:00
Treehugger Robot
93ece5b8e2 Merge changes I343712d7,Ic076ea85 am: 9c01fc686d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1772627

Change-Id: I0cabbe9085312e212674651fad6587d2ecdd5b77
2021-07-20 20:25:47 +00:00
Treehugger Robot
41461f3660 Merge "Require prebuilt_bootclasspath_fragment to provide hidden API files" 2021-07-20 20:03:40 +00:00
Treehugger Robot
9c01fc686d Merge changes I343712d7,Ic076ea85
* changes:
  Improve hidden API checking in TestBootDexJarsFromSourcesAndPrebuilts
  Add target for generate_hiddenapi_lists_test
2021-07-20 20:03:32 +00:00
Paul Duffin
54e4197da1 Require prebuilt_bootclasspath_fragment to provide hidden API files
Previously, the prebuilt_bootclasspath_fragment was not required to
provide hidden API files as not all usages of that module provided
them. That should no longer be the case so this change makes the
prebuilt_bootclasspath_fragment stricter and so now always require
them.

Bug: 194063708
Test: m out/soong/hiddenapi/hiddenapi-flags.csv
      - check that this does not change the contents.
Change-Id: I3f19a1b4246f09a927c0f6b0f41b8678150d6cc2
2021-07-20 19:18:13 +01:00
Paul Duffin
40a3f65430 Improve hidden API checking in TestBootDexJarsFromSourcesAndPrebuilts
Previously, the test only checked how the intermediate index file was
created from class jars. This change also checks how the monolithic
index file was created from the intermediate index file and the index
files generated from each bootclasspath_fragment.

At the moment the checks reveal that the monolithic index file is
created solely from the intermediate index file. However, a follow up
change to Soong will alter the behavior of the test.

Bug: 194063708
Test: m nothing
Change-Id: I343712d7d17ab0a07f5b32226321fc6815847e1f
2021-07-20 19:17:56 +01:00
Paul Duffin
2cde5f4389 Add target for generate_hiddenapi_lists_test
atest generate_hiddenapi_lists_test would not work without setting
verbosity=2.

Bug: 194063708
Test: atest --host generate_hiddenapi_lists_test
Change-Id: Ic076ea85d58917921081ae33e72f06011c4ca49e
2021-07-20 19:17:49 +01:00
Colin Cross
9e7c62b79a Merge "Remove clang indirection, affects command line ordering" am: ae86338676 am: eeec86e85e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1767414

Change-Id: I9f209242598bb46a2f73cea6acd2fee88bf8cfc8
2021-07-19 22:16:15 +00:00
Colin Cross
eeec86e85e Merge "Remove clang indirection, affects command line ordering" am: ae86338676
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1767414

Change-Id: Ida124dffa1cc9f20345250b15c1945cbabc9d00c
2021-07-19 21:59:33 +00:00
Colin Cross
ae86338676 Merge "Remove clang indirection, affects command line ordering" 2021-07-19 21:46:52 +00:00
Treehugger Robot
266d97fa2a Merge "Refactoring fuzz packaging code" am: 0b45f0b90f am: c62f2deb45
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1758711

Change-Id: Ib7b2a903e1f5a8a52c38272704c67b9e92cfef94
2021-07-19 20:34:57 +00:00
Treehugger Robot
c62f2deb45 Merge "Refactoring fuzz packaging code" am: 0b45f0b90f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1758711

Change-Id: I1a9771e4215eb8019f633e0cbfd0b7bf12c27f0f
2021-07-19 20:14:00 +00:00
Matthew Maurer
5bf21adb93 Merge "[rust] Add android_dylib cfg flag" am: 83a12d1f94 am: c65753b3db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1758942

Change-Id: I66c147c1856b536ea96d374965a30cbd70137bf4
2021-07-19 20:10:22 +00:00
Treehugger Robot
0b45f0b90f Merge "Refactoring fuzz packaging code" 2021-07-19 20:02:23 +00:00
Matthew Maurer
c65753b3db Merge "[rust] Add android_dylib cfg flag" am: 83a12d1f94
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1758942

Change-Id: I8d3000ea96ac8171fa7f8d75df53f332e96500c8
2021-07-19 19:56:05 +00:00
Matthew Maurer
83a12d1f94 Merge "[rust] Add android_dylib cfg flag" 2021-07-19 19:43:56 +00:00
Liz Kammer
62f2a84b20 Merge "Handle target.bionic in bp2build." am: 2d8056929e am: 16cca436e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1770015

Change-Id: Ic6807fe44cdafd37b62a3da951409d1ae66597db
2021-07-19 18:40:08 +00:00
Liz Kammer
16cca436e4 Merge "Handle target.bionic in bp2build." am: 2d8056929e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1770015

Change-Id: I222af43ce92454ed0ba4d283c8716d68d1af835c
2021-07-19 18:24:22 +00:00
Liz Kammer
2d8056929e Merge "Handle target.bionic in bp2build." 2021-07-19 18:10:24 +00:00
Liz Kammer
01a16e8275 Handle target.bionic in bp2build.
Soong supports some hand-crafted target.<type> that match multiple os or
arch types to simplify configuring for similar targets. target.bionic is
used to match on both android and linux_bionic OSes for cases where they
should be handled the same way.

Test: build/bazel/ci/bp2build.sh
Change-Id: I47b6aaf3279e4d242c4fd0e12f24117eb98e0665
2021-07-19 12:53:58 +00:00
Ulyana Trafimovich
aa201e2e1b Merge "Remove OptionalImplicitSdkLibrary() function (it's not used anymore)." am: c2427ea290 am: a969203590
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1769648

Change-Id: I5923ebf75f936468601166c28e45a2f16f16d816
2021-07-19 11:05:41 +00:00
Ulyana Trafimovich
a969203590 Merge "Remove OptionalImplicitSdkLibrary() function (it's not used anymore)." am: c2427ea290
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1769648

Change-Id: Ib3fec64464a79340aa0573b7501cce4ed37568e8
2021-07-19 10:51:30 +00:00
Ulyana Trafimovich
c2427ea290 Merge "Remove OptionalImplicitSdkLibrary() function (it's not used anymore)." 2021-07-19 10:38:45 +00:00
Treehugger Robot
6631e0e332 Merge "Revert "Export implementation class jars for java_boot_libs"" am: 52cc87959b am: a868f0ff32
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768945

Change-Id: Iead370d014ec0c650538fa589b5011719d4dbd17
2021-07-19 10:26:42 +00:00
Treehugger Robot
4e7c8c3bc1 Merge "Make bootclasspath_fragments always perform hidden API processing" am: 452366ab0c am: 2e8ae7ac7b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1748478

Change-Id: If05cbda0eb80caf8871ad6ba31624abc9d85ae4d
2021-07-19 10:25:22 +00:00
Treehugger Robot
a868f0ff32 Merge "Revert "Export implementation class jars for java_boot_libs"" am: 52cc87959b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768945

Change-Id: I7623a3f94150212349074da3312c44568851946d
2021-07-19 10:10:26 +00:00
Treehugger Robot
2e8ae7ac7b Merge "Make bootclasspath_fragments always perform hidden API processing" am: 452366ab0c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1748478

Change-Id: Ic7be8efeb374ca7c448afdeb501e265674f6d8b3
2021-07-19 10:10:20 +00:00
Treehugger Robot
52cc87959b Merge "Revert "Export implementation class jars for java_boot_libs"" 2021-07-19 09:49:17 +00:00
Treehugger Robot
452366ab0c Merge "Make bootclasspath_fragments always perform hidden API processing" 2021-07-19 09:48:07 +00:00
Jingwen Chen
cc2ca325b0 Merge "Soong OWNERS: add more folks and categorize by timezones." am: 3a7b03c017 am: 24bc7c3246
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1733747

Change-Id: I418e2e62669eec3583025eccac91acf87685729d
2021-07-19 05:36:28 +00:00
Jingwen Chen
5c2e25258a Merge "Fix apex bp2build." am: 8bdc1bb3d7 am: d3f17aed08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1769290

Change-Id: I7c2eb2c283537bbde02db9701e869d9aa46674fc
2021-07-19 05:36:19 +00:00
Jingwen Chen
24bc7c3246 Merge "Soong OWNERS: add more folks and categorize by timezones." am: 3a7b03c017
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1733747

Change-Id: Iffc2c875fae98c3b23c34210afa33a70acdcb857
2021-07-19 05:25:04 +00:00
Jingwen Chen
d3f17aed08 Merge "Fix apex bp2build." am: 8bdc1bb3d7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1769290

Change-Id: Ic2f058ae505c4fb87ad1c7f2d51097d9dd620769
2021-07-19 05:24:56 +00:00
Jingwen Chen
3a7b03c017 Merge "Soong OWNERS: add more folks and categorize by timezones." 2021-07-19 05:16:10 +00:00
Jingwen Chen
8bdc1bb3d7 Merge "Fix apex bp2build." 2021-07-19 05:10:59 +00:00
Hsin-Yi Chen
79781a94f0 Specify working directory and OUT_DIR to ABI tools
This commit adds `--root-dir . --root-dir $OUT_DIR:out` to the commands
of ABI tools. If the user sets non-default $OUT_DIR, the tools write
"out" instead of the actual $OUT_DIR to the ABI dumps.

Test: export OUT_DIR=~/aosp_out ; \
      make libstagefright_bufferqueue_helper.vendor
Bug: 192157880
Change-Id: I4e2d1b252273106fb6a3ecfa1727d5c91ba03444
2021-07-19 03:46:31 +00:00
hamzeh
41ad881e16 Refactoring fuzz packaging code
Rust and cc fuzz packaging have common. This change is to put this
common methods and fields into fuzz_common.

Test: make haiku and make haiku-rust ran locally and verify corpus,
dict and config are packaged along with the executable.

Change-Id: I04bf535cd2597ed8b2bd3d8e6ea8c28f38bdc18b
2021-07-16 17:43:33 -07:00
Paul Duffin
c024fca3c2 Merge "Avoid permitted_packages related build failures in unbundled builds" am: 393bffee78 am: 9c0d3f912a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768416

Change-Id: Ia69621947be3de3c8cc0d939c5ff0e7de9c0375d
2021-07-16 19:30:46 +00:00