openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
41,687 Commits 2 Branches 1 Tag 34 MiB
Commit Graph

41687 Commits

Author SHA1 Message Date
Paul Duffin 18861e9fe4 Extract the os specific snapshot module properties handling am: 2d1bb89fe3 am: b225bb759b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686072

Change-Id: I3992b0ab4e0a11e82ef0af593139af5971c39c10
 2021-04-25 09:01:56 +00:00
Paul Duffin 6e6281a34e Generate snapshot member list properties from dependencies am: cd06467124 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686074

Change-Id: I2d18bb75e49cd5fd0fffb5c13797d54b469afd58
 2021-04-25 08:43:54 +00:00
Paul Duffin 68dc0a1210 Allow exporting of sdk members to be done per tag am: a720811c38 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686073

Change-Id: I3114b26470b1c38def7fa9eade78cd007724e942
 2021-04-25 08:43:46 +00:00
Paul Duffin b225bb759b Extract the os specific snapshot module properties handling am: 2d1bb89fe3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686072

Change-Id: Iee05c818fae5fc77e865a179789b5a33411117fe
 2021-04-25 08:42:57 +00:00
Paul Duffin cd06467124 Generate snapshot member list properties from dependencies 
Previously, the snapshot member list properties were simply copied from
the sdk variants. That worked because the snapshot member list
properties must include all exported (i.e. visible outside the sdk
snaphot) members and only members explicitly specified in the sdk
member list properties were exported. However, a preceding change
allowed members that were transitively added (and so not explicitly
specified on the sdk) to be exported.

This change ensures that those exported members are added to the
snapshot member properties which means that they will now work properly
with the sdk version mutators.

This does not add tests for this because no existing SdkMemberType
exports its transitive dependencies and there is currently no way to
register an SdkMemberType for testing only. A following change will
exercise this functionality.

Bug: 186290299
Test: m nothing
Change-Id: Iadbdd86f6dcdd183fa99f647222a43d412271501
 2021-04-24 22:33:04 +01:00
Paul Duffin a720811c38 Allow exporting of sdk members to be done per tag 
Previously, every module added to an sdk directly through one of the
SdkMemberType specific properties, e.g. java_libs, was exported and
every module added automatically via a transitive dependencies was not
exported. This change allows that behavior to be customized per tag.

Bug: 186290299
Test: m art-module-sdk
      - verify that this change does not affect its contents.
Change-Id: I563b5bcd823e61c23cdb706cfcbb13337963d550
 2021-04-24 22:30:26 +01:00
Paul Duffin 2d1bb89fe3 Extract the os specific snapshot module properties handling 
Previously, the code was inlined in the addSnapshotModule() method
which made it difficult to follow, did not have clear separation
between the different pieces and duplicated functionality. This
change combines the dynamic and static properties together and then
separates the processing into collation, optimization and property
set updating methods.

Bug: 186290299
Test: m nothing
Change-Id: I311eebca2337cb67634e63d71da12305f4370c07
 2021-04-24 22:30:18 +01:00
Paul Duffin 04330bdb24 Dedup snapshot module property set initialization am: fbe470e7d3 am: 8c42e9f650 am: b908c63af2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686071

Change-Id: Id2e10d8621652a5e5e4cfb7f83b318d8f1bf3dfa
 2021-04-24 21:12:15 +00:00
Paul Duffin 5f4f516ad8 Make order of properties in snapshot module consistent am: 7b0259ff62 am: 9d9413cfd2 am: c7c4d92b6d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686070

Change-Id: I496efc5ba3647001bc1a545172617f8ee2008b11
 2021-04-24 21:12:13 +00:00
Paul Duffin 4d2157055e Clarify behavior around handling of sdk members am: cc3132e496 am: 9edb677b70 am: e8eea3d325 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686069

Change-Id: I9c701b7e4883981d499bfe313458d42b80ac8869
 2021-04-24 21:12:11 +00:00
