Commit Graph

27520 Commits

Author SHA1 Message Date
Treehugger Robot
a87f34cf2b Merge "definitions.mk: Detect bad zip files." am: a21e1db314 am: ededf6b49e
Original change: https://android-review.googlesource.com/c/platform/build/+/1791227

Change-Id: I29f819a68dc34b6bd08092a9357a5adc53b0e686
2021-08-10 17:12:45 +00:00
Treehugger Robot
a21e1db314 Merge "definitions.mk: Detect bad zip files." 2021-08-10 16:48:51 +00:00
TreeHugger Robot
e135511f4d Merge "Adding vendor_boot-test-harness.img" into sc-dev 2021-08-10 01:54:56 +00:00
LaMont Jones
e1af00ba56 definitions.mk: Detect bad zip files.
If the jar file passed to add-jar-resources-to-package is passed a
non-zipfile, then we should produce an error.

Bug: 153900481
Test: manual
Change-Id: Idc4dd9afd89eaee08a9e792dfa2a759e64b783fc
2021-08-09 19:32:51 +00:00
Spandan Das
170898b9e0 Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds
(This is a cherrypick of aosp/1788549)

This flag will be selectively added to build targets if necessary

Bug: 193569756
Test: m nothing
Merged-In: Ie0fd898b03aa91322dddd9137b038031d46c8d24
Change-Id: Ie0fd898b03aa91322dddd9137b038031d46c8d24
2021-08-09 18:22:54 +00:00
Sanket Chinchalkar
ef0a516cc5 Report Performance Test Metrics as JSON File
Test: Tested Locally
Bug: 193722630
Change-Id: I113198050e4b0c5242785bc4bbee5fa95c19114d
2021-08-09 09:55:04 -07:00
Mark-PK Tsai
1024d6a17f Fix kernel module build of custom image
Correct the build-image-kernel-modules arguments then
the board can use BOARD_{CUSTOM_IMAGE}_KERNEL_MODULES
to install kernel modules.

Bug: 195888474
Change-Id: I65124acc470e7f6f701bf3c9f5481bb2d688d555
Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
2021-08-09 14:05:04 +08:00
Alexander Smundak
0db8f12015 Merge changes I0ecafa41,Ic6173a96 am: 420a93155a am: 9edaddf6ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1786890

Change-Id: Ie26afa42c3db28fed546b2c51a58b3d696e55c14
2021-08-06 02:30:02 +00:00
Spandan Das
289fb6cad0 Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds
This flag will be selectively added to build targets if necessary

Bug: 193569756
Test: m nothing
Change-Id: Ie0fd898b03aa91322dddd9137b038031d46c8d24
2021-08-06 02:25:04 +00:00
Sasha Smundak
596874af42 Soong namespaces should be initialized
Bug: 193540681
Test: rbcrun build/make/tests/run.rbc
Change-Id: I0ecafa41b462998e0bb386680683a798ae5c46e7
2021-08-04 17:25:44 -07:00
Sasha Smundak
8d97bf5327 Integrate Starlark-based configuration runner
If RBC_PRODUCT_CONFIG variable is set, obtain product configuration
variables by converting product configuration makefiles to Starlark
files and then executing them.
Also, introduce RBC_NO_PRODUCT_GRAPH variable to suppress product graph
generation. We cannot generate product graph with Starlark, so this
option allows to verify that the rest of the contents of the generated
Ninja files remains the same when Starlark-based converter is used.
This allows to perform the regression testing, i.e. running
`RBC_NO_PRODUCT_GRAPH=t DISABLE_ARTIFACT_PATH_REQUIREMENTS=t m nothing`
and
`RBC_PRODUCT_CONFIG=t m nothing`
should generate identical *.ninja files.

Bug: 181797530
Test: Manual
Change-Id: Ic6173a9640f32766b71c02a2b1833ce7a278e4cc
2021-08-04 17:15:16 -07:00
Colin Cross
65e3db8e49 Merge "Fix typo for ODM prop files" into sc-dev 2021-08-04 20:05:50 +00:00
Hidefumi Kaneko
9e571609f7 Fix typo for ODM prop files
_prop_files is missing a trailing _

Bug: 195034733
Test: manual - check that expected prop files are in the image
Change-Id: Ie042acc74fa56d5515cacd5f41ddc0f82d74f20c
Merged-In: Ie042acc74fa56d5515cacd5f41ddc0f82d74f20c
2021-08-04 20:04:46 +00:00
Xin Li
ec37feb519 Merge "Rename T to Tiramisu" 2021-08-04 08:27:34 +00:00
Bowgo Tsai
3e35c26bf2 Adding vendor_boot-test-harness.img
boot-test-harness.img is used to allow adb root on user build
images. It also sets properties: ro.audio.silent=1 & ro.test_harness=1.

