Commit Graph

27340 Commits

Author SHA1 Message Date
Paul Scovanner
48181f100e Update SPL to 2021-12-01 am: ec6022f2e5 am: 38b8a44db6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632

Change-Id: I468bc3e4cc0f329aff8768e375ae42ee1653c841
2021-10-12 20:39:24 +00:00
Paul Scovanner
38b8a44db6 Update SPL to 2021-12-01 am: ec6022f2e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16009632

Change-Id: Ic290b491b87019fa00d4b6172e438672da23dffd
2021-10-12 20:27:26 +00:00
Paul Scovanner
16eff988ab [DO NOT MERGE]
Update SPL to 2021-12-05

Bug: 202436544
Change-Id: Ib03873315839e4858f93d1ebbbc17054d46246c9
Merged-In: Ic0dabce4beb09bdd966152c059730677ca5bf5aa
2021-10-11 22:57:45 +00:00
Paul Scovanner
ec6022f2e5 Update SPL to 2021-12-01
Bug: 202436544
Change-Id: I5f0dea3c6fc94a966c3676cd6ea3cd2684487aff
Merged-In: Ib03873315839e4858f93d1ebbbc17054d46246c9
2021-10-07 21:48:49 +00:00
Colin Cross
2b595c26d1 Merge "Update build_id.mk and version_defaults.mk for SC QPR1" into sc-qpr1-dev 2021-09-29 16:59:52 +00:00
Colin Cross
177cbf600d Update build_id.mk and version_defaults.mk for SC QPR1
Set BUILD_ID to "SC_QPR1", and update DEFAULT_PLATFORM_VERSION to
"SQ1A".

Bug: 201081191
Test: m checkbuild
Change-Id: I1ed59bef262be000bb8c77ed83bb549164a1c39b
Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
Merged-In: Ie8bed4cefed83db5324ad98b6e70cb69b3f82780
2021-09-24 10:34:43 -07:00
Paul Scovanner
aae5a4b668 Update Security String to 2021-11-01 am: bdb63576ff am: 51b1e117c7 am: 5593bbe1f7 am: e297219ec0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733

Change-Id: I028ed970b5886d6a3f6b52359c73f15154b720bf
2021-09-16 23:53:56 +00:00
Paul Scovanner
e297219ec0 Update Security String to 2021-11-01 am: bdb63576ff am: 51b1e117c7 am: 5593bbe1f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733

Change-Id: Ibcb8fb2c1a8b42612f922a3f9e60919f1f8f810e
2021-09-16 23:40:36 +00:00
Paul Scovanner
5593bbe1f7 Update Security String to 2021-11-01 am: bdb63576ff am: 51b1e117c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733

Change-Id: I03c662f3d629a85488189aaf39acd0708ba90f5c
2021-09-16 23:22:02 +00:00
Paul Scovanner
51b1e117c7 Update Security String to 2021-11-01 am: bdb63576ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733

Change-Id: Ie3653c7ae59538693a31536196c881903475fabb
2021-09-16 23:04:31 +00:00
Paul Scovanner
bdb63576ff Update Security String to 2021-11-01
Bug: 199784479
Change-Id: Iaf0b0863f6a4e667a5a8f291e1252d8d2dff1ec6
Merged-In: I7e03900c5d853b32f8fbd75cb591063ba4a27450
2021-09-16 19:03:08 +00:00
Paul Scovanner
0449bb97fa [DO NOT MERGE]
Update Security String to 2021-11-05

Bug: 199784479
Change-Id: I7e03900c5d853b32f8fbd75cb591063ba4a27450
Merged-In: I7e03900c5d853b32f8fbd75cb591063ba4a27450
2021-09-16 11:39:07 +00:00
Colin Cross
ef1bcc1f9a Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC""
This reverts commit bf70d0ba2a.

Reason for revert: camera prebuilt fixed to support short BUILD_ID

Bug: 196178071
Change-Id: Idcb57daf31907f1dff615e180790a2f52462b430
Merged-In: I3b7166d28df6d8828f895f839186de78592d259e
2021-09-13 23:44:53 +00:00
Paul Scovanner
1f04c4d3e7 Revert "Update Security String to 2021-10-06"
This reverts commit 61275cd338.

Reason for revert: SPL bump no longer necessary due to ATT FRC respin

Bug: 193547118
Change-Id: I1df0e12d50471b518653ff865637193bd7ed9101
2021-08-26 01:04:17 +00:00
Paul Scovanner
61275cd338 Update Security String to 2021-10-06
Bug: 193547118
Change-Id: I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e
2021-08-25 20:24:40 +00:00
Paul Scovanner
12af7082f3 Update Security String to 2021-10-01 am: f54f3e8118 am: 102502b088 am: 5d40b4be24
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15546870