Paul Duffin f7572fc2b5 Rename sdkMemberRef to sdkMemberVariantDep am: 2182726990 am: d8e1feefc8 am: 7bde3a5e9f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686068

Change-Id: Ibf2cf60d0b0d6aac31b714d0d6bdea3df474b8f0
 2021-04-24 21:12:09 +00:00
Paul Duffin 691d312210 Extract addSnapshotModule from buildSnapshot am: 26197a65da am: 7efe12fb78 am: 3070ef79cf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686067

Change-Id: If9353c8f7844403c0e557b624087b2875cb64854
 2021-04-24 21:12:05 +00:00
Paul Duffin b908c63af2 Dedup snapshot module property set initialization am: fbe470e7d3 am: 8c42e9f650 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686071

Change-Id: I03efdce71d6ab417d3fba6dfd41804e9301c7923
 2021-04-24 20:48:04 +00:00
Paul Duffin c7c4d92b6d Make order of properties in snapshot module consistent am: 7b0259ff62 am: 9d9413cfd2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686070

Change-Id: Ife7594562ca8506e3455d3e47d9044a9267220c0
 2021-04-24 20:48:01 +00:00
Paul Duffin e8eea3d325 Clarify behavior around handling of sdk members am: cc3132e496 am: 9edb677b70 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686069

Change-Id: I0b6ea96ca64c67cebd1a212f8e69cfa742a56346
 2021-04-24 20:47:59 +00:00
Paul Duffin 7bde3a5e9f Rename sdkMemberRef to sdkMemberVariantDep am: 2182726990 am: d8e1feefc8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686068

Change-Id: I6c7042fcd77aec3d6396e733f48b24fccc6dfbaf
 2021-04-24 20:47:57 +00:00
Paul Duffin 3070ef79cf Extract addSnapshotModule from buildSnapshot am: 26197a65da am: 7efe12fb78 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686067

Change-Id: I76cc6c7ba1dbd0a5d1054ba7c942285381b81ccd
 2021-04-24 20:47:53 +00:00
Paul Duffin 8c42e9f650 Dedup snapshot module property set initialization am: fbe470e7d3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686071

Change-Id: Ie9c182c6a56acba88230791c17c36ea037ec1a98
 2021-04-24 20:29:05 +00:00
Paul Duffin 9d9413cfd2 Make order of properties in snapshot module consistent am: 7b0259ff62 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686070

Change-Id: Ic478978caa9384930c2f0a2ea7200e39c79c8bdf
 2021-04-24 20:29:03 +00:00
Paul Duffin 9edb677b70 Clarify behavior around handling of sdk members am: cc3132e496 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686069

Change-Id: Ia7e975678704bc659bb60beb8119f1df82a1c0a9
 2021-04-24 20:29:00 +00:00
Paul Duffin d8e1feefc8 Rename sdkMemberRef to sdkMemberVariantDep am: 2182726990 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686068

Change-Id: I5293f6149bd73e05e76a1ad8849103cc770a8e36
 2021-04-24 20:28:56 +00:00
Paul Duffin 7efe12fb78 Extract addSnapshotModule from buildSnapshot am: 26197a65da 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686067

Change-Id: If354ee73ccef284658c7592c83b0346076aff7ad
 2021-04-24 20:28:25 +00:00
Paul Duffin fbe470e7d3 Dedup snapshot module property set initialization 
Previously, the code to add the compile_multilib property was
duplicated. This change moves the logic into the existing
addMemberPropertiesToPropertySet method, renames it to reflect new
behavior and renames and promotes the variantProperties struct from the
addSnapshotModule() method to the package level scope.

Bug: 186290299
Test: m nothing
Change-Id: I832a7fd89a3cf95467a1ff0807902c9be34c50b9
 2021-04-24 16:50:47 +01:00