GKI 2.0 devices will use BOARD_PREBUILT_BOOTIMAGE so
boot-test-harness.img will not be generated.

Therefore, we have to introduce the vendor_boot-test-harness.img
as an alternative for boot-test-harness.img.

In the future, we'll simplify the flow as:
  + If a device has a /vendor_boot partition, builds
    vendor_boot-(test-harness|debug).img.
  + Otherwise, builds boot-(test-harness|debug).img.

boot-(test-harness|debug).img needs to be kept for some clients
to gracefully transit to using vendor_boot-(test-harness|debug).img.

Bug: 194654549
Test: make then `unpack_bootimg --boot_img $OUT/vendor_boot-test-harness.img`
Test: Check the ramdisk content in ./out/vendor_ramdisk

Change-Id: If3a1393b4ff3e69bb9b62f3b843b7858437d47bf
Merged-In: If3a1393b4ff3e69bb9b62f3b843b7858437d47bf
(cherry picked from commit 87f60017b9)
2021-08-04 10:12:29 +08:00
Xin Li
718d59849e DO NOT MERGE - Merge RQ3A.210805.001.A1.
Bug: 192585466
Merged-In: Ieba9625ca0ccedf285209954f1e766b20455c32f
Change-Id: I23e660c8ee9ab25fe966abaf88891cc3540a860e
2021-08-03 16:27:24 -07:00
Roland Levillain
da8d71ea5c Merge "Work around art-host-tests build issues when using ART prebuilts." into sc-dev 2021-08-03 16:01:21 +00:00
Mathew Inwood
ab6e72bd00 Merge "Fix typo." am: 0361b625f2 am: c84ab4d0e8
Original change: https://android-review.googlesource.com/c/platform/build/+/1784570

Change-Id: I6d6792534e7e514d68816b524187cbb005c0a7a0
2021-08-03 10:09:57 +00:00
Mathew Inwood
0361b625f2 Merge "Fix typo." 2021-08-03 09:27:41 +00:00
Bowgo Tsai
5c2a544516 Merge "Adding vendor_boot-test-harness.img" am: 23ae3dcbe1 am: 82a45ea4a0
Original change: https://android-review.googlesource.com/c/platform/build/+/1782047

Change-Id: I377125c9184bf2947c4f592f9395efb66864a85e
2021-08-03 06:34:25 +00:00
Bowgo Tsai
23ae3dcbe1 Merge "Adding vendor_boot-test-harness.img" 2021-08-03 06:07:13 +00:00
Mathew Inwood
87c4655f07 Fix typo.
Test: m

Change-Id: I6a85ea59bb6d6babd6979de22a944e8751ea287f
2021-08-02 15:00:10 +01:00
Mathew Inwood
99dffee4c6 Don't use prebuilt modules for sanitizer builds.
Prebuilt modules do not provide sanitizer binaries to using them in this
context is unsafe.

Bug: 194067130
Test: TH
Merged-In: I3682ae9ad963a8cd13bb395fe84dae515dc6d30f
Change-Id: I3682ae9ad963a8cd13bb395fe84dae515dc6d30f
2021-08-02 13:27:39 +01:00
Mathew Inwood
945184174c Don't use mainline prebuilts for coverage builds.
Test: TH
Bug: 192556458
Bug: 159241638
Merged-In: Id29e273c1df1fa27a038ebdcff1a17acca58bd46
Change-Id: Id29e273c1df1fa27a038ebdcff1a17acca58bd46
2021-08-02 13:25:03 +01:00
Anton Hansson
da480aa697 Merge "Fix typo for ODM prop files" am: 9673304335 am: 3c4b9e02ca
Original change: https://android-review.googlesource.com/c/platform/build/+/1782927

Change-Id: I43c1b80b39ca81565ed80c4b4286948a61bcb950
2021-07-30 15:02:59 +00:00
Hidefumi Kaneko
b09a36c8eb Fix typo for ODM prop files
_prop_files is missing a trailing _

Bug: 195034733
Test: manual - check that expected prop files are in the image
Change-Id: Ie042acc74fa56d5515cacd5f41ddc0f82d74f20c
2021-07-30 12:07:40 +02:00
Alexander Smundak
214387c421 Merge "Implement copy_files function" am: 5f75aafb00 am: a146198aa5
Original change: https://android-review.googlesource.com/c/platform/build/+/1781017

