Commit graph

70936 commits

Author SHA1 Message Date
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
7c600bb59f Merge "Report Performance Test Metrics as JSON File" into sc-dev am: d1bfb2e9ed am: 228204d820
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15502939

Change-Id: Id85e50300bb3f9af14ffb7ef2880c15a81fc0787
2021-08-12 01:56:31 +00:00
Sanket Chinchalkar
228204d820 Merge "Report Performance Test Metrics as JSON File" into sc-dev am: d1bfb2e9ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15502939

Change-Id: I5d156c9b651aa988f3357995472f837c93476ce1
2021-08-12 01:32:14 +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
e8e73f494f [automerger skipped] RESTRICT AUTOMERGE Set BUILD_ID=SC am: 52f0172772 am: 452c6cca84 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15530694

Change-Id: I8af503a26c574edd6bd7126654d3e4f9e21a44da
2021-08-11 17:10:08 +00:00
Matthew Mintz
452c6cca84 RESTRICT AUTOMERGE Set BUILD_ID=SC am: 52f0172772
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15530694

Change-Id: Ib93f7896557a9c92a5ad2bb91100dcb456bb2192
2021-08-11 17:00:33 +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
bc9354bb3c Merge "Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds" into sc-dev am: bf90be8a65 am: 7424feabb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15502941

Change-Id: I89f8b419b33433bdb92d2d6c1b645be14854f45a
2021-08-11 07:27:01 +00:00
Kun Niu
7424feabb5 Merge "Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds" into sc-dev am: bf90be8a65
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15502941

Change-Id: I8a400241f6356e1fca3afb19f6a6df21fae1c7f1
2021-08-11 07:13:03 +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
00cca5b11a Merge "Adding vendor_boot-test-harness.img" into sc-dev am: e135511f4d am: dbab3c817a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15454001

Change-Id: I8891866bb8931ef53024a06735edd1eca1a62e07
2021-08-10 02:31:37 +00:00
TreeHugger Robot
dbab3c817a Merge "Adding vendor_boot-test-harness.img" into sc-dev am: e135511f4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15454001

Change-Id: Ib55cff3765e154df5ff7f0da0203e16d39cfcf58
2021-08-10 02:09:30 +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
Kelvin Zhang
de935deb8b Make apex util detect if hashtree is present am: 45b44d96e6 am: 7f6869787d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15475434

Change-Id: I0f95c16bffa3b9a62e09e2e04f2f9366cbdc8e4f
2021-08-07 03:11:07 +00:00
Kelvin Zhang
7f6869787d Make apex util detect if hashtree is present am: 45b44d96e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15475434

Change-Id: Iad320a8517523c5268f44e501056cc0b0737e733
2021-08-07 02:54:24 +00:00
Kelvin Zhang
45b44d96e6 Make apex util detect if hashtree is present
Test: sign_target_fiels_apks oriole_target_files.zip
Bug: 195194430

Change-Id: I919d169ce4d66e6a1cdbfd15babde25005971a30
2021-08-06 19:38:14 -04:00
Colin Cross
b713d8aa9f Merge "Remove S codename from sc-v2-dev" into sc-v2-dev 2021-08-06 18:36:10 +00:00
SzuWei Lin
c7a43ea285 Always build modules in GSI from source am: bff4b52ce1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15470676

Change-Id: I010af4933ac11241aa3c4d33751b70fc8a73234a
2021-08-06 01:59:25 +00:00
SzuWei Lin
bff4b52ce1 Always build modules in GSI from source
GSI includes both flattened and unflattened apex at the same time.
However, a flattend apex is not built if the module is built from
prebuilt binary. So, we enable 'MODULE_BUILD_FROM_SOURCE := true'
to force GSI built all modules from source.

Bug: 194917545
Test: build gsi_gms_arm64-user
Test: check com.google.android.art exists in /system/system_ext/apex/
Change-Id: I89eef3e8d06ec1f9d3245513c2dbbff0777e2c62
Merged-In: I89eef3e8d06ec1f9d3245513c2dbbff0777e2c62
2021-08-05 09:47:38 +00:00
Colin Cross
b3c7b25df4 Remove S codename from sc-v2-dev
S was finalized, it shouldn't be listed as an active codename any
more.

Bug: 193674948
Test: treehugger
Change-Id: I4cce94b0ea4865a5248ab106edce8fa165390005
Merged-In: Ie5ee4479ba98b9f4525b36e38493879a15661905
2021-08-04 16:55:50 -07:00
Colin Cross
c837710b52 Merge "Update codename for sc-v2-dev to Sv2" into sc-v2-dev 2021-08-04 23:29:31 +00:00
Colin Cross
19da67d49b Merge "Fix typo for ODM prop files" into sc-dev am: 65e3db8e49
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15446606