Change-Id: I027ad5e4e12ff265d0f4602fedc9aed24ea6ab09
2021-08-14 06:41:03 +00:00
Paul Scovanner
5d40b4be24 Update Security String to 2021-10-01 am: f54f3e8118 am: 102502b088
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15546870

Change-Id: I3b19b07a0ba91e68c0f9a6be4cbc72f410f52b08
2021-08-14 06:22:27 +00:00
Paul Scovanner
102502b088 Update Security String to 2021-10-01 am: f54f3e8118
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15546870

Change-Id: I0425ffbb7a52390fe859920edcfe8097e688c72c
2021-08-14 06:03:39 +00:00
Paul Scovanner
3644c700aa Update Security String to 2021-10-01 am: 6ccb50dd3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15564069

Change-Id: Ic204e600b0b34ad39a50383f17fb74da668c0c9c
2021-08-14 00:29:06 +00:00
Paul Scovanner
f54f3e8118 Update Security String to 2021-10-01
Bug: 193547118
Change-Id: I84157c79f00951e9600a2924e6c6fbc497a5e1ef
Merged-In: I36d8511d8ab1556af5c278c8d65d7c3ee6f1878d
2021-08-13 23:19:52 +00:00
Paul Scovanner
6ccb50dd3a Update Security String to 2021-10-01
Bug: 193547118
Change-Id: I36d8511d8ab1556af5c278c8d65d7c3ee6f1878d
Merged-In: I4a0cd58b18214b77302ae7ed81c189f4549dc41d
2021-08-13 23:19:04 +00:00
Paul Scovanner
91cbb67645 Update Security String to 2021-10-05
Bug: 193547118
Change-Id: I4a0cd58b18214b77302ae7ed81c189f4549dc41d
2021-08-13 19:50:02 +00:00
Anton Hansson
f045b10d7d Merge "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" into sc-dev 2021-08-12 14:20:58 +00:00
Anton Hansson
bf70d0ba2a Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"
This reverts commit 52f0172772.

Reason for revert: broke bramble boot test

Bug: 196357202
Change-Id: Ib6f05cd323109076cbc6693d16a74cd1d86a6849
2021-08-12 14:19:54 +00:00
Sanket Chinchalkar
d1bfb2e9ed Merge "Report Performance Test Metrics as JSON File" into sc-dev 2021-08-12 01:17:34 +00:00
Matthew Mintz
52f0172772 RESTRICT AUTOMERGE Set BUILD_ID=SC
Bug: 196178071
Bug: 196043450
Bug: 171506470
Test: adb shell getprop ro.build.fingerprint
Change-Id: I80596f736ce5421530ccaaa035075ceb801a6fe2
2021-08-11 15:09:44 +00:00
Kun Niu
bf90be8a65 Merge "Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds" into sc-dev 2021-08-11 07:02:18 +00:00
TreeHugger Robot
e135511f4d Merge "Adding vendor_boot-test-harness.img" into sc-dev 2021-08-10 01:54:56 +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
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
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
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
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
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
TreeHugger Robot
d932280147 Merge "Don't use mainline prebuilts for coverage builds." into sc-dev 2021-07-22 16:37:03 +00:00
TreeHugger Robot
34828f27c7 Merge "Don't use prebuilt modules for sanitizer builds." into sc-dev 2021-07-22 15:43:13 +00:00
Mathew Inwood
31167aeaf4 Don't use mainline prebuilts for coverage builds.
Test: TH
Bug: 192556458
Bug: 159241638
Change-Id: Id29e273c1df1fa27a038ebdcff1a17acca58bd46
2021-07-22 12:10:57 +01:00
Mathew Inwood
2c2e1b5a1e 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
Change-Id: I3682ae9ad963a8cd13bb395fe84dae515dc6d30f
2021-07-22 12:01:19 +01:00
Yifan Hong
ec91a39248 Only build OTA package for non-A/B with recovery
Change I4e5adc3f42a5 alone would break hikey build, which
is a non-A/B device with a boot image, but without recovery.

Do not build OTA in this case.

Test: lunch hikey && m dist
Fixes: 194018054
Bug: 193588301
Change-Id: I8d09ad5c62d44699eb910ff62d32044bd97e8e44
Merged-In: I8d09ad5c62d44699eb910ff62d32044bd97e8e44
2021-07-19 10:46:19 -07:00
TreeHugger Robot
9bbb60e141 Merge changes from topic "ota_for_generic_boot_image" into sc-dev
* changes:
  Also extract kernel configs from boot image.
  Build OTA when boot image exists even without kernel or recovery fstab
