Commit Graph

37453 Commits

Author SHA1 Message Date
Paul Duffin 443d6ab74b Merge "Separate storing config for MakeVars from building boot image" am: f356e5a533 am: eb18e84459
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690882

Change-Id: I13f7019e51915305453cc9c5da4cb6c7cc393a71
2021-05-13 14:36:55 +00:00
Paul Duffin 6f48659cbb Merge "Make hidden API bootclasspath_fragment test more realistic" am: 7dbfe7c4ee am: c088ab8e01
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1706746

Change-Id: I764e40e3c629d93f717069dd2936159d1bf5fc34
2021-05-13 14:36:49 +00:00
Paul Duffin eb18e84459 Merge "Separate storing config for MakeVars from building boot image" am: f356e5a533
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690882

Change-Id: I55f26ed260006f9e1cf65c505775b0aac2120c8e
2021-05-13 14:24:49 +00:00
Paul Duffin c088ab8e01 Merge "Make hidden API bootclasspath_fragment test more realistic" am: 7dbfe7c4ee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1706746

Change-Id: I41122234294c3e7f7dc6d6171dce14216fda0298
2021-05-13 14:23:30 +00:00
Paul Duffin f356e5a533 Merge "Separate storing config for MakeVars from building boot image" 2021-05-13 14:01:36 +00:00
Paul Duffin 7dbfe7c4ee Merge "Make hidden API bootclasspath_fragment test more realistic" 2021-05-13 14:00:00 +00:00
Jingwen Chen 1c7591cfb9 Merge "bp2build: build //external/scudo/..." am: ccfd7fc939 am: 58344f0391
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1704771

Change-Id: I0aac5d0fc71f62c045e34c42673ae9e37410fcb7
2021-05-13 13:01:44 +00:00
Jingwen Chen 58344f0391 Merge "bp2build: build //external/scudo/..." am: ccfd7fc939
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1704771

Change-Id: I7c1fc3cb69469178a4c25a10a57bab776cddf3ab
2021-05-13 12:45:26 +00:00
Jingwen Chen ccfd7fc939 Merge "bp2build: build //external/scudo/..." 2021-05-13 12:19:43 +00:00
Paul Duffin 475daafb1b Make hidden API bootclasspath_fragment test more realistic
Adds the bootclasspath_fragment to an apex and also adds an sdk library
to the stub_libs property.

Bug: 179354495
Test: m nothing
Change-Id: I2a5fffe915eb62923cc60732352d4d050dec4398
2021-05-13 12:40:08 +01:00
Paul Duffin 817187082c Merge "Move copying of dex files from dexpreopt_bootjars singleton" am: cfd24da1f4 am: 7be9378c61
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690881

Change-Id: I75aa39288ab8f7350d7844c7e4dd262c635746d6
2021-05-13 11:35:04 +00:00
Paul Duffin 7be9378c61 Merge "Move copying of dex files from dexpreopt_bootjars singleton" am: cfd24da1f4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690881

Change-Id: I9b492fb1f04f988db99e23fcfd1ec5f09b3ed707
2021-05-13 11:12:00 +00:00
Jingwen Chen a7e79646d3 Merge "bp2build: export some cc toolchain flags into Starlark." am: 1d35a87072 am: 138b60595c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1698426

Change-Id: I388c9e3bb3c97e1cf6e29ad2bc12bb93ec4768c8
2021-05-13 11:03:15 +00:00
Paul Duffin cfd24da1f4 Merge "Move copying of dex files from dexpreopt_bootjars singleton" 2021-05-13 10:53:51 +00:00
Jingwen Chen 138b60595c Merge "bp2build: export some cc toolchain flags into Starlark." am: 1d35a87072
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1698426

Change-Id: Ia478ff955f5344330b1cc44c5bfc5f4fbd487fb3
2021-05-13 10:47:28 +00:00
Jingwen Chen 1d35a87072 Merge "bp2build: export some cc toolchain flags into Starlark." 2021-05-13 10:31:54 +00:00
Paul Duffin d7d657a5c6 Merge "Move markPlatformAvailability mutator before apexMutator" am: c75bf688cb am: 2b7d228aac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705264

Change-Id: I22a5b245fe9c3c3c4867e450503a6fb1ebcce4b2
2021-05-13 10:24:07 +00:00
Paul Duffin 2b7d228aac Merge "Move markPlatformAvailability mutator before apexMutator" am: c75bf688cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705264

