Commit Graph

27340 Commits

Author SHA1 Message Date
Paul Scovanner
81fc2eda95 Update Security String to 2021-07-01 am: 5edc0cec47 am: d8033580ae am: da50045033
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14694771

Change-Id: Ibbfcc175ace801307108d325035fcbcac2e81763
2021-05-27 18:06:25 +00:00
Paul Scovanner
da50045033 Update Security String to 2021-07-01 am: 5edc0cec47 am: d8033580ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14694771

Change-Id: Ic69e33d14bfd68cd1bde31c774dacb92da50771f
2021-05-27 17:42:46 +00:00
Paul Scovanner
d8033580ae Update Security String to 2021-07-01 am: 5edc0cec47
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14694771

Change-Id: I1c3b7578852bee9c0d7a989d97ff6668a57ea2ee
2021-05-27 17:12:55 +00:00
Paul Scovanner
5edc0cec47 Update Security String to 2021-07-01
Bug: 188458861
Change-Id: I37f910ad48858038c97b86e2b04f9f3b9761c868
Merged-In: Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708
2021-05-26 22:24:05 +00:00
Tianjie
16bcac122f Check super size for factory OTA at build time
For VAB launched device, factory OTA will write system_other
partition to the super image. So we want to check that
sum(dynamic partitions) + system_other + overhead <= super at
build time.

Since we don't know the overhead at build time, we might instead
check sum(all partitions) < super.

Bug: 185809374
Test: m check-all-partition-sizes, unittests
Change-Id: Ia7ba5999d23924a1927e9a9463856a4d0ea90c20
Merged-In: Ia7ba5999d23924a1927e9a9463856a4d0ea90c20
(cherry-picked from commit 294ec7d9e5)

Change-Id: I479d1b399a1639b595ae5d7f1481c771a3439e51
2021-05-26 14:43:35 -07:00
Jaegeuk Kim
91869cafe6 Enable f2fs compression for other partitions
Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I231f7a2b808cc792fd582cd444825e4a47722984
2021-05-26 13:11:28 -07:00
TreeHugger Robot
e9e08e9e91 Merge "[memtag] Disable memtag for AndroidMk host modules." into sc-dev 2021-05-26 17:27:49 +00:00
Mitch Phillips
fe35441af5 [memtag] Disable memtag for AndroidMk host modules.
BUILD_HOST_EXECUTABLE modules are substantially deprecated, but some
partners are still using them for their bits with the workaround
provided in the product definition. This fixes a build error where
the host module doesn't have a linkable ELF note archive.

MTE is not intended for host modules, and it's fine for us to say
"host module using AndroidMk - no MTE for you" if this changes.

Bug: 189330992
Test: Manually tested using a BUILD_HOST_EXECUTABLE module.
Change-Id: Ifedff39f2f03c08bfb644221d2ab1b88e635c8a3
Merged-In: Ifedff39f2f03c08bfb644221d2ab1b88e635c8a3
2021-05-26 17:07:27 +00:00
Bowgo Tsai
b23656df31 Support AVB signing for BOARD_PREBUILT_BOOTIMAGE
Devices using GKI architecture will use a prebuilt boot.img.
However, we should still sign this prebuilt boot.img with
device-specific AVB keys.

Steps to test the CL.
1. In a device BoardConfig.mk:

   # Uses a prebuilt boot.img
   TARGET_NO_KERNEL := true
   BOARD_PREBUILT_BOOTIMAGE := device/google/redbull/boot.img

   # Enable chained vbmeta for the boot image.
   # The following can be absent, where the hash descriptor of the
   # 'boot' partition will be stored then signed in vbmeta.img instead.
   BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
   BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA4096
   BOARD_AVB_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
   BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION := 2

2. `make bootimage`, then `avbtool info_image --image $OUT/boot.img`,
    checks the image is re-signed with a device-specific key

3. `make dist` to generate out/dist/TF.zip

4. `unzip out/dist/TF.zip IMAGES/boot.img`

5. `avbtool info_image --image out/dist/IMAGES/boot.img`,
    checks the image is re-signed with a device-specific key

6. `sign_target_files_apks \
      --avb_boot_key=external/avb/test/data/testkey_rsa8192.pem \
      --avb_boot_algorithm=SHA256_RSA8192 \
      --avb_boot_extra_args="--prop test:sign" \
      ./out/dist/*-target_files-eng.*.zip signed.zip`, resign the TF.zip

7. `unzip signed.zip IMAGES/boot.img`, then use `avbtool info_image` to
   check the boot.img is re-signed with the --avb_boot_key in step 6.

