Commit graph

70627 commits

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

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

Change-Id: I8ad39eb7f2ab075f60d03eb123392dc0488d9f72
2021-06-01 22:27:44 +00:00
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
126111579d Merge changes from topic "f2fs-system" into sc-dev am: bce364b9ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14736818

Change-Id: I7e94f4e7efdbd73622ed001ee54d1531454d003f
2021-06-01 22:10:03 +00:00
Jaegeuk Kim
47925ec579 [automerger skipped] Enable --readonly for system compression am: 028f6719f3 -s ours
am skip reason: skipped by user jaegeuk

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

Change-Id: I7258456b1463a95d4f00ab71b1a6179aef82159e
2021-06-01 22:10:02 +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
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
054d602a5c [automerger skipped] Merge "Support AVB signing for BOARD_PREBUILT_BOOTIMAGE" into sc-dev am: 22fb8a4709 -s ours
am skip reason: Merged-In I7ee8b3ffe6a86aaca34bbb7a8898a97b3f8bd801 with SHA-1 cf9ead8972 is already in history

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

Change-Id: Iecce38b4dd55db7e4bb097eb678625776d34e946
2021-05-28 01:01:53 +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
Paul Scovanner
b9e8d95466 [automerger skipped] Update Security String to 2021-07-01 am: 5edc0cec47 am: d8033580ae am: da50045033 am: 81fc2eda95 -s ours am: 6972360246 -s ours am: 8a7f8d8d41 -s ours am: f867606e12 -s ours
am skip reason: Merged-In Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708 with SHA-1 64b00db8f4 is already in history

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

Change-Id: Ia139b9f97c252e1b51f18d825f6d216d3abe37fd
2021-05-27 19:53:18 +00:00
Paul Scovanner
3869cef422 [automerger skipped] Update Security String to 2021-07-01 am: 5edc0cec47 am: d8033580ae am: da50045033 am: 81fc2eda95 -s ours am: 6972360246 -s ours am: ba62cd8b65 -s ours am: ab97d07c9e -s ours
am skip reason: Merged-In Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708 with SHA-1 64b00db8f4 is already in history

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

Change-Id: I070ce346bec443dbae5d0373b5fd44c7fa7f100e
2021-05-27 19:52:58 +00:00
Paul Scovanner
f867606e12 [automerger skipped] Update Security String to 2021-07-01 am: 5edc0cec47 am: d8033580ae am: da50045033 am: 81fc2eda95 -s ours am: 6972360246 -s ours am: 8a7f8d8d41 -s ours
am skip reason: Merged-In Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708 with SHA-1 64b00db8f4 is already in history

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

Change-Id: I1fcaac2e1ccef2b7d1676581ffe08fc55eea5d2f
2021-05-27 19:41:27 +00:00
Paul Scovanner
ab97d07c9e [automerger skipped] Update Security String to 2021-07-01 am: 5edc0cec47 am: d8033580ae am: da50045033 am: 81fc2eda95 -s ours am: 6972360246 -s ours am: ba62cd8b65 -s ours
am skip reason: Merged-In Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708 with SHA-1 64b00db8f4 is already in history

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

Change-Id: Icfac32f812c1e6ba0c81e84d396bc34cb3a39880
2021-05-27 19:24:35 +00: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
Paul Scovanner
8a7f8d8d41 [automerger skipped] Update Security String to 2021-07-01 am: 5edc0cec47 am: d8033580ae am: da50045033 am: 81fc2eda95 -s ours am: 6972360246 -s ours
am skip reason: Merged-In Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708 with SHA-1 64b00db8f4 is already in history

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

Change-Id: Id10a547beac8f5617aedb7e49940dbd02326bb6a
2021-05-27 19:01:25 +00:00
Michael Butler
1cd5fec46b [automerger skipped] Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" am: 63d66d3fe1 am: 9b39bcddb0 -s ours
am skip reason: Merged-In I3fa3092e02e9d1bbf00d801ad68ea754bfbd8c37 with SHA-1 4f436d3760 is already in history

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

Change-Id: I8f0780c03fb349ce894d7d4101ee9d0ce6321c76
2021-05-27 19:01:17 +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
Paul Scovanner
ba62cd8b65 [automerger skipped] Update Security String to 2021-07-01 am: 5edc0cec47 am: d8033580ae am: da50045033 am: 81fc2eda95 -s ours am: 6972360246 -s ours
am skip reason: Merged-In Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708 with SHA-1 64b00db8f4 is already in history

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

Change-Id: I662ee93c4422095b0258b9fb9b36c4daad720ec3
2021-05-27 18:58:26 +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
Michael Butler
9b39bcddb0 Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" am: 63d66d3fe1
Original change: https://android-review.googlesource.com/c/platform/build/+/1711730

Change-Id: Id55bb062a90ba11d48bab985014827583aaa1e15
2021-05-27 18:35:52 +00:00
Paul Scovanner
6972360246 [automerger skipped] Update Security String to 2021-07-01 am: 5edc0cec47 am: d8033580ae am: da50045033 am: 81fc2eda95 -s ours
am skip reason: Merged-In Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708 with SHA-1 64b00db8f4 is already in history

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

Change-Id: I4e539beb31b6713c28ded0589f03c23e549718d7
2021-05-27 18:32:35 +00:00
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
Michael Butler
63d66d3fe1 Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" 2021-05-27 18:05: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
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
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 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 Xu
f4ca0567dd Merge "Check super size for factory OTA at build time" 2021-05-26 21:33:14 +00:00
Kelvin Zhang
eb6e3cbb4e Merge "Validate AVB props in vbmeta image" am: ea7c944d62 am: 268e520fd4
Original change: https://android-review.googlesource.com/c/platform/build/+/1717570

Change-Id: I6faed81431aea36cf69703a9fc6e94c90329c9c7
2021-05-26 21:28:00 +00:00
Kelvin Zhang
268e520fd4 Merge "Validate AVB props in vbmeta image" am: ea7c944d62
Original change: https://android-review.googlesource.com/c/platform/build/+/1717570

Change-Id: I649a7567909abf75314a71a5343ead741dc1bd31
2021-05-26 21:00:54 +00:00
Kelvin Zhang
ea7c944d62 Merge "Validate AVB props in vbmeta image" 2021-05-26 20:41:17 +00:00
Jaegeuk Kim
028f6719f3 Enable --readonly for system compression
This option is to reduce system partition size.

Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Idc849cfce33ac0badb2b9b7953bb821c46a24472
2021-05-26 13:11:28 -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
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
Kelvin Zhang
4093d60f35 Validate AVB props in vbmeta image
Bug: 183055693
Test: th
Test: validate_target_files signed-redfin-target_files-7119741.zip

Change-Id: I027d474ba3eb6af5e05866551ff9ea506825a326
2021-05-26 17:59:24 +00:00
TreeHugger Robot
d16e8a7f95 [automerger skipped] Merge "[memtag] Disable memtag for AndroidMk host modules." into sc-dev am: e9e08e9e91 -s ours
am skip reason: Merged-In Ifedff39f2f03c08bfb644221d2ab1b88e635c8a3 with SHA-1 b71a875bba is already in history

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

Change-Id: Ib26f71e6b355be5b0acdb4206588d0a61766fa1d
2021-05-26 17:49:50 +00: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
Jiyong Park
32afff1de8 Merge "Updated vndk library list after aidl-freeze-api" into sc-dev am: 33e79ba41e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14673216

Change-Id: Ia82cb4d79ed0aa916e26e2adaa703644fc4c1880
2021-05-26 11:24:02 +00:00