Change-Id: I856f90156197c15a7bbf0c7d65273044ce756567
2021-05-13 10:08:44 +00:00
Paul Duffin c75bf688cb Merge "Move markPlatformAvailability mutator before apexMutator" 2021-05-13 09:50:56 +00:00
Paul Duffin 5c45498964 Merge "Allow module types to force creation of a default APEX variant" am: 9896b3424b am: 05ca6f6919
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705263

Change-Id: I09e1ee28fbff2811307e2abb7b406826c1c560e5
2021-05-13 08:49:59 +00:00
Paul Duffin 05ca6f6919 Merge "Allow module types to force creation of a default APEX variant" am: 9896b3424b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705263

Change-Id: Ib78cf134090a9c8a955ac262399c88e0aaee2ee2
2021-05-13 08:27:47 +00:00
Paul Duffin 9896b3424b Merge "Allow module types to force creation of a default APEX variant" 2021-05-13 08:07:19 +00:00
Jingwen Chen 75be1cae8f bp2build: build //external/scudo/...
Test: TH
Fixes: 187158841
Change-Id: I73c1d8fe075d2534c2389973b9381405d9389044
2021-05-13 06:25:49 +00:00
Jingwen Chen bf61afb7f7 bp2build: export some cc toolchain flags into Starlark.
This CL exports common/global/device/host clang/ld/ldd flags
from their Ninja variable initialization locations in
cc/config/global.go and cc/config/clang.go to make Bazel's cc_toolchain
and Soong's cc actions more consistent with each other.

This does not handle env-dependent or arch-specific toolchain flags
yet (logic in compiler.go and linker.go).

Test: TH
Bug: 187086342
Bug: 187084737
Bug: 186628704
Bug: 187857770
Change-Id: Ie403d7cd23f35160897b9dd902c799cbf1bd7f0c
2021-05-13 06:25:47 +00:00
Treehugger Robot 3a13833166 Merge changes I2729001d,Ife5d2193 am: 015a0afe07 am: 3c11654140
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1702492

Change-Id: Iccaa247f7954cf3f401a2f14147443999e421b99
2021-05-12 22:53:17 +00:00
Treehugger Robot 3c11654140 Merge changes I2729001d,Ife5d2193 am: 015a0afe07
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1702492

Change-Id: Ib3b63a2e818b6d1367ae912b442475122b946a6d
2021-05-12 22:26:36 +00:00
Treehugger Robot 015a0afe07 Merge changes I2729001d,Ife5d2193
* changes:
  packaging: install/package deps if not marked IsHideFromMake
  Generate linker config with packaged items.
2021-05-12 22:08:54 +00:00
Ivan Lozano 001c11e93a Merge "Refactor vendor snapshot to use LinkableInterface." am: 7ce2dee09e am: 61c475060a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1680606

Change-Id: I2826cb9898e093f5669700c8d98e314b445ee639
2021-05-12 20:55:58 +00:00
Paul Duffin 47932935e9 Separate storing config for MakeVars from building boot image
Previously, the initialization of the dexpreoptBootJars fields used to
store information needed in its MakeVars method was interleaved with
the calls to buildBootImage(). In fact those fields were initialized
from the *bootImageConfig returned by buildBootImage(). However, the
method simply returned the *bootImageConfig value that was passed in.

Separating the initialization from the calls to buildBootImage() allows
the functionality to be moved to platform_bootclasspath separately.

Bug: 177892522
Test: m nothing
Change-Id: I8ba460f60be553516de5f186e14377bb0ec1b2cd
2021-05-12 21:51:27 +01:00
Paul Duffin 7ebebfd5f8 Move copying of dex files from dexpreopt_bootjars singleton
The art dex files are copied in the bootclasspath_fragment and the
non-updatable and updatable dex files are copied in the
platform_bootclasspath.

Bug: 177892522
Test: m nothing
Change-Id: I5d3d533d1a7a9f8e7ae20c12eb33029a898a2cd6
2021-05-12 21:51:19 +01:00
Ivan Lozano 61c475060a Merge "Refactor vendor snapshot to use LinkableInterface." am: 7ce2dee09e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1680606

Change-Id: I1d53688de1f994c9f2c83b723e433c3f02aea2a9
2021-05-12 20:27:49 +00:00
Ivan Lozano 7ce2dee09e Merge "Refactor vendor snapshot to use LinkableInterface." 2021-05-12 20:06:24 +00:00
Colin Cross 22edc6fa49 Merge "Always call SetMode in soong_zip" am: 52c7ae1a5a am: 083bb69dbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1704607

Change-Id: I68e008b5ed09881b80cafe1b5df15198a4caed04
2021-05-12 18:47:35 +00:00
Lukács T. Berki 0cb4b88e43 Merge "Implement configured version_script." am: a412c74fc9 am: dbc77ca9d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705465