Bug: 188485657
Test: above steps
Change-Id: I7ee8b3ffe6a86aaca34bbb7a8898a97b3f8bd801
Merged-In: I7ee8b3ffe6a86aaca34bbb7a8898a97b3f8bd801
(cherry picked from commit cf9ead8972)
2021-05-26 09:11:00 +08:00
Ulya Trafimovich
da5c795604 Disable <uses-library> checks for more tests (to fix MTS builds).
Bug: 132357300
Bug: 188648210
Fixes: 188907662
Test: lunch aosp_cf_x86_64_phone-userdebug && m mts && m gts
Change-Id: Iae0ecac076b351b2da929bb455f00f03ece130bd
(cherry picked from commit d5e6a7c620)
2021-05-24 06:23:47 -07:00
Paul Scovanner
b8ae2c21e1 Update Security String to 2021-07-05 am: 64b00db8f4 am: e580c75611
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14605426

Change-Id: Ie542698aef33599bf1e0d5315b58d2fcffada1d4
2021-05-19 22:42:09 +00:00
Paul Scovanner
e580c75611 Update Security String to 2021-07-05 am: 64b00db8f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14605426

Change-Id: I89b530d9df421db3da5e3da15a38036255cda4bb
2021-05-19 22:25:31 +00:00
Ulyana Trafimovich
235f1507e9 Merge "Revert^6 "Enforce <uses-library> check for Android.mk modules."" into sc-dev 2021-05-18 12:57:38 +00:00
Paul Scovanner
64b00db8f4 Update Security String to 2021-07-05
Bug: 188458861
Change-Id: Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708
2021-05-17 21:54:30 +00:00
Ulyana Trafimovich
d1d8c7133c Revert^6 "Enforce <uses-library> check for Android.mk modules."
This reverts commit 80e99d8851.

Reason for revert: relanding CL after fixing barbet-userdebug build.

Bug: 132357300
Change-Id: I4b8e22847215b349393f01f6c0a90dd03b6073cd
Test: on branch sc-dev: lunch barbet-userdebug && m
2021-05-17 09:36:52 +00:00
Bowgo Tsai
b9af035ee7 BOARD_PREBUILT_BOOTIMAGE: removes the restriction of non system-as-root
Starting from Android 10, the system.img layout consists of
$TARGET_SYSTEM_OUT and $TARGET_ROOT_OUT, and is mounted by the
init as root. That is, system.img is always created as if
BOARD_BUILD_SYSTEM_ROOT_IMAGE was set.

  https://source.android.com/devices/bootloader/partitions/system-as-root

The previous concern is that there might be compatibility issues between
the ramdisk contained in boot.img with a newer system.img. But this is
no longer an issue after we always mount the system.img as root.

Bug: 187157581
Test: Tree Hugger
Change-Id: I4537e6ce6fb39b4b86caac82a13716abf515ffd6
Merged-In: I4537e6ce6fb39b4b86caac82a13716abf515ffd6
(cherry picked from commit 640544bd96)
2021-05-17 14:51:16 +08:00
Ulyana Trafimovich
6eac4c2236 Merge "Revert^5 "Enforce <uses-library> check for Android.mk modules."" into sc-dev 2021-05-14 17:44:21 +00:00
Ulyana Trafimovich
80e99d8851 Revert^5 "Enforce <uses-library> check for Android.mk modules."
This reverts commit d6057adc0b.

Reason for revert: broken build git_master/barbet-userdebug @ 7362593

Change-Id: I5549aa949ccbead2c7fa3e933db50b6d74f5990e
2021-05-14 17:34:09 +00:00
Ulyana Trafimovich
67fac6584e Merge "Revert^4 "Enforce <uses-library> check for Android.mk modules."" into sc-dev 2021-05-14 16:28:55 +00:00
Ulyana Trafimovich
d6057adc0b Revert^4 "Enforce <uses-library> check for Android.mk modules."
This reverts commit ad645285a6.

Reason for revert: relanding CL after fixing git_sc-car-dev builds and
  other build failures.

Bug: 132357300
Test: on branch sc-dev: lunch seahawk-userdebug && m
Test: on branch sc-dev: lunch osprey-userdebug && m
Test: on branch sc-dev: lunch factory_pipit-userdebug && m
Test: on sc-dev: lunch cf_x86_phone-userdebug && m droid dist tests
Test: forrest build partner-s-d1-fs-dev-slider/aosp_slider-userdebug:
  https://android-build.googleplex.com/builds/forrest/run/L22600000889121228
Change-Id: I74789903bd91d3bb45c69031fcbaf3556cb29408
2021-05-14 16:25:34 +00:00
Jaewoong Jung
c3eb4ba8b1 Merge "Do not alter presigned prebuilt apks for SDK > 29." am: 3218d79aa7 am: ff4544ceb4 am: b8781f9670
Original change: https://android-review.googlesource.com/c/platform/build/+/1705710