Paul Duffin 7b0259ff62 Make order of properties in snapshot module consistent 
Previously the compile_multilib property was added after the member
list properties at the top level but before them in the target.os
level. This change makes it always be added before them.

Bug: 186290299
Test: m nothing
Change-Id: I01fe272933fd11f7f730cc379f60fb2ce70f2114
 2021-04-24 16:50:47 +01:00
Paul Duffin cc3132e496 Clarify behavior around handling of sdk members 
Renames some types and adds some documentation to try and clarify how
the sdk handles the members.

Bug: 186290299
Test: m nothing
Change-Id: I4038276f5f4c473a96fe06aedc43050c90416877
 2021-04-24 16:49:26 +01:00
Paul Duffin 2182726990 Rename sdkMemberRef to sdkMemberVariantDep 
Previously, there were two types sdkMemberRef and sdkMember that seemed
as though the former was referring to the latter but that was not the
case. The former was actually information about the dependency the sdk
had on a specific member variant. The latter is all the information
about a specific member, including all its variants.

This change attempts to clarify that relationship, both through a
better type name and through some improved documentation.

Bug: 186290299
Test: m nothing
Change-Id: I1dcc0ddf3333da9e797bb23ae945d04729839014
 2021-04-24 16:48:16 +01:00
Paul Duffin 26197a65da Extract addSnapshotModule from buildSnapshot 
Bug: 186290299
Test: m nothing
Change-Id: I297d63366d71f692572e8e40f1e510b6e41859e6
 2021-04-24 16:48:16 +01:00
Paul Duffin 4c532fb597 Merge "Check consistency of the BootJars/UpdatableBootJars config" am: 3b0c95b0e2 am: aad12ec18f am: 53efd12d48 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683883

Change-Id: Ibe86811ecdf30d0ae369c97f0b12f3a48d1bf69d
 2021-04-24 10:05:19 +00:00
Paul Duffin 53efd12d48 Merge "Check consistency of the BootJars/UpdatableBootJars config" am: 3b0c95b0e2 am: aad12ec18f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683883

Change-Id: I8e254f0328583556b6b304d089f246ed75071312
 2021-04-24 09:36:36 +00:00
Paul Duffin aad12ec18f Merge "Check consistency of the BootJars/UpdatableBootJars config" am: 3b0c95b0e2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683883

Change-Id: I952628e4666552d872ce05bfe59146bf3364280a
 2021-04-24 09:12:53 +00:00
Paul Duffin 3b0c95b0e2 Merge "Check consistency of the BootJars/UpdatableBootJars config" 2021-04-24 08:54:27 +00:00
Paul Duffin defcca19af Merge "Remove unused boot_image module type, prebuilt and sdk member type" am: 95661aab07 am: eb2abd05b9 am: 3aa522ece3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1685590

Change-Id: Ie8af346df2979b368130cde35047d5e54e6b7082
 2021-04-23 23:38:46 +00:00
Paul Duffin 3aa522ece3 Merge "Remove unused boot_image module type, prebuilt and sdk member type" am: 95661aab07 am: eb2abd05b9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1685590

Change-Id: I0c618b0920c03bbed8d302be212818bf7fc0af44
 2021-04-23 23:03:46 +00:00
Paul Duffin eb2abd05b9 Merge "Remove unused boot_image module type, prebuilt and sdk member type" am: 95661aab07 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1685590

Change-Id: I037abfe509e80e3ac69690bb063c86cf448f73a9
 2021-04-23 22:34:44 +00:00
Paul Duffin 95661aab07 Merge "Remove unused boot_image module type, prebuilt and sdk member type" 2021-04-23 22:20:10 +00:00
Ivan Lozano eecd9383d1 Merge "rust: Pass additional Clang C flags from toolchain" am: e934263d18 am: aba7be0ef6 am: 5c0b272672 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1685645

Change-Id: I270e58493eb9a26857180a0180aed1dcc3c85436
 2021-04-23 18:57:39 +00:00