2021-07-16 20:23:47 +00:00
Yifan Hong
cb21f9edc8 Also extract kernel configs from boot image.
On devices with prebuilt generic boot image:
  TARGET_NO_KERNEL := true
  BOARD_PREBUILT_BOOTIMAGE is set
In this case, the process for extracting the kernel
config and version must also try extracting from the
prebuilt boot image.

Test: build on device with prebuilt boot image
Fixes: 193588301
Change-Id: I43dd8e206bcd1c9f3f5f51869f126791c50af01a
Merged-In: I43dd8e206bcd1c9f3f5f51869f126791c50af01a
2021-07-16 09:52:42 -07:00
Yifan Hong
73f01711f2 Build OTA when boot image exists even without kernel or recovery fstab
On devices with a prebuilt boot image, TARGET_NO_KERNEL
may be set to enable signing, etc. In this case we still
want to build the OTA package.

Test: m otapackage on a device with generic boot image
      (where TARGET_NO_KERNEL is set)
Bug: 193588301
Change-Id: I4e5adc3f42a516ac0e2f66c313dbe34a469ebe05
Merged-In: I4e5adc3f42a516ac0e2f66c313dbe34a469ebe05
2021-07-16 09:52:42 -07:00
Martin Stjernholm
2d6bfdb30c Fix typo in MODULE_BUILD_FROM_SOURCE variable.
Test: env MODULE_BUILD_FROM_SOURCE=true \
        TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true
Test: env TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false
Bug: 191978129
Change-Id: I2056b198bc0b944a6736ff21077b902df13c1479
2021-07-15 16:15:04 +01:00
Martin Stjernholm
06a7034659 Build the ART module from source if other Mainline modules are.
Test: env MODULES_BUILD_FROM_SOURCE=true \
        TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true
Test: env TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false
Bug: 191978129
Change-Id: I718d3878e9d5f5e710fa3d835a209184b633af48
2021-07-13 23:56:55 +01:00
Martin Stjernholm
f68bd2db71 DO NOT MERGE: Use prebuilts of the ART Module by default (reland 2).
This means prebuilts located in
/vendor/unbundled_google/modules/ArtGooglePrebuilt and
/prebuilts/module_sdk/art are used instead of sources in /art,
/libcore, and /libnativehelper.

Sanitizer and coverage builds builds are excluded, as are builds using
the products art_module_*, armv8, arm_krait, and others in
device/generic/art.

To keep using ART and libcore sources in local builds, set
SOONG_CONFIG_art_module_source_build=true. See art/build/README.md for
further info.

This http://ag/15200786 after fixing various build issues (see tests).
Using DO NOT MERGE to limit presubmit use to the branches for which
prebuilts were updated in http://ag/15189174 and http://ag/15200785.

Test: Heavy presubmits on build_test{,2,3,4} and flame-userdebug
Test: Heavy presubmit on mainline_modules-userdebug on sc-mainline-prod
Bug: 192542393
Change-Id: Id6800fe3564149e6c555b5f68a41b01e9c7dff3f
2021-07-08 16:16:33 +01:00
Martin Stjernholm
fa089f76e6 Add special cases for builds that cannot switch to ART prebuilts.
Test: env TARGET_PRODUCT=mainline_modules_x86_64 \
        build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Test: env TARGET_PRODUCT=module_arm build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Test: env TARGET_PRODUCT=cf_arm64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Test: env TARGET_PRODUCT=sdk_g3titan_x86_64 build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Test: env TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false with http://ag/15234812
Test: env TARGET_PRODUCT=cf_x86_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false with http://ag/15234812
Test: env TARGET_PRODUCT=bonito build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false with http://ag/15234812
Test: env TARGET_PRODUCT=aosp_flame build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Bug: 192542393
Change-Id: I544a0cfc9dfe6d738f75e60b7fec6d57f2b51d22
2021-07-08 16:16:14 +01:00
Mohammad Samiul Islam
ddfa249778 Merge "Revert "DO NOT MERGE: Use prebuilts of the ART Module by default (reland)."" into sc-dev 2021-07-07 14:36:20 +00:00
Mohammad Samiul Islam
5031d7f844 Revert "DO NOT MERGE: Use prebuilts of the ART Module by default (reland)."
This reverts commit 6a3fd20b35.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_sc-mainline-prod&target=mainline_modules-userdebug&lkgb=7528055&lkbb=7528146&fkbb=7528146, bug b/193013377

Change-Id: I896884acbb1dae20019eefeedf13494c4235a1b3
2021-07-07 13:19:08 +00:00