Commit Graph

28743 Commits

Author SHA1 Message Date
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
Android Build Coastguard Worker
f75e423c97 Make change and version bump to SP1A.210803.001
Change-Id: I5a762cc37ff281f4c7da8e54caf8b08eb946674a
2021-08-03 01:18:36 +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
Android Build Coastguard Worker
989063c355 Make change and version bump to SP1A.210802.001
Change-Id: If2be071c0350d0aba7f1f42522cc33997d14a318
2021-08-01 23:18:23 +00:00
Android Build Coastguard Worker
2cb64eb386 Make change and version bump to SP1A.210801.001
Change-Id: I868bc2c0ffb7b682e7257fc1ead3fe4971f5fd6d
2021-07-31 23:18:38 +00:00
Android Build Coastguard Worker
465c1352a2 Make change and version bump to SP1A.210731.001
Change-Id: Ib75fe473f9768b440b7f0c389adc5e97f48e0ed6
2021-07-31 03:19:01 +00: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
Android Build Coastguard Worker
93b12892ee Make change and version bump to SP1A.210730.001
Change-Id: Ib5d0b62dc6ef7d27404a87b5016a8946cd6ba966
2021-07-30 01:18:44 +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
Android Build Coastguard Worker
fb3490f992 Version bump to SP1A.210729.003 [core/build_id.mk]
Change-Id: I604a9d1251719d0bf5739843e3f06c75f0457e87
2021-07-29 23:05:26 +00:00
Sasha Smundak
a93e3d9985 Implement copy_files function
Bug: 193540681
Test: treehugger
Change-Id: Iffc64551e733747a9a29c14b1f674b3a533f44ba
2021-07-29 11:42:29 -07:00
Android Build Coastguard Worker
8cb3aab588 Version bump to SP1A.210729.002 [core/build_id.mk]
Change-Id: I23b711e8d93ecd0b83f81189f8e01d73f3137fec
2021-07-29 18:27:53 +00: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
Android Build Coastguard Worker
0ddbe235be Make change and version bump to SP1A.210729.001
Change-Id: I4ea79d547e5677200ba195f1c2ca83dd50e0290c
2021-07-29 01:19:11 +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
Android Build Coastguard Worker
f169f52278 Make change and version bump to SP1A.210728.001
Change-Id: Ia3f6837a4bde776e06eca5d8fbe7453150852a25
2021-07-28 01:21:00 +00: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
Android Build Coastguard Worker
43be1b72cf Make change and version bump to SP1A.210727.001
Change-Id: I0cd2e367af2b0c22964f4e6f64be082a9fb24542
2021-07-27 01:19:06 +00: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
Colin Cross
2c066b2aeb Merge "Rename T to Tiramisu" into sc-dev-plus-aosp 2021-07-26 16:30:33 +00:00
Android Build Coastguard Worker
7319a1c22f Make change and version bump to SP1A.210726.001
Change-Id: I31b587391a397909aa23c0c0c28c6ab2d5568c21
2021-07-25 23:18:35 +00:00
Android Build Coastguard Worker
5016210f4b Make change and version bump to SP1A.210725.001
Change-Id: I0bc8770ecffb81a985e42f8008db0a99a20d1e6b
2021-07-24 23:18:34 +00:00
Android Build Coastguard Worker
b3efa4657d Make change and version bump to SP1A.210724.001
Change-Id: Ib7bc985320bf885ba2d5fb157a6caf0752c15481
2021-07-24 03:18:27 +00:00
Colin Cross
a45d0c890e 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
2021-07-23 21:05:16 +00:00