Commit Graph

27520 Commits

Author SHA1 Message Date
Yuntao Xu
cfc1765cbd Merge "add LOCAL_DISABLE_TEST_CONFIG logic" am: f6cff22181
Original change: https://android-review.googlesource.com/c/platform/build/+/1719472

Change-Id: I841e82bbf1bc196a587c93e7e7718698e95de6b7
2021-06-01 22:16:48 +00:00
Colin Cross
e131ab1e10 Merge "Support all active codenames for BOARD_SYSTEMSDK_VERSIONS" am: 54b437286b
Original change: https://android-review.googlesource.com/c/platform/build/+/1721370

Change-Id: Iaa1ae561fbf0e4e34c3aad9a80e5f62f90046c33
2021-06-01 22:16:08 +00:00
Yuntao Xu
f6cff22181 Merge "add LOCAL_DISABLE_TEST_CONFIG logic" 2021-06-01 22:11:59 +00:00
Jaegeuk Kim
bce364b9ce Merge changes from topic "f2fs-system" into sc-dev
* changes:
  Enable f2fs compression for other partitions
  Enable --readonly for system compression
2021-06-01 18:09:07 +00:00
Colin Cross
54b437286b Merge "Support all active codenames for BOARD_SYSTEMSDK_VERSIONS" 2021-06-01 17:25:02 +00:00
Jeongik Cha
f93c13d51b RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED
In the case of unbundled build, the module in vendor should use
system(_ext) module by prebuilt one. But RRO depends on system module
directly depending on some conditions(packages exporting resources)

In this change,
 1. Temporarily make LOCAL_RES_LIBRARIES empty(For now, auto generated
 RRO doesn't use overlaid package's resources), enable it when prebuilts
 are ready.
 2. According to (1), its SDK_VERSION can be current)

Bug: 187404676
Test: TARGET_BUILD_UNBUNDLED_IMAGE m vendorimage, and check if there is
no build error regarding RRO.

Change-Id: I94e3122372dd20c942b2c858070a6ca797312792
2021-06-02 00:01:01 +09:00
Tianjie Xu
8108eed6d0 Merge "Enable a prop to determine the new figerprint is enabled" am: 5260f435a3 am: d34ac59c5a
Original change: https://android-review.googlesource.com/c/platform/build/+/1716976

Change-Id: I894e32aefa3e83f287a59c5c81fa4e11e7eff140
2021-06-01 05:08:17 +00:00
Tianjie Xu
d34ac59c5a Merge "Enable a prop to determine the new figerprint is enabled" am: 5260f435a3
Original change: https://android-review.googlesource.com/c/platform/build/+/1716976

Change-Id: I5762f6a1ea981fe29ab49e2601df5ffef8351653
2021-06-01 04:46:16 +00:00
Tianjie Xu
5260f435a3 Merge "Enable a prop to determine the new figerprint is enabled" 2021-06-01 04:31:07 +00:00
Bowgo Tsai
22fb8a4709 Merge "Support AVB signing for BOARD_PREBUILT_BOOTIMAGE" into sc-dev 2021-05-28 00:35:40 +00:00
Colin Cross
45efdc4e0e Support all active codenames for BOARD_SYSTEMSDK_VERSIONS
Use PLATFORM_VERSION_ALL_CODENAMES to construct PLATFORM_SYSTEMSDK_VERSIONS
so that both S and T are accepted while T is active but S is not finalized.

Bug: 186121492
Test: treehugger
Change-Id: Ia9f58c5986c717cb2882e2fc4daadb2b3874c6b5
2021-05-27 13:27:23 -07:00
Jaegeuk Kim
ff8ac9f32d Merge changes from topic "f2fs-system" am: d56fb727ba am: 7e09329be0
Original change: https://android-review.googlesource.com/c/platform/build/+/1713834

Change-Id: I393db10063b3ffafa0365569203da56905790a41
2021-05-27 19:01:33 +00:00
Jaegeuk Kim
7e09329be0 Merge changes from topic "f2fs-system" am: d56fb727ba
Original change: https://android-review.googlesource.com/c/platform/build/+/1713834

