StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,975 Commits 1 Branch 0 Tags
6e3ba9ac3bb53eb565e98d3b7fb46e85e26f19ce
Commit Graph

5550 Commits

Author SHA1 Message Date
Colin Cross
f1a6c775c2 Merge "Reland: Pass jars with resources to R8" am: 795a9f99f4 am: bb5e173587 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1788754

Change-Id: I77b353b14f7f86b36ce7db8cc946a9c11c4f6b81
 2021-08-06 19:15:47 +00:00
Colin Cross
6854848b31 Merge changes Ia0c3826a,I92ad6635 am: 03349188bc am: f1338a63f7 am: f2b08a4d4e am: d5c8543ad3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1788753

Change-Id: Iead08f0118ab150b4f2d4a75bf48d77b8425ec1a
 2021-08-06 19:00:18 +00:00
Colin Cross
795a9f99f4 Merge "Reland: Pass jars with resources to R8" 2021-08-06 18:33:23 +00:00
Colin Cross
f2b08a4d4e Merge changes Ia0c3826a,I92ad6635 am: 03349188bc am: f1338a63f7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1788753

Change-Id: I0c3816d2606531aa25e35c433719876a52df511c
 2021-08-06 18:17:43 +00:00
Colin Cross
03349188bc Merge changes Ia0c3826a,I92ad6635 
* changes:
  Revert "Time out and dump stacks from R8 processes after 30 minutes"
  Add more debugging to run_with_timeout
 2021-08-06 17:47:49 +00:00
Paul Duffin
5dc2473179 Export signature patterns to sdk snapshot am: 8d007e9919 am: 3e2c442d58 am: 9569137e33 am: 6abb84a09f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1788092

Change-Id: Ifada515077a836ab16867b2b08ff5e21c768530a
 2021-08-06 16:52:08 +00:00
Paul Duffin
bd6d63370b Separate creation of signature patterns from overlap checking am: 67b9d61ac2 am: 0623c3e8f9 am: b32b624d71 am: 475968b5b0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1788091

Change-Id: I4726bd873538233660babaa7c831c8b1536edeca
 2021-08-06 16:52:01 +00:00
Paul Duffin
9569137e33 Export signature patterns to sdk snapshot am: 8d007e9919 am: 3e2c442d58 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1788092

Change-Id: I196e1c4f176c7c3b6b43fd9fd3cfa193a6c1d0f7
 2021-08-06 16:39:20 +00:00
Paul Duffin
b32b624d71 Separate creation of signature patterns from overlap checking am: 67b9d61ac2 am: 0623c3e8f9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1788091

Change-Id: If9d75256940429dbf6890ca5a07d1806b81e6c53
 2021-08-06 16:39:14 +00:00
Paul Duffin
8d007e9919 Export signature patterns to sdk snapshot 
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: Ic819def9b0c41e3b22fb98582cd39f6d27080a32
 2021-08-06 14:11:14 +01:00
Paul Duffin
67b9d61ac2 Separate creation of signature patterns from overlap checking 
Previously, the signatures used to select the subset of the monolithic
flags were simply the signatures read from the modular flags file. This
change moves the creation of the signature list into a separate script
that outputs the signatures to a file and then passes the path through
Soong from the bootclasspath_fragment modules that create it to the
platform_bootclasspath module that uses it to compare the modular
flags against the monolithic flags.

Currently, the signatures are the full signatures but follow up changes
will replace them with patterns (hence the name) that avoids having to
include implementation details in the hidden API flags that are output
as part of a bootclasspath_fragment's snapshot.

This change moves the stub flags related code next to the all flags
related code as they are treated in a similar way.

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: I2855bf6d05c91b8a09591664185750361c7e644f
 2021-08-06 13:40:34 +01:00
Colin Cross
a79a52c7c4 Reland: Pass jars with resources to R8 
R8 will parse proguard files out of resources in injars.  Use the jar
with resources instead of the classes jar so that R8 can see the
proguard files.

R8 fails when an input jar contains dex files, so filter out dex files
from the input jar before passing it to r8.

This relands Ibb870ee9c70470336f542a3b7542dab86716dbf8 with a fix to
move the temporary input jar outside the output directory.  Putting it
in the output directory interacted poorly with RBE in local comparison
mode, which incorrectly deleted the output directory.