Change-Id: I15d2b94a2e1c6f4aba2d6c263fbb59f26edb86e2
2021-05-12 18:47:26 +00:00
Colin Cross 083bb69dbe Merge "Always call SetMode in soong_zip" am: 52c7ae1a5a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1704607

Change-Id: I6b25f36598c5f1e4d62ac18e286dab6333047418
2021-05-12 18:40:12 +00:00
Colin Cross 52c7ae1a5a Merge "Always call SetMode in soong_zip" 2021-05-12 18:37:09 +00:00
Lukács T. Berki dbc77ca9d5 Merge "Implement configured version_script." am: a412c74fc9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1705465

Change-Id: Ic94741b960e5f003a9aa9bb6096299ba7b04e7f7
2021-05-12 18:30:05 +00:00
Lukács T. Berki a412c74fc9 Merge "Implement configured version_script." 2021-05-12 18:14:56 +00:00
Ivan Lozano d7586b6526 Refactor vendor snapshot to use LinkableInterface.
Refactors the vendor snapshot support to use the LinkableInterface
so that support can be extended to Rust. This CL does not add
vendor snapshot support for Rust; that is left for a follow-on CL.

Bug: 184042776
Test: m nothing
Change-Id: Id0c4970ca00053484a52677d182153cbc454c301
2021-05-12 14:01:10 -04:00
Paul Duffin 28bf7ee2ad Move markPlatformAvailability mutator before apexMutator
This will allow the apexMutator to use the NotAvailableForPlatform()
method initialized by the markPlatformAvailability mutator to help
determine whether to create a platform variant or not.

Bug: 187910671
Test: m droid
Change-Id: I745b4428afc68e7ca4cd2f4cbe810b8df1eebdb7
2021-05-12 16:41:35 +01:00
Paul Duffin b5769c15a3 Allow module types to force creation of a default APEX variant
Bug: 187910671
Test: m droid
Change-Id: I797d4ab60d15b526744fe6e4df1b55c8b75b0310
2021-05-12 16:16:51 +01:00
Paul Duffin 3261dcee7a Merge "Add package module to sdk snapshot that contains licenses" am: c8aeb00a9c am: d59e0728cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1702370

Change-Id: I6795d2303adf405b18090f839f979a888b440648
2021-05-12 15:12:11 +00:00
Paul Duffin 7079601939 Merge "Add license modules to the sdk" am: 62fb7438b1 am: f5dae016bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699191

Change-Id: I722e55534657acdca79b3484ace8d2773e981020
2021-05-12 15:12:05 +00:00
Paul Duffin 18f6703cd7 Merge "Switch Effective_license_text from []string to Paths" am: fffd98fd16 am: 814d3fffaa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1702369

Change-Id: I0f59ce7cfbf375668e688fc9d67c0628e966b3db
2021-05-12 15:11:59 +00:00
Paul Duffin a25390436b Merge "Move license module processing to GenerateAndroidBuildActions" am: 12f5d04859 am: d2dea2f249
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699190

Change-Id: Ic0b0ab1b286d9b6389ade952ff99af58fec46be6
2021-05-12 15:11:44 +00:00
Paul Duffin 88a0a1da57 Merge "Add baseline test for license with sdk" am: 0d62615468 am: 9fbe8bb506
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699189

Change-Id: I3d4e64749c613cd8825388ec772d4d0faf21b73c
2021-05-12 15:11:21 +00:00
Paul Duffin d59e0728cf Merge "Add package module to sdk snapshot that contains licenses" am: c8aeb00a9c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1702370

Change-Id: I07ce0f2f6984c1d7c03caea1a1207c36c0c5cfe2
2021-05-12 14:43:17 +00:00
Paul Duffin f5dae016bb Merge "Add license modules to the sdk" am: 62fb7438b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699191

Change-Id: I57a406c5c5f8c01c205c36c6792e3f4764fd82f7
2021-05-12 14:43:03 +00:00
Paul Duffin 814d3fffaa Merge "Switch Effective_license_text from []string to Paths" am: fffd98fd16
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1702369

Change-Id: I26fc1c416cad8025f236cc49dbd4c001f4a1862a
2021-05-12 14:42:49 +00:00
Paul Duffin d2dea2f249 Merge "Move license module processing to GenerateAndroidBuildActions" am: 12f5d04859
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699190

Change-Id: I5bccbefeb34db8d0b60432c6b978da5127e12011
2021-05-12 14:42:34 +00:00