Change-Id: I7a44816b8094a34502b9c01398a4d15c005dbd4a
2021-05-27 18:58:46 +00:00
Jaegeuk Kim
d56fb727ba Merge changes from topic "f2fs-system"
* changes:
  Enable f2fs compression for other partitions
  Enable --readonly for system compression
2021-05-27 18:42:28 +00:00
Yuntao Xu
32a085c041 add LOCAL_DISABLE_TEST_CONFIG logic
Disable the generation of .config file when the variable
LOCAL_DISABLE_TEST_CONFIG is true.

Bug: 188927912
Test: rum 'm module-name' (`android_test_helper_app` type module)
Test: TreeHugger
Change-Id: I64372b4ba84fcf1af937abdee345ceb1d3c2f6c5
2021-05-27 10:19:48 -07:00
Tianjie Xu
943e192bc9 Merge "Check super size for factory OTA at build time" am: f4ca0567dd am: a5eefeee20
Original change: https://android-review.googlesource.com/c/platform/build/+/1707526

Change-Id: If6b8698db08f8b5495a89facb20f5acef50932d3
2021-05-26 22:06:53 +00:00
Tianjie Xu
a5eefeee20 Merge "Check super size for factory OTA at build time" am: f4ca0567dd
Original change: https://android-review.googlesource.com/c/platform/build/+/1707526

Change-Id: I1fc7aa1cfef592a2889113f8a50fe87088ed4fb0
2021-05-26 21:51:01 +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
Tianjie Xu
f4ca0567dd Merge "Check super size for factory OTA at build time" 2021-05-26 21:33:14 +00: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
Martin Stjernholm
c35baf938e Merge "Move logic to disable flattening in unbundled app mode from Soong to make." am: e2077b5e3b am: 7bfbeba50f
Original change: https://android-review.googlesource.com/c/platform/build/+/1714379

Change-Id: Idee6a028a2cc4a9cbb1d09757b8750faf8141ffb
2021-05-26 19:15:58 +00:00
Martin Stjernholm
7bfbeba50f Merge "Move logic to disable flattening in unbundled app mode from Soong to make." am: e2077b5e3b
Original change: https://android-review.googlesource.com/c/platform/build/+/1714379

Change-Id: I945007b74f2cc408bd0f750b119894de7679543a
2021-05-26 18:35:06 +00:00
Martin Stjernholm
e2077b5e3b Merge "Move logic to disable flattening in unbundled app mode from Soong to make." 2021-05-26 18:21:44 +00:00
Tianjie
c3b841a422 Enable a prop to determine the new figerprint is enabled
VTS and some other tests would replace the system images with GSI. To
put the correct fingerprint in the test report, we need to know if the
new fingerprint format is in use. So, add a vendor build prop.

OEMs are reponsible for setting this build prop, or using other ways
to put the correct fingerprint in the test report.

Bug: 188824341
Test: boot the device, check build prop
Change-Id: I6bc7f01903865fc2c256d209debdab68cd9d1bb3
2021-05-26 11:19:45 -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
Martin Stjernholm
421990d4a4 Move logic to disable flattening in unbundled app mode from Soong to
make.

Avoids TARGET_FLATTEN_APEX lying about it, so we can trust it in
scripts, e.g. in art/build/apex/runtests.sh.

Test: banchan com.android.art; art/build/apex/runtests.sh
Bug: 179900989
Change-Id: I5d3226047e51a51ee76de2cbfad050e200568655
2021-05-26 11:55:33 +01: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
Jaegeuk Kim
1369654d8d Enable f2fs compression for other partitions
Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I231f7a2b808cc792fd582cd444825e4a47722984
2021-05-25 14:54:45 -07:00
Bowgo Tsai
a7db879756 Merge "Support AVB signing for BOARD_PREBUILT_BOOTIMAGE" am: d33ceee8e9 am: f81630a8d7
Original change: https://android-review.googlesource.com/c/platform/build/+/1711437