Change-Id: I303106c1dd2da73789e08be3b6170b09066a74c9
2021-05-14 15:58:08 +00:00
Jaewoong Jung
b8781f9670 Merge "Do not alter presigned prebuilt apks for SDK > 29." am: 3218d79aa7 am: ff4544ceb4
Original change: https://android-review.googlesource.com/c/platform/build/+/1705710

Change-Id: I2ee3b84f4edf4af08821c8feece944cc84c62fb1
2021-05-14 15:18:26 +00:00
Jaewoong Jung
ff4544ceb4 Merge "Do not alter presigned prebuilt apks for SDK > 29." am: 3218d79aa7
Original change: https://android-review.googlesource.com/c/platform/build/+/1705710

Change-Id: Ibb6585eca9474b783762343f0ab9f9302a7becb0
2021-05-14 14:31:22 +00:00
Jaewoong Jung
3218d79aa7 Merge "Do not alter presigned prebuilt apks for SDK > 29." 2021-05-14 14:07:17 +00:00
Anthony Hugh
b961222c08 Merge "Revert "Revert^2 "Enforce <uses-library> check for Android.mk modules.""" into sc-dev 2021-05-14 04:40:15 +00:00
Treehugger Robot
c79de76e3e Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" am: bf5d6238fe am: e9b9f7f0f7 am: 9fda600aa3
Original change: https://android-review.googlesource.com/c/platform/build/+/1705507

Change-Id: If5d80fcf192bace7c400bec76e77d55e2ea92af9
2021-05-14 03:02:57 +00:00
Treehugger Robot
9fda600aa3 Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" am: bf5d6238fe am: e9b9f7f0f7
Original change: https://android-review.googlesource.com/c/platform/build/+/1705507

Change-Id: Id7de61da766da6e0a6ee39e3ee54d0ca902de25f
2021-05-14 02:39:04 +00:00
Treehugger Robot
e9b9f7f0f7 Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" am: bf5d6238fe
Original change: https://android-review.googlesource.com/c/platform/build/+/1705507

Change-Id: I35bbe366e804b38aafb37a85f41bc71d0afb17ee
2021-05-14 01:53:24 +00:00
Anthony Hugh
ad645285a6 Revert "Revert^2 "Enforce <uses-library> check for Android.mk modules.""
This reverts commit b6d1b48f9f.

Reason for revert: This change is breaking seahawk-userdebug

BUG: 188108611

Change-Id: I15b737e2778d437ecbef6ab9f43345da407f2205
2021-05-14 01:52:06 +00:00
Treehugger Robot
bf5d6238fe Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" 2021-05-14 01:21:41 +00:00
Jaewoong Jung
b34f64fc7a Do not alter presigned prebuilt apks for SDK > 29.
Bug: 185811447
Test: Manual
Change-Id: I5ea143331e1bd1885dde4e46b086f4ce811f4981
2021-05-13 16:16:19 -07:00
Ulyana Trafimovich
aeb62e4cbd Merge "Revert^2 "Enforce <uses-library> check for Android.mk modules."" into sc-dev 2021-05-13 16:23:31 +00:00
Treehugger Robot
ae6bdc0c74 Merge "Revert^2 "Enforce <uses-library> check for Android.mk modules."" 2021-05-13 12:31:44 +00:00
Ulyana Trafimovich
b6d1b48f9f Revert^2 "Enforce <uses-library> check for Android.mk modules."
This reverts commit 4caef2b8c8.

Reason for revert: relanding original CL after fixing r11-userdebug.
Bug: 132357300
Test: forrest build for git_master/r11-userdebug

Change-Id: I62268f331c76f31a80b610754c53543b9b59a1c6
2021-05-13 11:59:52 +00:00
Ulyana Trafimovich
7ceafdaf34 Revert^2 "Enforce <uses-library> check for Android.mk modules."
This reverts commit a700ad4651.

Reason for revert: relanding original CL with correct Merged-In tag.

Use "Merged-In" tag from CL ag/14062434 to prevent merging in the
stage-aosp-master branch. That CL is unrelated to the current CL,
but related to <uses-library> checks in general.

Bug: 132357300
Change-Id: I10de5b56c51a0407bf027e0be5ac3b0b307cf100
Test: treehugger
Merged-In: I21712e5197b3cb06e82e476f4c2f7277142034e9
2021-05-13 09:52:38 +00:00
Jeongik Cha
62519def7b Don't make dexpreopt_tools.zip when dex2oat isn't avilable
Test: m
Bug: 158843648
Change-Id: Iae90ea60fc73f1a6202499528277fce7c950d9d3
2021-05-13 13:29:39 +09:00
Treehugger Robot
fdca5d9faa Merge "Target for tools to dexpreopt" am: 26bad544c5 am: ee88da65f5 am: 4beb444294
Original change: https://android-review.googlesource.com/c/platform/build/+/1688306

