StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,115 Commits 1 Branch 0 Tags
aa201e2e1bdd73855000bf0797b0ff74d1246e9a
Commit Graph

44115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Treehugger Robot
7a5be1a629 Merge "Use note in linker.s to place linker" am: b68048e520 am: a57b988393 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1765066

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

Change-Id: I7d982db3d688644efe6e4bd96bcfe5ccb24c0fe2
 2021-07-16 19:21:08 +00:00
Treehugger Robot
a57b988393 Merge "Use note in linker.s to place linker" am: b68048e520 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1765066

Change-Id: I3543ca4a24335ad87358cf7ebd878f9947f5a52c
 2021-07-16 19:12:06 +00:00
Paul Duffin
393bffee78 Merge "Avoid permitted_packages related build failures in unbundled builds" 2021-07-16 19:06:20 +00:00
Treehugger Robot
b68048e520 Merge "Use note in linker.s to place linker" 2021-07-16 19:02:27 +00:00
Ulyana Trafimovich
9481ca94c3 Merge "Don't attempt to add stub libraries to class loader context." am: fe261473b8 am: 63277a3aa7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768125

Change-Id: Idcc883216f3550d689e827142816fe53a392c31c
 2021-07-16 16:21:02 +00:00
Paul Duffin
5c21145915 Revert "Export implementation class jars for java_boot_libs" 
This reverts commit 22ff0aaf51.

The workaround to support hidden API generation with prebuilts by
passing the full implementation jars through to the SDK snapshot is no
longer needed as the monolithic hidden API flag generation uses the
prebuilt flag files that are already part of the snapshot.

This change reverts that previous workaround.

Bug: 192868581
Test: - Update the prebuilts
      DIST_DIR=$PWD/dist TARGET_BUILD_VARIANT=userdebug art/build/build-art-module.sh --skip-apex
      packages/modules/ArtPrebuilt/update-art-module-prebuilts.py --local-dist=dist --skip-cls --skip-apex
      - Build hidden API flags to make sure it does not fail
Change-Id: Idb3fde6f7dcb171677316d8794a4af91ede1f7e0
 2021-07-16 17:04:21 +01:00
Paul Duffin
3bc8e218f9 Avoid permitted_packages related build failures in unbundled builds 
Unbundled builds cause AlwaysUsePrebuiltSdks() to return true which
causes java_sdk_library_import modules to be preferred instead of their
corresponding java_sdk_library module. That causes the
platform-bootclasspath module to depend on prebuilt versions of modules
like framework-statsd which currently do not specify
permitted_packages and so cause a failure.

This is a temporary hack to prevent an unbundled build from checking
for permitted_packages. It can be removed once the prebuilts have been
updated to include the permitted_packages.

Bug: 193095050
Bug: 193889859
Test: m TARGET_BUILD_APPS=Calendar apps_only
      - before the change it failed in Soong.
      - after the change it started failing, later in Make, so the
        Soong problem has been worked around.
      - I reverted all the recent changes to permitted_packages and
        ran this and it still failed so that failure is unrelated to
        these changes.
Change-Id: I213d35437d76d61cf616d1f16dae213b311c6c8e
 2021-07-16 17:03:17 +01:00
Ulyana Trafimovich
63277a3aa7 Merge "Don't attempt to add stub libraries to class loader context." am: fe261473b8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768125

Change-Id: I2a8d2c57bed9c1649b7f5305a6fcb558aec2e62f
 2021-07-16 16:02:36 +00:00