Change-Id: I57030fad73acbea09b7819040c646fe87c5babed
2021-05-25 16:22:41 +00:00
Bowgo Tsai
f81630a8d7 Merge "Support AVB signing for BOARD_PREBUILT_BOOTIMAGE" am: d33ceee8e9
Original change: https://android-review.googlesource.com/c/platform/build/+/1711437

Change-Id: Ic044f87c86de98e88087f31846651068a0e6dad5
2021-05-25 15:59:13 +00:00
Bowgo Tsai
d33ceee8e9 Merge "Support AVB signing for BOARD_PREBUILT_BOOTIMAGE" 2021-05-25 15:24:26 +00:00
Treehugger Robot
8e3b5eb976 Merge "[memtag] Disable memtag for AndroidMk host modules." am: 38d4a2a19e am: 1932676d40
Original change: https://android-review.googlesource.com/c/platform/build/+/1712209

Change-Id: I4c256f1701c42a23ed8e726f49c84daad7e4609d
2021-05-25 05:03:38 +00:00
Treehugger Robot
1932676d40 Merge "[memtag] Disable memtag for AndroidMk host modules." am: 38d4a2a19e
Original change: https://android-review.googlesource.com/c/platform/build/+/1712209

Change-Id: Id76d763164debaf01461f8d6eaaa4d7bae5e247b
2021-05-25 04:30:02 +00:00
Treehugger Robot
38d4a2a19e Merge "[memtag] Disable memtag for AndroidMk host modules." 2021-05-25 04:05:59 +00:00
Mitch Phillips
b71a875bba [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.

Test: Manually tested using a BUILD_HOST_EXECUTABLE module.
Change-Id: Ifedff39f2f03c08bfb644221d2ab1b88e635c8a3
2021-05-24 18:41:15 +00: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
Bowgo Tsai
cf9ead8972 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
2021-05-21 08:44:37 +00:00
Ulyana Trafimovich
60d8f4c35d Merge "Disable <uses-library> checks for more tests (to fix MTS builds)." am: 3ff3f1088d am: b6d05815f4
Original change: https://android-review.googlesource.com/c/platform/build/+/1712369

Change-Id: I10a63dde02a528194e3ab95b7ea5858d2fc70d56
2021-05-20 09:47:07 +00:00
Ulyana Trafimovich
b6d05815f4 Merge "Disable <uses-library> checks for more tests (to fix MTS builds)." am: 3ff3f1088d
Original change: https://android-review.googlesource.com/c/platform/build/+/1712369

Change-Id: I6b0ac1ef6a2f3e3e103c9ce75fe32765f4ff6e77
2021-05-20 09:22:32 +00:00
android-build-team Robot
41539a8d0b Make change and version bump to RQ3A.210705.001
Change-Id: Id0be466b3690ac57d05d9e67de9d666eb33389bf
2021-05-20 00:05:22 +00:00
Paul Scovanner
5e0455ff76 Update Security String to 2021-07-05
Bug: 188458861
Change-Id: Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708
(cherry picked from commit 64b00db8f4)
2021-05-20 00:00:25 +00: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
Ulya Trafimovich
d5e6a7c620 Disable <uses-library> checks for more tests (to fix MTS builds).
Bug: 132357300
Bug: 188648210
Test: lunch aosp_cf_x86_64_phone-userdebug && m mts
Change-Id: Iae0ecac076b351b2da929bb455f00f03ece130bd
2021-05-19 18:10:28 +01: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
Treehugger Robot
20ac8fb2fa Merge "BOARD_PREBUILT_BOOTIMAGE: removes the restriction of non system-as-root" am: ab85371d18
Original change: https://android-review.googlesource.com/c/platform/build/+/1708446

Change-Id: I8e4dc3875ab7cc7cc7d6bd555dba16c82b1a6645
2021-05-17 04:52:59 +00:00