Paul Duffin 94993d5ce5 Rename BootImageModule to BootclasspathFragmentModule am: 7771eba88e am: 687425b0af am: 30b9c47cb7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1685589

Change-Id: I1898516696beb6049ee1467832455dc1bfdab6f2
 2021-04-23 18:57:27 +00:00
Ivan Lozano 5c0b272672 Merge "rust: Pass additional Clang C flags from toolchain" am: e934263d18 am: aba7be0ef6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1685645

Change-Id: I869137a37b28aae12735554b61215f1d2a30a516
 2021-04-23 18:35:24 +00:00
Paul Duffin 30b9c47cb7 Rename BootImageModule to BootclasspathFragmentModule am: 7771eba88e am: 687425b0af 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1685589

Change-Id: I1d09dee1f01774f83b0ca06da3bbab5a9c7f5fe2
 2021-04-23 18:35:16 +00:00
Ivan Lozano aba7be0ef6 Merge "rust: Pass additional Clang C flags from toolchain" am: e934263d18 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1685645

Change-Id: Ie7edfd83fb310c46761b3923ac79ca31b0e1d3c0
 2021-04-23 18:14:44 +00:00
Paul Duffin 687425b0af Rename BootImageModule to BootclasspathFragmentModule am: 7771eba88e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1685589

Change-Id: Id66bf95afa1fcf422368a2fa4236678918854153
 2021-04-23 18:13:59 +00:00
Ivan Lozano e934263d18 Merge "rust: Pass additional Clang C flags from toolchain" 2021-04-23 18:13:10 +00:00
Paul Duffin d19f579cea Merge changes Ic32f02a6,Ibe358542 am: d5f8421afd am: e6e95f392a am: 3b7084417b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1685586

Change-Id: Ic32a38e064ef652375c8a4da9ab7f9cb497f6da4
 2021-04-23 16:38:00 +00:00
Jaewoong Jung 19ef691538 Merge "Fix minor issues in updatability lint CLs." am: 8811dcbb22 am: f623005952 am: ab6d61d1ea 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1684886

Change-Id: Ie315db88ce15bdbca85c2647bd4a160696b21932
 2021-04-23 16:37:53 +00:00
Paul Duffin 3b7084417b Merge changes Ic32f02a6,Ibe358542 am: d5f8421afd am: e6e95f392a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1685586

Change-Id: I4064c3f51a43583c2ccd4c6ea1ccfbcecc7eb545
 2021-04-23 16:15:46 +00:00
Jaewoong Jung ab6d61d1ea Merge "Fix minor issues in updatability lint CLs." am: 8811dcbb22 am: f623005952 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1684886

Change-Id: I461530dd340ebb05c10206f8a8b84598a2906ff6
 2021-04-23 16:15:38 +00:00
Treehugger Robot a7a7781907 Merge "Incorporate cc_library_headers into mixed builds" am: 459c532e44 am: f3a8a7aeaf am: fc49cc7de6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1673770

Change-Id: I2234c40a8b091e82da7417de483f92624870d6f1
 2021-04-23 16:05:18 +00:00
Paul Duffin 8ab3f70cab Merge "Extract general bootclasspath related code into java/bootclasspath.go" am: fbe3a73d48 am: ec874c8232 am: 698629b21e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683884

Change-Id: I4048298a97763bcea925787907734ddf60034e92
 2021-04-23 16:05:10 +00:00
Paul Duffin e6e95f392a Merge changes Ic32f02a6,Ibe358542 am: d5f8421afd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1685586

Change-Id: If4aedde0fa563bc03fcf4bf74f79e65785992e65
 2021-04-23 16:03:29 +00:00
Paul Duffin df160eb463 Remove unused boot_image module type, prebuilt and sdk member type 
Bug: 177892522
Test: m nothing
Change-Id: I5763b55992e4113506ae5ccdaf9865ee27d8b041
 2021-04-23 17:00:26 +01:00