Change-Id: I06e1a68f01265b4a434814ec9aebb068b795e43e
2021-08-04 20:20:21 +00: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
Colin Cross
2a69b486cf Update codename for sc-v2-dev to Sv2
Bug: 193674948
Test: treehugger
Merged-In: Ie5ee4479ba98b9f4525b36e38493879a15661905
Change-Id: I0e7af15f58a2859ca938d01cff067700a85b7743
2021-08-04 12:50:25 -07:00
Hajime Morrita
81734e246b Merge "Drop pinner.pin_camera=false from the default prop." into sc-dev am: 44c73a61d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15422361

Change-Id: I5cc181f81e2102bb5a1e910a93db89949897f967
2021-08-04 18:53:24 +00:00
Hajime Morrita
44c73a61d1 Merge "Drop pinner.pin_camera=false from the default prop." into sc-dev 2021-08-04 18:11:14 +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
8e760a5209 Merge "Work around art-host-tests build issues when using ART prebuilts." into sc-dev am: da8d71ea5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15402994

Change-Id: I7fc7cd119fdc33fef9e44f8f8a82b8e9a69a6bd7
2021-08-03 16:19:42 +00: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
dca45499eb Add libincident. am: e24af74376
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15411834

Change-Id: I741634e1f4db5d7cdc315b58109688be934daf7f
2021-07-30 10:43:50 +00:00
Hajime Morrita
ea331d6bcc Drop pinner.pin_camera=false from the default prop.
The pin_camera flag being false makes some in-market devices
(redfin, bramble, coral, etc.) not pin the camera app by default.
Although a Phenotype flag overrides this value,
the OTA flag delivery can fail and ends up non-ping state.

This change makes sure that the device pins the camera app by default
by removing pinner.pin_camera properties modification from this file.
The current default is to pin the camera. See PinnerServices.java

Note that the camera pinning is still disabled on crosshatch family,
sicne it is known to be prone to the memory shortage.
See device-crosshatch.mk.

Also note that some newer devices already pin by default because
they don't refer this file, although the name implies it might.

Test: On Redfin:
  $ vendor/google/tools/flashall -w
  $ adb root && adb wait-for-device && adb shell am start -a com.android.setupwizard.FOUR_CORNER_EXIT
  $ adb shell dumpsys pinner
Bug: 195035033
Bug: 184897981
Change-Id: I81207d0527f758d4800319a3a3c323919daaf814
2021-07-29 15:46:27 -07:00
Mathew Inwood
e24af74376 Add libincident.
This library is required by the StatsD apex and including it here ensures
it's always available for use by the apex.

Bug: 192556458
Bug: 160662406
Test: TH
Change-Id: Ia01964d471e4456c05c77c708dee2e71e0121587
2021-07-29 14:59:29 +00:00
Martin Stjernholm
228a5df289 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: I9482cdb1d30c78c9e614a4337172fc6562ce901c
2021-07-28 14:05:52 +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
Bowgo Tsai
3ee873c818 Sets BOOT_SECURITY_PATCH for the generic boot.img am: 008599f7e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15360180

Change-Id: If9a5fef5edc85de41c839e3f7fa4b5738ab8a259
2021-07-23 18:12:37 +00:00
Bowgo Tsai
008599f7e9 Sets BOOT_SECURITY_PATCH for the generic boot.img
This is for GKI 1.0 devices to pass VtsHalKeymasterV4_0TargetTest.

For GKI 2.0 devices, they will use device-specific
BOOT_SECURITY_PATCH to sign a prebuilt GKI boot.img to
override this value.
See https://r.android.com//1711437 for details.

Bug: 192513934
Test: `lunch gsi_arm64-user` then `make bootimage`
Test: `avbtool info_image --image $OUT/boot-4.19-gz.img`, checks
      com.android.build.boot.security_patch exists
Change-Id: I3909cccd0eae7c142d3c01d0ecb2c249286b9ebe
Merged-In: I3909cccd0eae7c142d3c01d0ecb2c249286b9ebe
(cherry picked from commit 81a23fed56)
2021-07-23 11:48:26 +08:00
TreeHugger Robot
c07958adf6 Merge "Don't use mainline prebuilts for coverage builds." into sc-dev am: d932280147
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15358466

Change-Id: If7762b7833f24e9432396d068cdee288d37848c2
2021-07-22 16:54:29 +00: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
f14c0ac1f7 Merge "Don't use prebuilt modules for sanitizer builds." into sc-dev am: 34828f27c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15358465

Change-Id: Iac87e0f65d4321f00b1bbd89451c0fd224ccf086
2021-07-22 16:23:56 +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
2a3f9ad4f4 Only build OTA package for non-A/B with recovery am: ec91a39248
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15330197

Change-Id: I242695d7f5badab25f67d9ab050bb2269d1f47f0
2021-07-20 05:04:23 +00: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
e77d5844d1 Merge changes from topic "ota_for_generic_boot_image" into sc-dev am: 9bbb60e141
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15289192

Change-Id: I9dfa4e8c6215752ceddd9322149f3a4db7150632
2021-07-16 21:58:38 +00:00
Yifan Hong
0e9e4d758c Build OTA when boot image exists even without kernel or recovery fstab am: 73f01711f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15289191

Change-Id: I6bf373c5196abcc15186b66032cb383e1e0693b1
2021-07-16 21:58:37 +00:00