Bug: 195558228
Test: m checkbuild
Change-Id: Id4b091c3bd72d4c2904883e8793ec4b9499e4b78
 2021-08-05 23:16:38 -07:00
Colin Cross
a832a04db2 Revert "Time out and dump stacks from R8 processes after 30 minutes" 
This reverts commit 29c294b2cf.

The deadlock in R8 was fixed, and the timeout causes problems when
RBE is enabled and the R8 action gets stuck in a queue for 30
minutes.

Test: checkbuild
Change-Id: Ia0c3826aea3288e9db3bdbd4955e1e16c0a38fe3
 2021-08-05 17:04:06 -07:00
Colin Cross
5f821d081a Merge "Revert "Pass jars with resources to R8"" am: 93fb53f5d0 am: e8332a9fde am: 4175ce628e am: 2c203ad146 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1788367

Change-Id: I667c11510d38c2098fe9d4234cc5f91cc0a099d9
 2021-08-05 16:25:26 +00:00
Colin Cross
4175ce628e Merge "Revert "Pass jars with resources to R8"" am: 93fb53f5d0 am: e8332a9fde 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1788367

Change-Id: I97069bca283f0f68c4f14ad1db15ea6ca3254b86
 2021-08-05 15:54:07 +00:00
satayev
8137c6a2b6 Update a comment about PRODUCT_UPDATABLE_BOOT_JARS. 
Bug: 191127295
Test: n/a
Change-Id: I3d8e8689a79be79714b01cfd8abac34e7d963aee
Merged-In: I3d8e8689a79be79714b01cfd8abac34e7d963aee
 2021-08-05 16:35:22 +01:00
Colin Cross
93fb53f5d0 Merge "Revert "Pass jars with resources to R8"" 2021-08-05 15:25:25 +00:00
Colin Cross
1d73c7316c Revert "Pass jars with resources to R8" 
This reverts commit 05ca7c8769.

Reason for revert: b/195644067

Flaky failure with "missing in.jar" error.

Change-Id: Id2d6452de1e43951bc58f0bfb8e20d5ad65ce830
 2021-08-05 15:16:11 +00:00
satayev
1d0f023abf Append platform classpath proto configs with missing apex jars. 
Any apex classpath fragment that doesn't generate its own classpaths
proto, must still propagate it's boot jars for the platform classpath
fragment to include for complete CLASSPATH variables on device.

Bug: 191127295
Test: atest CtsClasspathsTestCases derive_classpath_test
Change-Id: I93687f69006741fcd66eb6e04891a4b4bbcc3b47
Merged-In: I93687f69006741fcd66eb6e04891a4b4bbcc3b47
 2021-08-05 13:20:21 +01:00
satayev
ffe797109a Add classpath fragment property to skip proto generation. 
This must always be true for updatable apexes, but is not necessary
for non-updatable apexes like com.android.i18n.

In a follow up this will be used to figure out whether apex boot jars
should be bundled into platform_bootclasspath.

Bug: 191127295
Test: atest CtsClasspathsTestCases derive_classpath_test
Change-Id: Ib7dc5b057cb24955222fb97f3ff9da079f30ed77
Merged-In: Ib7dc5b057cb24955222fb97f3ff9da079f30ed77
 2021-08-05 11:22:19 +01:00
satayev
64646ee5d7 Rename ClasspathFragmentToConfiguredJarList methods to configuredJars. 
They are internal implementation details of individual fragments.

Bug: 191127295
Test: m
Change-Id: Ib350135f5f6720741492f362f7b3203e5107772e
Merged-In: Ib350135f5f6720741492f362f7b3203e5107772e
 2021-08-05 11:06:03 +01:00
Colin Cross
6a843f33cd Merge "Pass jars with resources to R8" am: ac33aac0aa am: 7f47b50ef6 am: a818133f24 am: 5a666a3519 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1786607

Change-Id: If2910e9550b30ed5ff830a782ee968a16fd7ed3b
 2021-08-05 02:35:34 +00:00
Colin Cross
a818133f24 Merge "Pass jars with resources to R8" am: ac33aac0aa am: 7f47b50ef6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1786607