Ulyana Trafimovich
fe261473b8 Merge "Don't attempt to add stub libraries to class loader context." 2021-07-16 15:45:19 +00:00
Ulya Trafimovich
78645fbba1 Remove OptionalImplicitSdkLibrary() function (it's not used anymore). 
Slightly improve documentation for `OptionalSdkLibraryImplementation()`.

Bug: 193425964
Test: m nothing
Change-Id: I3c3f385cf948cdbec54b5a6fb33a4d24d4b54be3
 2021-07-16 16:24:31 +01:00
Ivan Lozano
b83b8d1c5a Merge "rust: Remove libtest from stdlibs list" am: 2bd6cce95a am: ee205c588b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768847

Change-Id: I6886fd25e9cf47bd0e05d7ef5e5ae78654008325
 2021-07-16 15:16:39 +00:00
Ivan Lozano
ee205c588b Merge "rust: Remove libtest from stdlibs list" am: 2bd6cce95a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768847

Change-Id: Id3c3179072964df7122145bc5012393d3deaf57e
 2021-07-16 15:00:33 +00:00
Ivan Lozano
2bd6cce95a Merge "rust: Remove libtest from stdlibs list" 2021-07-16 14:44:25 +00:00
Paul Duffin
da286f4615 Make bootclasspath_fragments always perform hidden API processing 
Previously, bootclasspath_fragment modules would only perform hidden
API processing if they provided some stub libraries and fragments. That
was needed because the bootclasspath_fragment modules were added before
Soong supported hidden API processing on all the different modules and
before they all provided the necessary information that hidden API
processing required.

This change stops hidden API being conditional as it is no longer
required as it has been enabled on all existing bootclasspath_fragment
modules.

Bug: 179354495
Test: m nothing
Change-Id: I0cbf11986adff1f2f967b96f86e6bfe0e9b8b1ef
 2021-07-16 15:09:59 +01:00
Ulya Trafimovich
840efb6661 Don't attempt to add stub libraries to class loader context. 
A Java module may depend on a stub library. In that case an additional
dependency on the implementation library is created, and it is used to
add the implementation library to class loader context. We should not
attempt to add the stubs library as well (previously the attempt to add
it happend after the implemention was added to CLC, to the attempt was
unsuccessful).

Raise an error if someone tries to add the same library with different
build/instal paths.

Also, rename local variable `implicitSdkLib` to `sdkLib` to better
reflect its meaning.

Bug: 193425964

Test: $ lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd
      $ adb wait-for-device && \
        adb root && \
        adb logcat | \
        grep -E 'ClassLoaderContext [a-z ]+ mismatch' -C1
      # empty output, no errors
Change-Id: I01c1bdd23f9d118d891d0b806e7e3b4d78896a34
 2021-07-16 14:44:18 +01:00
Ulyana Trafimovich
2ddda9a593 Merge "Fix handling of "prebuilt_" prefix in classLoaderContextForUsesLibDeps." am: f87aae5356 am: 7a1642c416 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768131

Change-Id: I90fb1f89fec2b7ad5f9006bcaeabde08e4adda64
 2021-07-16 12:40:12 +00:00
Ulyana Trafimovich
7a1642c416 Merge "Fix handling of "prebuilt_" prefix in classLoaderContextForUsesLibDeps." am: f87aae5356 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768131

Change-Id: I864468cd7fa93e55f73328433ff95e05a94027ff
 2021-07-16 12:20:44 +00:00
Ulyana Trafimovich
f87aae5356 Merge "Fix handling of "prebuilt_" prefix in classLoaderContextForUsesLibDeps." 2021-07-16 12:00:29 +00:00
Ulyana Trafimovich
b7246725cc Merge "Refactor function to reduce nestedness level. No functional changes." am: 9cb1577ac7 am: de136dec72 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768130

Change-Id: I2ee712fb8768bb7086a78f538c536e93cc7063c4
 2021-07-16 10:12:30 +00:00
Ulyana Trafimovich
de136dec72 Merge "Refactor function to reduce nestedness level. No functional changes." am: 9cb1577ac7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768130

Change-Id: Iee12737d59c5529868543a9a0f61f0c1fc3c328f
 2021-07-16 09:56:22 +00:00
Ulyana Trafimovich
9cb1577ac7 Merge "Refactor function to reduce nestedness level. No functional changes." 2021-07-16 09:37:00 +00:00
Jingwen Chen
f59a8e117e Fix apex bp2build. 
apexBundle was missing InitBazelModule for it to have bazel_module properties.

Test: soong unit test
Fixes: 193866723
Change-Id: I5fb38c8b2e8edaecef44162491d399c0223d3fb1
 2021-07-16 09:32:49 +00:00
Jingwen Chen
6dcca41d76 Soong OWNERS: add more folks and categorize by timezones. 
Test: N/A
Change-Id: Ifc16654d1a295fe341b982319101be9c8c170113
 2021-07-16 07:25:00 +00:00
Colin Cross
0369572907 Merge "Rename ninja variables with Clang in the name" am: 51736b82fc am: ac5a348ce9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1767413

Change-Id: Ib314260932248c5f2d0ca0f2e567fa61eb91c1e2
 2021-07-16 01:06:04 +00:00
Colin Cross
ac5a348ce9 Merge "Rename ninja variables with Clang in the name" am: 51736b82fc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1767413

Change-Id: I897f6d3127ca841f06edac146a872a16c0336956
 2021-07-16 00:48:53 +00:00
Colin Cross
7a19faf969 Merge changes I29bf144b,Id2879453 am: 908fbe200e am: a103247992 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1767412

Change-Id: Ib40d4dae318eb81f1bd04cd061af664cd4994238
 2021-07-16 00:30:14 +00:00
Colin Cross
51736b82fc Merge "Rename ninja variables with Clang in the name" 2021-07-16 00:28:13 +00:00
Colin Cross
a103247992 Merge changes I29bf144b,Id2879453 am: 908fbe200e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1767412

Change-Id: Iaa0d26511b9028cd2593ca4992deb7f07fe4f50f
 2021-07-16 00:15:40 +00:00
Colin Cross
908fbe200e Merge changes I29bf144b,Id2879453 
* changes:
  Remove more clang indirection without affecting command lines
  Remove clang indirection without affecting build.ninja
 2021-07-16 00:00:22 +00:00
Liz Kammer
aa91cec9cb Merge "Add test to reproduce bug in error message." am: c07b16f49c am: 56008abd97 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768625

Change-Id: I8eebed1645018ec228c492152862b8046c87122f
 2021-07-15 21:45:42 +00:00
Liz Kammer
56008abd97 Merge "Add test to reproduce bug in error message." am: c07b16f49c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768625

Change-Id: Iee7c52b166bad9a0d1d0c8b7ef22cbd87fb74c39
 2021-07-15 21:26:43 +00:00
Liz Kammer
c07b16f49c Merge "Add test to reproduce bug in error message." 2021-07-15 20:37:52 +00:00
Martin Stjernholm
5d56d75dbe Merge "Document how APEXes are identified in the boot jar variables." am: 9fe17bc8d9 am: 337f8cc2f2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1756729

Change-Id: If1e5211ffd2f1cab1d6cc62d1058f8b64fbb2dd2
 2021-07-15 19:51:34 +00:00