Change-Id: I858d1039f0933d52de591b9099c454191eb56010
2021-07-30 02:35:27 +00:00
Alexander Smundak
ba28f07d46 Merge changes I129136e8,I278bd8ed,I1d22ed6f am: 510c0014d5 am: bd4362926e
Original change: https://android-review.googlesource.com/c/platform/build/+/1781014

Change-Id: I96d9919f4b65a548b57d2bc8eee38d2fd02baa73
2021-07-30 02:35:20 +00:00
Bowgo Tsai
87f60017b9 Adding vendor_boot-test-harness.img
boot-test-harness.img is used to allow adb root on user build
images. It also sets properties: ro.audio.silent=1 & ro.test_harness=1.

GKI 2.0 devices will use BOARD_PREBUILT_BOOTIMAGE so
boot-test-harness.img will not be generated.

Therefore, we have to introduce the vendor_boot-test-harness.img
as an alternative for boot-test-harness.img.

In the future, we'll simplify the flow as:
  + If a device has a /vendor_boot partition, builds
    vendor_boot-(test-harness|debug).img.
  + Otherwise, builds boot-(test-harness|debug).img.

boot-(test-harness|debug).img needs to be kept for some clients
to gracefully transit to using vendor_boot-(test-harness|debug).img.

Bug: 194654549
Test: make then `unpack_bootimg --boot_img $OUT/vendor_boot-test-harness.img`
Test: Check the ramdisk content in ./out/vendor_ramdisk

Change-Id: If3a1393b4ff3e69bb9b62f3b843b7858437d47bf
2021-07-30 00:54:47 +00:00
Sasha Smundak
a93e3d9985 Implement copy_files function
Bug: 193540681
Test: treehugger
Change-Id: Iffc64551e733747a9a29c14b1f674b3a533f44ba
2021-07-29 11:42:29 -07:00
Sasha Smundak
c106138baf Implement add_soong_namespace and add_soong_config_var_value functions
Bug: 193540681
Test: rbcrun build/make/tests/run.rbc
Change-Id: I129136e83d2d00ef5b64d3aab07b98719198dcfe
2021-07-29 11:24:35 -07:00
Sasha Smundak
0e4a5ad24b Trim spaces in the rule actions
When rule action contains something like
  cp $(FOO) ...
and FOO is set with
FOO := a \
 b \

the generated Ninja file constains extra spaces, making it
difficult to compare it to the same file generated by the
Starlark-based product configuration.

Bug: 181797530
Test: manual
Change-Id: I278bd8edf0f017a31c5b5115b2a38f4f663c55fc
2021-07-29 10:57:06 -07:00
Sasha Smundak
31b6b9442a Add copy-files macro
To allow refactoring a lot of product configuration makefiles.

Bug: 190051051
Test: treehugger
Change-Id: I1d22ed6f3df17fb616bd272c0d928aa1fdb9729a
2021-07-29 10:57:06 -07:00
satayev
ed13797a44 Merge "Rename UpdatableSystemServerJars to ApexSystemServerJars." am: 72602c4687 am: 60305dceb3
Original change: https://android-review.googlesource.com/c/platform/build/+/1780030

Change-Id: I59996e715382eaef027fbdfa00793d49e5a8adc4
2021-07-29 11:56:03 +00:00
satayev
72602c4687 Merge "Rename UpdatableSystemServerJars to ApexSystemServerJars." 2021-07-29 11:23:43 +00:00
Martin Stjernholm
31b606b9fc Force MODULE_BUILD_FROM_SOURCE if com.google.android.xxx modules aren't am: 523de300dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15347314

Change-Id: I3e8c1a1101672ec17325846372163d05a99e6b85
2021-07-28 14:04:14 +00:00
Roland Levillain
632157c554 Merge "Add extra owners for file core/tasks/art-host-tests.mk." am: 7b763f0d46 am: bfc914edff
Original change: https://android-review.googlesource.com/c/platform/build/+/1780027

Change-Id: Ia1ab9f51cedd523e5536c25a87d9f5ef1549e873
2021-07-28 13:21:07 +00:00
satayev
ed0817932b Rename UpdatableSystemServerJars to ApexSystemServerJars.
This is consistent with naming for boot jars, e.g. ApexBootJars.

Bug: 191127295
Test: presubmit
Change-Id: I1d4378e0d2dc73af2ffd8c4cc66ab8c0e2981d2f
2021-07-28 14:03:57 +01:00
Roland Levillain
7b763f0d46 Merge "Add extra owners for file core/tasks/art-host-tests.mk." 2021-07-28 12:51:01 +00:00
satayev
96fa127572 Merge "Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS." 2021-07-28 10:36:39 +00:00
Martin Stjernholm
523de300dd Force MODULE_BUILD_FROM_SOURCE if com.google.android.xxx modules aren't
installed.