Change-Id: Id5782f3903cf4b29e22da3f0ee4ab3f0c6e518a4
 2021-08-05 02:11:16 +00:00
Colin Cross
ac33aac0aa Merge "Pass jars with resources to R8" 2021-08-05 01:41:32 +00:00
Colin Cross
05ca7c8769 Pass jars with resources to R8 
R8 will parse proguard files out of resources in injars.  Use the jar
with resources instead of the classes jar so that R8 can see the
proguard files.

R8 fails when an input jar contains dex files, so filter out dex files
from the input jar before passing it to r8.

Bug: 195558228
Test: m checkbuild
Change-Id: Ibb870ee9c70470336f542a3b7542dab86716dbf8
 2021-08-04 14:57:45 -07:00
Treehugger Robot
8dbef1f9f2 Merge "Update documentation for genrule and sdk_library" am: 8662a3793b am: 099a42701a am: f087512f38 am: 89be6a1480 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1780976

Change-Id: I10ce14f2befbd2691adae8a36357031eea3506aa
 2021-08-04 01:22:09 +00:00
Treehugger Robot
f087512f38 Merge "Update documentation for genrule and sdk_library" am: 8662a3793b am: 099a42701a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1780976

Change-Id: I1488e1e4f79527280c11656de90e9e5121c6d319
 2021-08-04 00:48:06 +00:00
Treehugger Robot
8662a3793b Merge "Update documentation for genrule and sdk_library" 2021-08-04 00:14:31 +00:00
Spandan Das
93e95992a4 Update documentation for genrule and sdk_library 
1. Documentation for genrule and sdk_library was missing a period, which
has been added now. For
genrule, Before:
https://android-build.googleplex.com/builds/submitted/7594870/linux/latest/view/genrule.html,
After:
https://x20web.corp.google.com/users/sp/spandandas/soong_docs/genrule.html

2. Documentation for genrule was missing definition of $(locations),
which has been added now

Bug: 194231221
Test: m soong_docs
Change-Id: Ia367f13055c110d92a491a9c1b1af4113f66b296
 2021-07-30 00:25:20 +00:00
satayev
685e463147 Merge "Rename UpdatableSystemServerJars to ApexSystemServerJars." am: 0d8c497535 am: 59eb1584f6 am: c3c6b6b666 am: d4244ca7b5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1779990

Change-Id: Ic5269b9bb7133cbfaf8fa5e9c4db9df46efd3e4c
 2021-07-29 12:23:03 +00:00
satayev
c3c6b6b666 Merge "Rename UpdatableSystemServerJars to ApexSystemServerJars." am: 0d8c497535 am: 59eb1584f6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1779990

Change-Id: I31b7d16d1f66b08f74469c0593ba3b6c11191c52
 2021-07-29 11:56:03 +00:00
satayev
0d8c497535 Merge "Rename UpdatableSystemServerJars to ApexSystemServerJars." 2021-07-29 11:23:43 +00:00
Rupert Shuttleworth
c2e74aef19 Merge "Add initial bp2build support for converting android_app_certificate modules." am: 569a23ae00 am: b48abbcd56 am: 4c93b1dcf7 am: 3fe3d0dc3e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1780168

Change-Id: I106c0ab6fd9257c570340eb93c4c5c7483b378bc
 2021-07-28 13:20:56 +00:00
satayev
492b17d533 Rename UpdatableSystemServerJars to ApexSystemServerJars. 
This is consistent with naming for boot jars, e.g. ApexBootJars.

Bug: 191127295
Test: presubmit
Change-Id: I6e8828d55ac86b7f5260ed7f8d4eca1c0b3dced8
 2021-07-28 14:04:49 +01:00
Rupert Shuttleworth
4c93b1dcf7 Merge "Add initial bp2build support for converting android_app_certificate modules." am: 569a23ae00 am: b48abbcd56 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1780168

Change-Id: Id7b661fd6d760da4f4514523c7603b8e2cfd6634
 2021-07-28 12:49:07 +00:00
Rupert Shuttleworth
5c4881c8ec Add initial bp2build support for converting android_app_certificate modules. 
Test: Added unit test.

Change-Id: Ib5bf1711eca5be772e1bed73663dcb86252e0b4a
 2021-07-28 06:51:07 -04:00
