Commit Graph

37326 Commits

Author SHA1 Message Date
Paul Duffin
e1fab6a30b Merge "Make all SdkMemberTypes support transitive member deps" am: dbb490359a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699188

Change-Id: Id7f35c99e3cf7ffdb9627afb73b802fac734e154
2021-05-07 12:36:35 +00:00
Paul Duffin
11abc8f8d6 Merge "Make licenseModule SdkAware" am: e746f30a0b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699187

Change-Id: I700e883007f12cf70a118b9708314c1297c18144
2021-05-07 12:36:28 +00:00
Paul Duffin
dbb490359a Merge "Make all SdkMemberTypes support transitive member deps" 2021-05-07 12:31:15 +00:00
Paul Duffin
e746f30a0b Merge "Make licenseModule SdkAware" 2021-05-07 12:31:03 +00:00
Paul Duffin
bef3a5ce3e Merge "Make sdk tests more realistic" am: e0fc8725f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699186

Change-Id: I4f52029c1044d9f888413e936b2f752b3c004a6b
2021-05-07 12:28:34 +00:00
Paul Duffin
c74ff5cae5 Merge "Add missing calls to InitSdkAwareModule" am: 820ed78954
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699185

Change-Id: Ic6c043bb9f549fc2326f44b50ee5ff2f38c199c1
2021-05-07 12:27:37 +00:00
satayev
95e9c5bbfa Split SYSTEMSERVERCLASSPATH entries from platform_bootclasspath.
Boot jars are different to system server jars at build level, due to
added complexity of dexpreopt. As a logical separation add a new
classpath fragment type and split existing classpaths.proto generation
into relevant pieces.

Bug: 180105615
Test: m && launch_cvd; atest CtsClasspathsTestCases
Change-Id: I88bec09fc920166ffd0092faef980754ddeb6593
2021-05-07 13:24:16 +01:00
Paul Duffin
e0fc8725f3 Merge "Make sdk tests more realistic" 2021-05-07 12:16:25 +00:00
Paul Duffin
820ed78954 Merge "Add missing calls to InitSdkAwareModule" 2021-05-07 12:15:16 +00:00
Paul Duffin
be007d1800 Install updatable-bcp-packages.txt and boot-image.bprof
Previous refactorings of the code for creating these two files caused
them to be created before the boot.prof file instead of afterwards. As
a result even though they were appended to the list of files to install
they were discarded when the boot.prof file set the list rather than
appended to it. That worked before the refactoring because the
boot.prof file set the list first before the others were appended to
it.

This change appends the boot.prof file to the list making the order in
which they are added irrelevant.

Bug: 187494247
Test: m nothing
      - check DEXPREOPT_IMAGE_PROFILE_BUILT_INSTALLED in generated
        make_vars file to ensure it includes all 3 files.
Change-Id: Idb94531daf61b1b047c72eb5c67a57d3fdced05c
2021-05-07 13:07:34 +01:00
Paul Duffin
85e40bba2c Merge "Transitively add APEX variants for contents of prebuilt_apex/apex_set" am: c76155cd71 am: c8e88cf3f7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697056

Change-Id: I25aaada86866e4a869972a106d07a8e7c9208f68
2021-05-07 09:00:35 +00:00
Paul Duffin
c8e88cf3f7 Merge "Transitively add APEX variants for contents of prebuilt_apex/apex_set" am: c76155cd71
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697056

Change-Id: I0d375fe05a3f2935d2cae0425322a2d36a6f5c96
2021-05-07 08:45:39 +00:00
Paul Duffin
c76155cd71 Merge "Transitively add APEX variants for contents of prebuilt_apex/apex_set" 2021-05-07 08:24:06 +00:00
Inseob Kim
0a834e5ad7 Merge "Add prebuilt_defaults for prebuilt etc modules" am: d91c75ca09 am: 837b94419f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1698425

Change-Id: I0549652db3e5aa97ce46bb6fc1a1b0efd72988a6
2021-05-07 00:44:11 +00:00
Inseob Kim
837b94419f Merge "Add prebuilt_defaults for prebuilt etc modules" am: d91c75ca09
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1698425

Change-Id: Icf6552fe42f1427feabab0562c530fe64a7756ae
2021-05-07 00:29:10 +00:00
Colin Cross
81866c119c Merge "Support blueprint_go_binary in PathForModuleSrc" am: 57892ceafb am: c24869d391
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1694192

Change-Id: I197f8493e767bf255387d4bec456e3a706e8f63b
2021-05-07 00:03:58 +00:00
Inseob Kim
d91c75ca09 Merge "Add prebuilt_defaults for prebuilt etc modules" 2021-05-06 23:59:18 +00:00
Colin Cross
c24869d391 Merge "Support blueprint_go_binary in PathForModuleSrc" am: 57892ceafb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1694192

