Paul Duffin
af5736ea92
Merge "Add contents property to boot_image (and prebuilt_boot_image)" am: 8d3c44a986
am: b8f0b4e1bf
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652622
Change-Id: Ic8c97eb640ca5d6dc0de0a8ac08391ed73bc0a0a
2021-03-30 17:44:23 +00:00
Treehugger Robot
868ae0a172
Merge "queryview: fix depfile and incrementality." am: afd4c68106
am: 0c275b92cc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657880
Change-Id: Ia7cd4f68f4af5f603579ecc6240d9858a756c5e7
2021-03-30 17:41:55 +00:00
Paul Duffin
b8f0b4e1bf
Merge "Add contents property to boot_image (and prebuilt_boot_image)" am: 8d3c44a986
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652622
Change-Id: I09ba51e5feaa251a7c541dd7c89c734037b0bc75
2021-03-30 17:29:37 +00:00
Treehugger Robot
0c275b92cc
Merge "queryview: fix depfile and incrementality." am: afd4c68106
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657880
Change-Id: I5854748391efa09c3df113f687230e76eb5ac17e
2021-03-30 17:07:09 +00:00
Paul Duffin
8d3c44a986
Merge "Add contents property to boot_image (and prebuilt_boot_image)"
2021-03-30 16:26:20 +00:00
Treehugger Robot
afd4c68106
Merge "queryview: fix depfile and incrementality."
2021-03-30 16:19:56 +00:00
Jingwen Chen
b1fb88681b
bp2build: arch-configurable selects for label list attrs. am: 0702791a99
am: ca0664d2fe
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1635579
Change-Id: Id6d61cc11f9904587b452676468ca66661308ed0
2021-03-30 15:37:25 +00:00
Jingwen Chen
ca0664d2fe
bp2build: arch-configurable selects for label list attrs. am: 0702791a99
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1635579
Change-Id: I2e270a69998e52489d25ea221faf79ad02e3f522
2021-03-30 14:58:57 +00:00
Treehugger Robot
2cbdcb0821
Merge "bp2build code generator: pretty print zero values" am: 053520a86a
am: 018450e83f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657879
Change-Id: I8bfbec16fe2b7b60b8f0f31addbdd7129e2a4037
2021-03-30 13:57:37 +00:00
Jingwen Chen
0702791a99
bp2build: arch-configurable selects for label list attrs.
...
This CL adds the configurable LabelListAttribute support to bp2build.
Test: go test
Change-Id: I2ef9e385d9cf1b1845988128eca1d8cda1ecb5e8
2021-03-30 13:22:48 +00:00
Treehugger Robot
018450e83f
Merge "bp2build code generator: pretty print zero values" am: 053520a86a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657879
Change-Id: I00c4a314946a837c9efb57019018d0217118b7f0
2021-03-30 13:18:01 +00:00
Treehugger Robot
053520a86a
Merge "bp2build code generator: pretty print zero values"
2021-03-30 12:54:21 +00:00
Jingwen Chen
e8a8296bc6
queryview: fix depfile and incrementality.
...
A previous change caused the depfile construction to be incorrect.
Test: run m queryview twice, second run is a no-op.
Fixes: 184026544
Change-Id: Ibaaa97d6a09956e1ca9c48643b0ffad75e44f051
2021-03-30 12:22:12 +00:00
Ulyana Trafimovich
419e982114
Merge "Don't fail the build if manifest_check cannot extract targetSdkVersion." am: 23e574fcc4
am: cd6c6ecf3c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655687
Change-Id: I9d0deed0d86b09013a6469013ed1c782df3bc639
2021-03-30 11:59:02 +00:00
Martin Stjernholm
c5c5d80d30
Merge changes Iaa6411b5,I2118b8a2,Ibbdd3cbd,I2d1bbda2 am: 38e9f0b82f
am: 99f29d244a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652620
Change-Id: If2c647fbbdc4111064e72632f8bbd4acb5b1b6b8
2021-03-30 11:57:15 +00:00
Ulyana Trafimovich
cd6c6ecf3c
Merge "Don't fail the build if manifest_check cannot extract targetSdkVersion." am: 23e574fcc4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655687
Change-Id: I0aecbd0d96baf3aca3dde43f547aa65e055a1f20
2021-03-30 11:22:00 +00:00
Martin Stjernholm
99f29d244a
Merge changes Iaa6411b5,I2118b8a2,Ibbdd3cbd,I2d1bbda2 am: 38e9f0b82f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652620
Change-Id: I23e6b15e48c54a537338240785d22f008808645c
2021-03-30 11:21:07 +00:00
Ulyana Trafimovich
23e574fcc4
Merge "Don't fail the build if manifest_check cannot extract targetSdkVersion."
2021-03-30 10:34:20 +00:00
Jingwen Chen
fc490bde7e
bp2build code generator: pretty print zero values
...
e.g for zero slices, return the empty list, instead of an empty string.
Test: TH
Change-Id: I7c89d7b0f6ac28d1aa1a76d604173bc99c841a02
2021-03-30 10:30:51 +00:00
Martin Stjernholm
38e9f0b82f
Merge changes Iaa6411b5,I2118b8a2,Ibbdd3cbd,I2d1bbda2
...
* changes:
Make test_for arch variant.
Don't use APEX stubs between internal libs in the same APEX when building test_for modules.
Add FilterListPred.
Don't panic on "go test" invocations from the command line.
2021-03-30 09:26:36 +00:00
Anton Hansson
1a92127789
Merge "Add pom2bp param for default min_sdk_version" am: fa1d64c690
am: f2c7306e15
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655692
Change-Id: Ibe9291bb21a00429048ee51a1aeeab493d4d9ace
2021-03-30 09:01:07 +00:00
Thiébaud Weksteen
178445462d
Merge "bloaty: Append new file extension" am: 2c85c1d605
am: f755fe7017
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655689
Change-Id: I03e4fef9a4ed02a3901d79a6fa9f2e09bef1da85
2021-03-30 09:00:22 +00:00
Anton Hansson
f2c7306e15
Merge "Add pom2bp param for default min_sdk_version" am: fa1d64c690
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655692
Change-Id: I087d890c64885726ca1b79be50b6dc14b0a78656
2021-03-30 08:48:24 +00:00
Anton Hansson
fa1d64c690
Merge "Add pom2bp param for default min_sdk_version"
2021-03-30 08:36:26 +00:00
Thiébaud Weksteen
f755fe7017
Merge "bloaty: Append new file extension" am: 2c85c1d605
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655689
Change-Id: Id6e35a6584f4b4c8222cceb273ce2cf3292f08c8
2021-03-30 08:22:18 +00:00
Thiébaud Weksteen
2c85c1d605
Merge "bloaty: Append new file extension"
2021-03-30 07:19:43 +00:00
Treehugger Robot
8b81b2b528
Merge "Append ".static" to ubsan runtime for static binaries" am: e2f39b038d
am: c1f3f6acbc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655969
Change-Id: Ib5dc63f70e94dff91ea9f3deae6e4e962a55cc8c
2021-03-30 04:18:17 +00:00
Treehugger Robot
c1f3f6acbc
Merge "Append ".static" to ubsan runtime for static binaries" am: e2f39b038d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655969
Change-Id: I0751f20ee8b2064c1e20fc2adf20fca4165fe443
2021-03-30 03:30:13 +00:00
Treehugger Robot
e2f39b038d
Merge "Append ".static" to ubsan runtime for static binaries"
2021-03-30 03:07:27 +00:00
Colin Cross
32f1de3327
Append ".static" to ubsan runtime for static binaries
...
Bug: 183611452
Test: m BUILD_HOST_static=1 tinyplay2
Change-Id: I8d8ef762781f0583c8b9337ce5876c7d3140f665
2021-03-29 16:47:56 -07:00
Paul Duffin
78dd45f054
Merge "Add dependencies for art boot_image" am: 16e6aeeb51
am: d019752f73
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652451
Change-Id: Icf9a9823a7afb88ed96a0cd8aff0b43d983770ab
2021-03-29 21:39:57 +00:00
Paul Duffin
d019752f73
Merge "Add dependencies for art boot_image" am: 16e6aeeb51
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652451
Change-Id: I01496b7598af0d61f25c53a3e0f986e559c0c5d5
2021-03-29 21:03:15 +00:00
Paul Duffin
16e6aeeb51
Merge "Add dependencies for art boot_image"
2021-03-29 20:27:12 +00:00
Ulyana Trafimovich
42983b7316
Merge "Don't enforce <uses-library> checks if dexpreopt for apps is disabled." am: f682410cbf
am: 1012c230b2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655690
Change-Id: Iabd8654c105f9db1ed18616127e90679f77938e4
2021-03-29 17:40:23 +00:00
Ulyana Trafimovich
1012c230b2
Merge "Don't enforce <uses-library> checks if dexpreopt for apps is disabled." am: f682410cbf
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655690
Change-Id: I436a5de532d12e7abcebfd898482524a5c896435
2021-03-29 16:57:07 +00:00
Ulyana Trafimovich
f682410cbf
Merge "Don't enforce <uses-library> checks if dexpreopt for apps is disabled."
2021-03-29 16:21:24 +00:00
Paul Duffin
82886d6cbf
Add contents property to boot_image (and prebuilt_boot_image)
...
Allows boot_image modules to be created for any module that contributes
to the boot class path, e.g. core-i18n from the com.android.i18n.
A boot_image module with a contents property cannot specify an
image_name, and vice versa. Only those boot_image modules with an
image_name create .art, .oat and .vdex files, either in their
associated APEX or as part of the framework "boot" image.
Bug: 177892522
Test: m nothing
Change-Id: Idfc2bcf00dd6d3ed36ac4df46fcf18e8aa7e2c92
2021-03-29 17:15:27 +01:00
Paul Duffin
c7ef9892dd
Add dependencies for art boot_image
...
Adds dependencies for the art boot image. The art boot image only
includes modules from the com.android.art APEX and so this change adds
some verification to make sure that the APEX component of the
configuration is compatible with the boot_image's apex_availabilty
settings and then just adds dependencies on the modules. It relies on
the normal APEX processing to cause the com.android.art variant of the
boot_image to depend on the equivalent variant of its contents.
This purposely does not check that the configuration specifies an APEX
of com.android.art and instead relies on the apex_available property
being set.
Bug: 177892522
Test: m nothing
Change-Id: I75a8238546b01e1f166a1d1444215f4afb441780
2021-03-29 17:13:29 +01:00
Anton Hansson
c29f076768
Add pom2bp param for default min_sdk_version
...
Previously 24 was hardcoded (for somewhat unclear reasons). Update
the tool to accept specifying the correct value on the cmdline.
Test: pom2bp -default-min-sdk-version 24
Change-Id: I39c23dd4bca91684a2a68d7b963cf3cb66eb1f33
2021-03-29 16:45:52 +01:00
Ulya Trafimovich
9f12df9abb
Don't fail the build if manifest_check cannot extract targetSdkVersion.
...
Instead, return "any" SDK version 10000, which will cause dexpreopt to
not add any compatibility libraries to class loader context. This is as
good guess as any, and the build system already uses "any" version if
there is not manifest or APK from which to extract targetSdkVersion.
This fixes broken build on cf_x86_auto-userdebug.
Bug: 132357300
Bug: 183943146
Test: lunch cf_x86_auto-userdebug \
&& m out/target/product/vsoc_x86/obj/APPS/playback_intermediates/dexpreopt.zip
Change-Id: I5ee75639ece716c3a9800ddea346fe7c73da7c3a
2021-03-29 15:43:38 +00:00
Paul Duffin
3e56890e1d
Merge "Add bootclasspath_fragment as an alias for boot_image" am: 755b10fe53
am: 0c541b7c1d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655217
Change-Id: Id99ca66bcec57e6fb4937479c789592609e45290
2021-03-29 14:56:24 +00:00
Paul Duffin
0c541b7c1d
Merge "Add bootclasspath_fragment as an alias for boot_image" am: 755b10fe53
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655217
Change-Id: Ice08a1fd0aeec6bc92770bc3377e139c527bce96
2021-03-29 14:14:58 +00:00
Ulya Trafimovich
39dd0a4b87
Don't enforce <uses-library> checks if dexpreopt for apps is disabled.
...
Otherwise the check fails, as it depend on non-existent dexpreopt.config
files. This CL fixes broken build cf_x86_phone-userdebug_coverage.
Bug: 183931403
Bug: 132357300
Test: forrest build for cf_x86_phone-userdebug_coverage.
Change-Id: Id3ffeb742c1b82c677795fa701a7b5a867eabbbd
2021-03-29 14:57:34 +01:00
Paul Duffin
755b10fe53
Merge "Add bootclasspath_fragment as an alias for boot_image"
2021-03-29 13:37:18 +00:00
Thiébaud Weksteen
55d6b3edbd
bloaty: Append new file extension
...
When measuring the sections of a binary, the file extension of the
output was replaced. Append the new extension instead, to preserve the
full name of the file measured.
Test: m out/soong/binary_sizes.pb
Change-Id: I4c7b5cf1be3bdce858a7cc72f278ddada0425898
2021-03-29 15:34:53 +02:00
Paul Duffin
682589237f
Merge "Convert java/boot_image_test.go to test fixtures" am: 60fbea0ec6
am: 9b66f48c17
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652450
Change-Id: I8d726e6dc502f7821834ac03facd7bcd7b70c381
2021-03-29 13:32:14 +00:00
Paul Duffin
04a10f160c
Merge "Change type of Image_name from string to *string" am: 63782aba78
am: fb2be116cc
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652449
Change-Id: Icc357e1d093767bcf87481cb3f0875f3467a0853
2021-03-29 13:32:09 +00:00
Paul Duffin
a4749563a0
Merge "Make apex/boot_image_test.go more realistic" am: 1b3d4923c1
am: 86ce9334bf
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652448
Change-Id: I6f11e8d747c587cb95cbd4b90a10ab011c03e20d
2021-03-29 13:32:02 +00:00
Paul Duffin
9b66f48c17
Merge "Convert java/boot_image_test.go to test fixtures" am: 60fbea0ec6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652450
Change-Id: I08edc1e00ab3f34ac503a80a98ec684d4597ddb5
2021-03-29 12:58:37 +00:00
Paul Duffin
fb2be116cc
Merge "Change type of Image_name from string to *string" am: 63782aba78
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652449
Change-Id: Ieb08efa10838f9dcbc4018da13bd4e41dcb615ad
2021-03-29 12:57:58 +00:00