Test: env TARGET_PRODUCT=redfin build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_ANDROID_module_build_from_source
  returns ""
Test: env TARGET_PRODUCT=aosp_redfin build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_ANDROID_module_build_from_source
  returns "true"
Test: env TARGET_PRODUCT=coral_hwasan build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_ANDROID_module_build_from_source
  returns "true"
Bug: 193759980
Bug: 192556458
Bug: 194067130
Change-Id: I8023564e6e22969a9b18467ec8b1ef046333e181
2021-07-28 10:05:29 +00:00
Roland Levillain
a83337de67 Merge "Work around art-host-tests build issues when using ART prebuilts." am: add7902aab am: 06704bd09f
Original change: https://android-review.googlesource.com/c/platform/build/+/1779476

Change-Id: If02fc30b815695bc473055db98c1a5c1bbd95930
2021-07-28 09:58:43 +00:00
Roland Levillain
49ec17eac8 Work around art-host-tests build issues when using ART prebuilts.
Using prebuilts of the ART Module seems to make
`COMPATIBILITY.art-host-tests.HOST_SHARED_LIBRARY.FILES` empty on
x86 targets, thus breaking the `art-host-tests` build target. As
a workaround, relax the corresponding build rule to allow for an
empty `COMPATIBILITY.art-host-tests.HOST_SHARED_LIBRARY.FILES`
list.

(cherry picked from commit 4d9d0aa86c)

Test: lunch cf_x86_phone-userdebug
        && SOONG_CONFIG_art_module_source_build=false m art-host-tests
Bug: 194627489
Change-Id: I9e885be3c7161f6f09a93b3d32339a5a6e57d2a1
Merged-In: I9e885be3c7161f6f09a93b3d32339a5a6e57d2a1
2021-07-28 10:48:47 +01:00
Roland Levillain
6db8228316 Add extra owners for file core/tasks/art-host-tests.mk.
Test: build/make/tools/checkowners.py -c build/make/core/tasks/OWNERS
Bug: 169111770
Change-Id: I6dbbabd35386d806a786e1d895070bb2c19fa2c6
2021-07-28 10:21:56 +01:00
satayev
a85d5225ee Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS.
Regardless of an "updatable" property, list all apex jars in the same
variable. This is less confusing for devs and matches the pattern with
PRODUCT_APEX_BOOT_JARS.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I3b12f26237636f4271cb000480928b3ce1c2e62f
Merged-In: I3b12f26237636f4271cb000480928b3ce1c2e62f
2021-07-27 16:09:52 +00:00
satayev
fa21749ffd Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS.
Regardless of an "updatable" property, list all apex jars in the same
variable. This is less confusing for devs and matches the pattern with
PRODUCT_APEX_BOOT_JARS.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I3b12f26237636f4271cb000480928b3ce1c2e62f
Merged-In: I3b12f26237636f4271cb000480928b3ce1c2e62f
2021-07-27 16:55:10 +01:00
Roland Levillain
4d9d0aa86c Work around art-host-tests build issues when using ART prebuilts.
Using prebuilts of the ART Module seems to make
`COMPATIBILITY.art-host-tests.HOST_SHARED_LIBRARY.FILES` empty on
x86 targets, thus breaking the `art-host-tests` build target. As
a workaround, relax the corresponding build rule to allow for an
empty `COMPATIBILITY.art-host-tests.HOST_SHARED_LIBRARY.FILES`
list.

Test: lunch cf_x86_phone-userdebug
        && SOONG_CONFIG_art_module_source_build=false m art-host-tests
Bug: 194627489
Change-Id: I9e885be3c7161f6f09a93b3d32339a5a6e57d2a1
2021-07-27 15:00:48 +01:00
satayev
ebd074993f Merge "Rename UpdatableBootJars to ApexBootJars." am: 2bcf499b56 am: 425479d7fe
Original change: https://android-review.googlesource.com/c/platform/build/+/1772896

Change-Id: I6a41e786042f9e1fe21f529142d424991391ea3a
2021-07-26 18:29:56 +00:00
satayev
2bcf499b56 Merge "Rename UpdatableBootJars to ApexBootJars." 2021-07-26 17:59:36 +00:00
Colin Cross
443105f6d1 Rename T to Tiramisu
PLATFORM_VERSION_CODENAME is being updated from T to Tiramisu.

Bug: 186121492
Bug: 194055070
Test: m checkbuild
Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
Change-Id: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
(cherry picked from commit a45d0c890e)
2021-07-26 09:42:50 -07:00