Change-Id: I37850b744a3f3eb89bc6566c191fb25e5001ef07
2021-05-06 23:47:54 +00:00
Colin Cross
57892ceafb Merge "Support blueprint_go_binary in PathForModuleSrc" 2021-05-06 23:29:22 +00:00
Paul Duffin
b17d044628 Transitively add APEX variants for contents of prebuilt_apex/apex_set
This is part of the work needed to allow the exported_java_libs
property to be replaced by exported_bootclasspath_fragments.

Bug: 187266082
Test: m nothing
      m SOONG_CONFIG_art_module_source_build=false nothing
Change-Id: I2c1d70a390200b93163f9799719290c9d55a041c
2021-05-06 23:43:43 +01:00
Paul Duffin
e7c94a689b Stop exporting java_sdk_library libs in the snapshot
The libs property in java_sdk_library is not safe to export as it can
contain libraries that contain implementation specific classes. No
snapshot appears to need this capability but if it does become
necessary then either it will need to use the existing stub_only_libs
property or a new one will need to be added.

Bug: 157884619
Test: m nothing
Change-Id: I60a069177dbee4070d311b23d25f4eb3c5e7ea13
2021-05-06 23:22:15 +01:00
Paul Duffin
2d3da31d41 Make all SdkMemberTypes support transitive member deps
Previously, only those SdkMemberTypes which had specific need to
automatically add some of their dependencies as sdk members would cause
the sdk to visit their transitive dependencies. However, as any module
can have dependencies on license modules and license modules need to be
included in the sdk then it needs to visit transitive dependencies of
all members.

So, this change removes the support for allowing an SdkMemberType to
control whether its transitive dependencies are visited and just visits
them all.

This does not have any effect on sdk snapshots as in order for a
dependency to be added to an sdk it needs to be added with a tag that
implements SdkMemberTypeDependencyTag and the only tags that implement
this are used by SdkMemberTypes that had enabled transitive members.

Bug: 181569894
Test: m art-module-sdk art-module-host-exports art-module-test-exports
      - verify that this change has no effect on the generated snapshots
Change-Id: If0293af0237aa7e39335e5b8383a41c023ff5853
2021-05-06 23:13:06 +01:00
Paul Duffin
b9e7a3ca7a Make licenseModule SdkAware
Making licenseModule SdkAware caused two breakages in the build. The
breakages were both caused by having an SdkAware module that was
depended upon by a versioned sdk snapshot but which was not itself
versioned and so did not have the member_name property set.

That occured because some default licenses have been added to the
packages containing prebuilts, e.g. prebuilts_runtime_license in
prebuilts/runtime/Android.bp. They apply to both the versioned and
unversioned members.

Once license support has been added to the sdk most of those will be
removed and replaced with properly versioned license modules. However,
in the meantime it is necessary to support that.

This change avoids the issue by checking to see whether the module is
itself versioned before relying on the member_name property. It also
improves the error message when a panic is recovered to make it easier
to identify where it originates.

Bug: 181569894
Test: m nothing
Change-Id: I0e7da2e0c4a30a6f814c2faab821b185aaed2135
2021-05-06 23:13:06 +01:00
Paul Duffin
525a590565 Make sdk tests more realistic
The tests use <sdk>_<module>_<version> as the format for a versioned
sdk member name but the format should be <sdk>_<module>@<version>. This
change corrects it and also fixes a similar issue in an error message.

Bug: 181569894
Test: m nothing
Change-Id: I8be0db4bcd0b6f4d6fbdf9e402ef7257fae8e18b
2021-05-06 23:13:06 +01:00
Paul Duffin
b6b89a4074 Add missing calls to InitSdkAwareModule
A follow up change will add methods to SdkBase which requires its
module field to have been initialized.

Bug: 181569894
Test: m nothing
Change-Id: I9b02f260ad3f82316cc7ab3b5717b7e81090b0d8
2021-05-06 23:13:06 +01:00
Elliott Hughes
b6788c0dc5 Remove most of the remaining references to gccCmd.
Bug: http://b/185257607
Bug: http://b/147452927
Test: treehugger
Change-Id: I5d2a8530b539811b9cb8147939b6adfaac115cc8
2021-05-06 12:25:56 -07:00
Elliott Hughes
afcd339d96 Remove unused parts of the strip implementation.
The --use-gnu-strip option was removed from the shell script already,
and it no longer uses the $CROSS_COMPILE environment variable.

Bug: http://b/185257607
Bug: http://b/147452927
Test: treehugger
Change-Id: If9f7b75d52c1e9cd167d73eeba8f77054ffd63a7
2021-05-06 12:12:43 -07:00
Brian Egizi
1789c06a12 Merge "Prepare kzip script to support superproject sha as an environment variable" am: 7c8769231b am: 59e1ed3519
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697783

Change-Id: I1ea72b30f1ec522ad0c456b1b2aad7743dab4a23
2021-05-06 17:39:29 +00:00
Brian Egizi
59e1ed3519 Merge "Prepare kzip script to support superproject sha as an environment variable" am: 7c8769231b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697783

Change-Id: Ib754c03a8eb30193f367ddbd87245c41d2c2a9f0
2021-05-06 17:24:23 +00:00
Brian Egizi
7c8769231b Merge "Prepare kzip script to support superproject sha as an environment variable" 2021-05-06 17:02:25 +00:00
Mathew Inwood
571cd912d0 Merge "Ensure current.zip is put in the right place." am: 7e554ec2de am: 4908d287e3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697678