Rupert Shuttleworth
4515c7d2a4 Add some more properties to the bp2build APEX converter (second try) am: 6e4950a061 am: 6de2c9b72b am: d0ec532fa6 am: 2593fc4e96 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778212

Change-Id: I8945628c883dba58e927379a450e5897e11cf6d7
 2021-07-27 12:31:45 +00:00
Rupert Shuttleworth
d0ec532fa6 Add some more properties to the bp2build APEX converter (second try) am: 6e4950a061 am: 6de2c9b72b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778212

Change-Id: Ic13b56e93a31357887d37c21952d5a2fe8d85d87
 2021-07-27 10:57:03 +00:00
Rupert Shuttleworth
6e4950a061 Add some more properties to the bp2build APEX converter (second try) 
In particular:

- AndroidManifest
- file_contexts
- key
- certificate
- min_sdk_version
- updatable
- installable
- native_shared_libs
- binaries

Test: Updated unit test

Change-Id: I1c6e8c4b6b24ce487f64e5d37bd594dbb000fe6f
 2021-07-27 05:02:50 -04:00
Rupert Shuttleworth
e95a5baace Merge "Revert "Add some more properties to the bp2build APEX converter."" am: d0e6ad1ab3 am: 8ed074029d am: 53b662e2f3 am: 5d4f209a69 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778407

Change-Id: I4cdea5e60517a5918f251e5d957f749894ce8870
 2021-07-27 03:51:59 +00:00
Treehugger Robot
aa8d1a13f0 Merge "Add some more properties to the bp2build APEX converter." am: 57dd3c40e8 am: 23c45bb446 am: b97add46c7 am: 422d4fa80b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778085

Change-Id: Ibe1606b7340872f9f964acffa14bdbf4792098d5
 2021-07-27 03:35:55 +00:00
Rupert Shuttleworth
53b662e2f3 Merge "Revert "Add some more properties to the bp2build APEX converter."" am: d0e6ad1ab3 am: 8ed074029d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778407

Change-Id: I732ad6808d71b32642fb5892387a6500c31af9d3
 2021-07-27 03:25:29 +00:00
Treehugger Robot
b97add46c7 Merge "Add some more properties to the bp2build APEX converter." am: 57dd3c40e8 am: 23c45bb446 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1778085

Change-Id: I7274c07caeee96306b69172793a9c9699839b35b
 2021-07-27 03:02:43 +00:00
Rupert Shuttleworth
d0e6ad1ab3 Merge "Revert "Add some more properties to the bp2build APEX converter."" 2021-07-27 02:56:56 +00:00
Rupert Shuttleworth
0358478150 Revert "Add some more properties to the bp2build APEX converter." 
This reverts commit 69bf4c0d60.

Reason for revert: Possibly broke CI (https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master-bazel&target=bp2build-incremental&lkgb=7266256&fkbb=7237028), rolling back just in case...

Change-Id: I14ebac4f47576a73285d1f724ae4499036e8e678
 2021-07-27 02:37:32 +00:00
Treehugger Robot
57dd3c40e8 Merge "Add some more properties to the bp2build APEX converter." 2021-07-27 02:17:51 +00:00
satayev
1aa4621656 Merge "Rename UpdatableBootJars to ApexBootJars." am: 4102c0cc47 am: adb9e9f752 am: ad6cb082a4 am: 0c57c91e45 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773912

Change-Id: I1a4463251cddbd51838bf766509caf75ae0efc37
 2021-07-27 01:56:13 +00:00
Treehugger Robot
85aa681623 Merge "Disable lint checks which do not apply in the platform" am: 04f3f07752 am: 918a5ba519 am: 46afb55f63 am: 7cd93eb9ae 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1777154

Change-Id: Ie7ea684498dad8c5652c5897fe192c4c28894aa3
 2021-07-26 20:06:12 +00:00
satayev
ad6cb082a4 Merge "Rename UpdatableBootJars to ApexBootJars." am: 4102c0cc47 am: adb9e9f752 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773912

Change-Id: Iecc5f48620b2d4e5390ab9a081b2193924bd0dda
 2021-07-26 18:29:56 +00:00
satayev
4102c0cc47 Merge "Rename UpdatableBootJars to ApexBootJars." 2021-07-26 17:59:36 +00:00