Commit Graph

32285 Commits

Author SHA1 Message Date
Paul Duffin
9a5c0f99b8 Merge "java_sdk_library: Allow dist artifacts to be named" am: 0dabd31057 am: bcd26ea516
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1507582

Change-Id: Ic9eea1d8fff74cb9cfc6f9c1e9a1b069a204abfd
2020-11-23 13:42:56 +00:00
Paul Duffin
bcd26ea516 Merge "java_sdk_library: Allow dist artifacts to be named" am: 0dabd31057
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1507582

Change-Id: Ibbd4b8b08f6dfc75fbd41c63f8ee0f34ed9144bf
2020-11-23 12:54:53 +00:00
Paul Duffin
0dabd31057 Merge "java_sdk_library: Allow dist artifacts to be named" 2020-11-23 12:17:45 +00:00
Mathew Inwood
88afae4616 Merge "Explicitly tag max-target-o APIs as "lo-prio"." am: 6ba603c8a1 am: c16bcd3efb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1494180

Change-Id: I9cf6b5369886bceaedd5699790b407d48f1cdb81
2020-11-23 10:19:33 +00:00
Yo Chiang
3900d25325 Merge "prebuilt_etc: Refactoring" am: bb7895c85a am: baaf45f2d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1502551

Change-Id: I44ebb849f3f80076d108f4216e5694a99cad95f6
2020-11-23 10:19:25 +00:00
Mathew Inwood
c16bcd3efb Merge "Explicitly tag max-target-o APIs as "lo-prio"." am: 6ba603c8a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1494180

Change-Id: Id4d85787ab7bbe8a740664857063501701eb9d36
2020-11-23 10:03:05 +00:00
Yo Chiang
baaf45f2d6 Merge "prebuilt_etc: Refactoring" am: bb7895c85a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1502551

Change-Id: I1a129ec7f64de66ad06eee3bd62540f6718234d9
2020-11-23 10:02:27 +00:00
Mathew Inwood
6ba603c8a1 Merge "Explicitly tag max-target-o APIs as "lo-prio"." 2020-11-23 09:45:48 +00:00
Yo Chiang
bb7895c85a Merge "prebuilt_etc: Refactoring" 2020-11-23 09:28:55 +00:00
Treehugger Robot
edb17b5f22 Merge "Documenting android/apex.go" am: b26070efef am: 7ea5837252
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1502070

Change-Id: I261a08fe569600a33306cda9032ae96471e48f06
2020-11-23 01:36:53 +00:00
Treehugger Robot
7ea5837252 Merge "Documenting android/apex.go" am: b26070efef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1502070

Change-Id: I00437162d053047481144084fdba9036e2dc227f
2020-11-23 01:03:10 +00:00
Treehugger Robot
b26070efef Merge "Documenting android/apex.go" 2020-11-23 00:44:35 +00:00
Treehugger Robot
ad35be6343 Merge "soong_ui ninja.go: comment and refactor." am: 5898d56912 am: fa5a5f6a09
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1501592

Change-Id: If76adaf66c5a71cff424ea16fec6384b0c83d5a5
2020-11-22 21:25:25 +00:00
Treehugger Robot
fa5a5f6a09 Merge "soong_ui ninja.go: comment and refactor." am: 5898d56912
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1501592

Change-Id: I40c5f838c3063a11c40cc4b71236ae22b999becb
2020-11-22 21:05:57 +00:00
Treehugger Robot
5898d56912 Merge "soong_ui ninja.go: comment and refactor." 2020-11-22 20:15:46 +00:00
Jingwen Chen
9d1cb491c3 soong_ui ninja.go: comment and refactor.
On top of improving the comments, I also refactored the status checker
to simplify and clarify its use case to be a ninja stuckness checker,
since it doesn't appear to have other purposes.

Test: TH presubmit
Bug: b/173474588
Change-Id: I2cf51a1ebf16071a24a1c13c06c7b1adf60256de
2020-11-21 07:37:28 -05:00
Paul Duffin
3131025d61 java_sdk_library: Allow dist artifacts to be named
Unless no_dist: true is specified the java_sdk_library will
automatically copy the stubs jar and the API specification file (but
not the removed API specification file) for each scope to the apistubs/
directory in the dist from which the sub-directories in prebuilts/sdk
are populated. Previously, the name of those artifacts was based on the
name of the module. This change adds the dist_stem property to allow
the name of those artifacts to be specified separately to the module.

The purpose of this is to allow the art.module.public.api,
conscrypt.module.public.api and i18n.module.public.api java_sdk_library
modules to use a different name when copying to the dist,
e.g. conscrypt.module.public.api should use conscrypt.