Change-Id: I9dccd1b29a223a95cc367fbe9c868ad500be2b19
2021-05-06 16:00:06 +00:00
Mathew Inwood
4908d287e3 Merge "Ensure current.zip is put in the right place." am: 7e554ec2de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697678

Change-Id: Ia30d2ca1f5126b374fd4248e83f045a9f1d2ecc2
2021-05-06 15:45:20 +00:00
Mathew Inwood
7e554ec2de Merge "Ensure current.zip is put in the right place." 2021-05-06 15:21:04 +00:00
Paul Duffin
1f66749e99 Merge "Add baseline test for sdk snapshot env variables" am: 2cd736c648 am: 9b7bb39138
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697673

Change-Id: Ie0dd5deb2a66f2d0f8160182356584e6bc6dea9e
2021-05-06 15:15:05 +00:00
Paul Duffin
9b7bb39138 Merge "Add baseline test for sdk snapshot env variables" am: 2cd736c648
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697673

Change-Id: I291b7130831613431a59e5871d83d564ec57a4cb
2021-05-06 15:00:22 +00:00
satayev
b2f4c1919b Rename classpath_fragment.go methods for better readability. am: 128ce2ff73 am: 0309f55c23
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697680

Change-Id: Id7792fd28b5b8904cdbe1b3cefbd3546fee13277
2021-05-06 14:52:55 +00:00
Paul Duffin
2cd736c648 Merge "Add baseline test for sdk snapshot env variables" 2021-05-06 14:42:54 +00:00
satayev
0309f55c23 Rename classpath_fragment.go methods for better readability. am: 128ce2ff73
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697680

Change-Id: I188173f7ce1d1698a5a0244afa9eb11f738062c9
2021-05-06 14:36:37 +00:00
Mathew Inwood
60770e2250 Ensure current.zip is put in the right place.
Using the InstallFile as the snapshot ensure that the artifact
in out/soong/mainline-sdks/ is built when building the sdk
target.

Test: m ipsec-module-sdk
Change-Id: I45ce6001dbae3a7a9c4cf50f8d7d5d67f94dbcb3
2021-05-06 13:16:27 +00:00
satayev
128ce2ff73 Rename classpath_fragment.go methods for better readability.
Bug: 180105615
Test: m nothing
Change-Id: Ic663c22e5b7cbab487dc1fe99805e08843c3213d
2021-05-06 13:27:28 +01:00
satayev
0caa3a31f1 Merge "Make SystemServerJars ConfiguredJarList." am: 63bc30fc12 am: fb5c5cd8ee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1695707

Change-Id: Iac71d56beab3b106a20275867034e871b00a974c
2021-05-06 12:09:30 +00:00
satayev
fb5c5cd8ee Merge "Make SystemServerJars ConfiguredJarList." am: 63bc30fc12
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1695707

Change-Id: I4bf3c0903222f6aa70aa97a38f4263e2e3cbcd31
2021-05-06 11:52:39 +00:00
Inseob Kim
1e27a14545 Add prebuilt_defaults for prebuilt etc modules
Bug: 33691272
Test: build
Change-Id: I9af232e9ed9b0815c4cc70dfae2ec44e87b6d114
2021-05-06 11:46:11 +00:00
satayev
63bc30fc12 Merge "Make SystemServerJars ConfiguredJarList." 2021-05-06 11:32:39 +00:00
Justin Yun
08bbdb7ac8 Merge "Define test_min_vndk_version for cc_test" am: fc7ff27992 am: 9e13c7c6de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1695288

Change-Id: Ie3a0056cb867df538a9cda6be4059d075a0a4f7e
2021-05-06 10:29:28 +00:00
Justin Yun
9e13c7c6de Merge "Define test_min_vndk_version for cc_test" am: fc7ff27992
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1695288

Change-Id: I9da9cf9b38b7712155c39e2829c00817fdf4b433
2021-05-06 09:59:29 +00:00
Paul Duffin
62035b5991 Add baseline test for sdk snapshot env variables
Bug: 157884619
Test: m nothing
Change-Id: I56c14ddfec1c33b60fe70f56e4d59b90639657fe
2021-05-06 10:50:00 +01:00
Justin Yun
fc7ff27992 Merge "Define test_min_vndk_version for cc_test" 2021-05-06 09:48:15 +00:00
Brian Egizi
29161df446 Prepare kzip script to support superproject sha as an environment variable
Bug: b/149248752
Change-Id: I17a640c66c8f4a37cc0c55b2d0a23d438c032974
2021-05-05 23:04:36 +00:00
Anton Hansson
1c7a3af8e9 Merge "Move stub providers to droidstubs.go" am: 93e8f79577 am: 6e2cb706a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697050

Change-Id: I4ba9fb69d07b6ce5c7d7bed21b0d2a10e20b019c
2021-05-05 14:07:10 +00:00