Change-Id: I91c8fd16af6707d159b448668082fed25d215531
2021-05-13 01:27:10 +00:00
Treehugger Robot
4beb444294 Merge "Target for tools to dexpreopt" am: 26bad544c5 am: ee88da65f5
Original change: https://android-review.googlesource.com/c/platform/build/+/1688306

Change-Id: I5fd65c6cb65bda59008caf14c355cd9d4b03f863
2021-05-13 00:55:18 +00:00
Ulyana Trafimovich
a700ad4651 Revert "Enforce <uses-library> check for Android.mk modules."
This reverts commit 0b154519b0.

Reason for revert: breaks the builds on stage-aosp-master

Change-Id: I72b45041ea8f1d73a57a2788a79183150c12e547
2021-05-12 22:20:12 +00:00
Ulyana Trafimovich
4caef2b8c8 Revert "Enforce <uses-library> check for Android.mk modules."
Bug: 187980797

This reverts commit feeb6bcd1e.

Reason for revert: breaks r11-userdebug build.

Change-Id: Iab296d6fa6e1c1e0d06f37609e06b63b72bfdacc
2021-05-12 22:16:09 +00:00
Jeongik Cha
2522c36b4c Target for tools to dexpreopt
Bug: 158843648
Test: m droidcore
Change-Id: I580e2b3285cc524234859998a0e4e072ecaef072
2021-05-12 23:28:49 +09:00
Ulya Trafimovich
0b154519b0 Enforce <uses-library> check for Android.mk modules.
Use "Merged-In" tag from CL ag/14063987 to prevent merging in the
rvc-qpr-dev-plus-aosp branch. That CL is unrelated to the current CL,
but related to <uses-library> checks in general.

Bug: 132357300
Test: treehugger
Change-Id: If31a9ed148e4f1195bf916a650d0afafef3d6915
Merged-In: I26f2887357193b0d4bb951fa5bb09384c149b381
(cherry picked from commit feeb6bcd1e)
2021-05-12 14:19:40 +00:00
Ulya Trafimovich
feeb6bcd1e Enforce <uses-library> check for Android.mk modules.
Bug: 132357300
Test: treehugger
Change-Id: If31a9ed148e4f1195bf916a650d0afafef3d6915
2021-05-12 11:49:41 +01:00
Tianjie Xu
216c762826 Merge "Don't set the build id if we need to append the digest" am: a530481db1 am: 834dc90be1 am: 5678ae7b1c
Original change: https://android-review.googlesource.com/c/platform/build/+/1695406

Change-Id: I7a751270df9a6c02763c228f495c40c046c0115b
2021-05-09 00:10:02 +00:00
Tianjie Xu
5678ae7b1c Merge "Don't set the build id if we need to append the digest" am: a530481db1 am: 834dc90be1
Original change: https://android-review.googlesource.com/c/platform/build/+/1695406

Change-Id: I9b8b41c7890ecc8a6c32cc249b0db9fd72be3e7a
2021-05-08 23:30:17 +00:00
Tianjie Xu
a530481db1 Merge "Don't set the build id if we need to append the digest" 2021-05-08 22:56:56 +00:00
Treehugger Robot
62a73dbed0 Merge "DO NOT MERGE - Merge RQ2A.210505.003." 2021-05-08 21:38:02 +00:00
Treehugger Robot
28e99c4932 Merge "Rename DexPreoptImageLocations to DexPreoptImageLocationsOnHost" am: 5a75afbede am: 593ab41f74 am: 9bafad0c19
Original change: https://android-review.googlesource.com/c/platform/build/+/1699567

Change-Id: Ia34ad43307ce10e08d025c1c21e33fc8099e3cdf
2021-05-08 02:45:56 +00:00
Treehugger Robot
9bafad0c19 Merge "Rename DexPreoptImageLocations to DexPreoptImageLocationsOnHost" am: 5a75afbede am: 593ab41f74
Original change: https://android-review.googlesource.com/c/platform/build/+/1699567

Change-Id: I7eae52cdbf184d1c86bf0d073b37c2f06756076d
2021-05-08 02:27:10 +00:00
Xin Li
7a2e4a990a DO NOT MERGE - Merge RQ2A.210505.003.
Bug: 187544653
Merged-In: Ica626a3b19e5b642807234c288428cd7e0f40f98
Change-Id: I3ff9da08d4c59e59a50bc89a6f962b185f8d3942
2021-05-07 18:51:09 -07:00