Commit graph

70667 commits

Author SHA1 Message Date
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
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
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
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
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
TreeHugger Robot
0fa0c84834 Merge "Fix typo in MODULE_BUILD_FROM_SOURCE variable." into sc-dev am: 6f0062ede9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15300830

Change-Id: Ib8d7b74b7083d63dcfa4045967ce8038ab4add0c
2021-07-15 19:02:15 +00:00
TreeHugger Robot
6f0062ede9 Merge "Fix typo in MODULE_BUILD_FROM_SOURCE variable." into sc-dev 2021-07-15 18:42:02 +00:00
Baligh Uddin
3f743d5780 Merge "Write the vbmeta digest to the output zipfile also" into sc-dev am: 82ff8ca90c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15288142

Change-Id: I3e9d78cdf592e6cb89a7863b560118317a4afaa2
2021-07-15 17:38:33 +00:00
Baligh Uddin
82ff8ca90c Merge "Write the vbmeta digest to the output zipfile also" into sc-dev 2021-07-15 17:27:25 +00: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
Tianjie
e7d0377f4a Write the vbmeta digest to the output zipfile also
During signing, we write the entry directly to the output zip, intead
of a temp directory. Add the logic to write vbmeta_digest.txt to output
zipfile too. So the digest file will show up in the signed target files.

Bug: 189926233
Test: add_img_to_target_files -a <target-files.zip>
Change-Id: Ibf28a8f97512bda8c8c695e06190e1fb6573c53e
(cherry picked from commit c3bf3d00a3)
2021-07-14 16:07:33 -07:00
Martin Stjernholm
3673e6dcf1 Build the ART module from source if other Mainline modules are. am: 06a7034659
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15277370

Change-Id: Ie0da83bf73591b9c01a621dc7be8a2b9d68bc649
2021-07-14 18:48:50 +00: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
1e4945f964 [automerger skipped] DO NOT MERGE: Use prebuilts of the ART Module by default (reland 2). am: f68bd2db71 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I60308f6512e96c1deace6b7bb65dc69ff4078ace
2021-07-09 12:07:17 +00:00
Martin Stjernholm
df1a364796 Add special cases for builds that cannot switch to ART prebuilts. am: fa089f76e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15234811

Change-Id: If0772963b01d55fd5d636271e6a95776c5bd67e0
2021-07-09 12:07:15 +00: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
e958462d2d [automerger skipped] Merge "Revert "DO NOT MERGE: Use prebuilts of the ART Module by default (reland)."" into sc-dev am: ddfa249778 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7561389f26c759d8649b48be76418b0aa03e85cd
2021-07-07 14:47:26 +00: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
Martin Stjernholm
1741913ea1 [automerger skipped] Merge "DO NOT MERGE: Use prebuilts of the ART Module by default (reland)." into sc-dev am: c9a802862f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ice02a7b4b9d513955e0474f20be6c9e4518dc844
2021-07-07 12:27:20 +00:00