Additionally, as the artifacts in the dist end up being copied verbatim
to prebuilts/sdk and the prebuilt_apis module uses those names to
create a filegroup referencing the latest released version of the API
and removed API specification files the dist_stem property is also
used in constructing the name of those filegroups.

Bug: 173715943
Test: lunch sdk-eng && m dist sdk
      Compare the results of the above before and after the change to
      ensure that this change does not affect the contents of the dist.
      See the topic's other change in external/conscrypt for testing
      the behavior of this new property.
Change-Id: Ie81345021991ff91ca55fec15b02627135293308
2020-11-20 22:43:21 +00:00
Colin Cross
08c3f71f44 Merge "Revert "Rewrite sbox to use a textproto manifest"" am: b893f8766c am: bcd0b74aae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1507524

Change-Id: Ib9e14e74d1584f00494152f06f235f1372fcdfcc
2020-11-20 19:47:56 +00:00
Colin Cross
bcd0b74aae Merge "Revert "Rewrite sbox to use a textproto manifest"" am: b893f8766c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1507524

Change-Id: I8f58c4611f8e159fa4ec03708f631c3bcb22df94
2020-11-20 19:21:22 +00:00
Colin Cross
d45ed5bded Merge "Rewrite sbox to use a textproto manifest" am: 60d06cf8df am: 71e74ba200 am: 8c02083a4f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1498171

Change-Id: I490571f639b7599c2b9d8d2867e871f2a048dc19
2020-11-20 19:11:13 +00:00
Colin Cross
4637589d31 Merge "Add more comments to path_properties.go" am: 4181322f0a am: 3bd058a9de am: 9597f2f4c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1506242

Change-Id: Id18253012b25a3f7578927962a9de987b1f60d30
2020-11-20 19:11:01 +00:00
Colin Cross
b893f8766c Merge "Revert "Rewrite sbox to use a textproto manifest"" 2020-11-20 18:45:35 +00:00
Colin Cross
8c02083a4f Merge "Rewrite sbox to use a textproto manifest" am: 60d06cf8df am: 71e74ba200
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1498171

Change-Id: I3c0d0ccc6a894aa00cf21d892750a9ee285ab90e
2020-11-20 18:45:27 +00:00
Colin Cross
9597f2f4c0 Merge "Add more comments to path_properties.go" am: 4181322f0a am: 3bd058a9de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1506242

Change-Id: I5e581acc60e374fc97dd52be1923f0bd81ea9f15
2020-11-20 18:45:15 +00:00
Colin Cross
619b9ab260 Revert "Rewrite sbox to use a textproto manifest"
This reverts commit 151b9ff0cf.

Reason for revert: broke builds

Change-Id: I69b3b8795d5a36b4fa0debb1af2d433be3c15d6c
2020-11-20 18:44:31 +00:00
Colin Cross
71e74ba200 Merge "Rewrite sbox to use a textproto manifest" am: 60d06cf8df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1498171

Change-Id: I078aad149558df64a6311c957c4429cbfb144fc0
2020-11-20 18:14:11 +00:00
Colin Cross
3bd058a9de Merge "Add more comments to path_properties.go" am: 4181322f0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1506242

Change-Id: Iab1c0c94044be49415f4dad43f79833a4022093a
2020-11-20 18:13:31 +00:00
Colin Cross
60d06cf8df Merge "Rewrite sbox to use a textproto manifest" 2020-11-20 17:43:29 +00:00
Colin Cross
4181322f0a Merge "Add more comments to path_properties.go" 2020-11-20 17:43:00 +00:00
Cindy Zhou
0b7cc08f44 Merge "Add CFI support for assembly heavy libraries" am: 1cfd8af0a8 am: 07b9b74371 am: 18995fbf7f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1500330

Change-Id: I6853fb218f803609825483f4e959acb0a9e9284c
2020-11-20 14:04:51 +00:00
Paul Duffin
1b8d0482ba Merge "java_sdk_library: Stop disabling copy to dist when sdk_version: none" am: 05c2f3e29a am: d94bd1ddff am: b2c13926b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1506239

Change-Id: I652a3960f42f3e7d39714daf4709745515c6afa0
2020-11-20 14:04:45 +00:00
Paul Duffin
ca5c6a4b42 Merge "java_sdk_library: Allow no_dist to be explicitly set in .bp file" am: de6df73b44 am: fb873a3048 am: ee09b2228f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1506238

Change-Id: I46eb5b4124005409d514bc8fb7c7db05ebc0df18
2020-11-20 14:04:30 +00:00
Cindy Zhou
18995fbf7f Merge "Add CFI support for assembly heavy libraries" am: 1cfd8af0a8 am: 07b9b74371
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1500330

Change-Id: I4f1f637cf90c7d355943840fc708a0cbc2827266
2020-11-20 13:30:24 +00:00
Paul Duffin
b2c13926b1 Merge "java_sdk_library: Stop disabling copy to dist when sdk_version: none" am: 05c2f3e29a am: d94bd1ddff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1506239

Change-Id: I26c1ab23c697f160aaa99a3f3b8e864c6b1b0e81
2020-11-20 13:30:20 +00:00
Paul Duffin
ee09b2228f Merge "java_sdk_library: Allow no_dist to be explicitly set in .bp file" am: de6df73b44 am: fb873a3048
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1506238

Change-Id: I6b3e9b9ef944d58777fe4d92f0a7b127019fb07c
2020-11-20 13:30:09 +00:00
Cindy Zhou
07b9b74371 Merge "Add CFI support for assembly heavy libraries" am: 1cfd8af0a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1500330

Change-Id: Icc31acef62998b571a17e73ce28f2d11dfeed0d9
2020-11-20 13:21:13 +00:00
Paul Duffin
d94bd1ddff Merge "java_sdk_library: Stop disabling copy to dist when sdk_version: none" am: 05c2f3e29a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1506239

Change-Id: Ia489108dd4b4a95fb28f74b06799213c57264feb
2020-11-20 13:20:32 +00:00
Cindy Zhou
1cfd8af0a8 Merge "Add CFI support for assembly heavy libraries" 2020-11-20 13:11:33 +00:00
Paul Duffin
fb873a3048 Merge "java_sdk_library: Allow no_dist to be explicitly set in .bp file" am: de6df73b44
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1506238

Change-Id: Ie90ce1be6797e9effea153995862b79d5f93b8f5
2020-11-20 13:04:14 +00:00
Paul Duffin
05c2f3e29a Merge "java_sdk_library: Stop disabling copy to dist when sdk_version: none" 2020-11-20 12:48:11 +00:00
Paul Duffin
de6df73b44 Merge "java_sdk_library: Allow no_dist to be explicitly set in .bp file" 2020-11-20 12:47:43 +00:00
Paul Duffin
822b1b62f0 Merge "java_sdk_library: Remove unused SetNoDist method" am: defa9403a3 am: 21ba518097 am: dad85cd671
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1506237

Change-Id: Id5523a4e39cf886291c31d051bf5013d5e417b65
2020-11-20 11:20:34 +00:00
Paul Duffin
dad85cd671 Merge "java_sdk_library: Remove unused SetNoDist method" am: defa9403a3 am: 21ba518097
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1506237

Change-Id: Id7eabe03e0167ecc91b767f020a7561d6e2f1d69
2020-11-20 11:02:18 +00:00
Paul Duffin
21ba518097 Merge "java_sdk_library: Remove unused SetNoDist method" am: defa9403a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1506237

Change-Id: I8edb718f9d0a6d8f957e50ad92e15f0ec5e47c91
2020-11-20 10:29:34 +00:00
Paul Duffin
defa9403a3 Merge "java_sdk_library: Remove unused SetNoDist method" 2020-11-20 10:02:13 +00:00
Jingwen Chen
9562a8eb55 Merge "soong_ui path.go: improve comments." am: 55e0022fc0 am: e6f2194126 am: efcd3400b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1502731

Change-Id: I04216b710fff6331a75278c175875165bd9efa49
2020-11-20 06:22:13 +00:00
Jingwen Chen
707ba7df8b Merge "soong_ui kati.go: write more comments." am: 19362b16c3 am: 3ce704efaa am: 744a30fac1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1501164

Change-Id: Ifecf4bf9f6044f78929af383e9825bbda6abf3e2
2020-11-20 06:22:04 +00:00
Jingwen Chen
efcd3400b0 Merge "soong_ui path.go: improve comments." am: 55e0022fc0 am: e6f2194126
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1502731

Change-Id: Id741e9d0237d7ab30e83c7feb4d873f55c16d56c
2020-11-20 06:05:36 +00:00
Jingwen Chen
744a30fac1 Merge "soong_ui kati.go: write more comments." am: 19362b16c3 am: 3ce704efaa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1501164

Change-Id: I60eb2ff15af32e54a3989a4682f69e428789e7bf
2020-11-20 06:05:28 +00:00
Jingwen Chen
e6f2194126 Merge "soong_ui path.go: improve comments." am: 55e0022fc0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1502731

Change-Id: Id91fb286b18739f485b8b021c91bd548701c8694
2020-11-20 05:24:13 +00:00