Commit graph

1329 commits

Author SHA1 Message Date
SzuWei Lin
606904d0b8 Remove TARGET_ENABLE_MEDIADRM_64 from BoardConfigGsiCommon.mk
The setting doesn't affect system image.

Bug: 239141283
Change-Id: I210add4cd76797bd181923ad8ec439cb96d0ac7c
2022-07-15 07:56:48 +00:00
SzuWei Lin
dab11d367d Merge "Support dynamic 64-bit media service" am: aba99adea4
Original change: https://android-review.googlesource.com/c/platform/build/+/2144759

Change-Id: I9b5a60c8630a082e72eb1dc803f50b56ad03a2e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:38:17 +00:00
SzuWei Lin
951279493d Support dynamic 64-bit media service
64-bit GSI requires support both 64_32-bit and 64-bit devices at
the same time. Add a new variable TARGET_DYNAMIC_64_32_MEDIASERVER
to put mediaserver_dynamic.rc into GSI. Which starts 64-bit
mediaserver if ro.zygote is zygote64. Otherwise, it keeps the
original behavior to start 32-bit meidaserver.

Bug: 236664614
Test: make gsi_arm64-user; Check system/etc/init
Test: make gsi_arm-user; Check systen/etc/init
Test: cts-tradefed; run cts-on-gsi -m CtsViewTestCases
Change-Id: I74699ec5fafadcbe78a7fef6d10aaed752cd5afa
2022-07-06 12:06:46 +08:00
Jiakai Zhang
04ed50089e Merge "Set TARGET_USES_64_BIT_BINDER for mainline_sdk." am: d02946c4c3 am: 21d0333357
Original change: https://android-review.googlesource.com/c/platform/build/+/2121572

Change-Id: I2f895f8dd1ee68f10b0bf92f5af72e88f8be5100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 10:12:19 +00:00
Jiakai Zhang
f5637f94fe Set TARGET_USES_64_BIT_BINDER for mainline_sdk.
Devices are all using 64 bit binder, and mainline_sdk should too.
According the comment here: https://cs.android.com/android/platform/superproject/+/master:build/make/target/board/BoardConfigMainlineCommon.mk;l=25;drc=6e7693f1597a0934833a72faf35e918dfbdb6ecd,
this flag is required even for non-64 bit devices.

`libbinder` doesn't compile on host with 32 bit binder.

Test: packages/modules/common/build/mainline_modules_sdks.sh \
        --build-platform-sdks-for-mainline --build-release=latest
Change-Id: I357ce42e88ad13ed259d573b9dd2bbfc27b82687
2022-06-10 14:35:53 +01:00
Martin Stjernholm
e0d25da43d Merge "Add a product for building linux_bionic in --soong-only mode." am: 0f96329283 am: fbf8cd8b00
Original change: https://android-review.googlesource.com/c/platform/build/+/2063871

Change-Id: I5f1a0f2800475784acffc8e17891cf58c959d2aa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 17:50:28 +00:00
Martin Stjernholm
0f96329283 Merge "Add a product for building linux_bionic in --soong-only mode." 2022-04-25 16:54:49 +00:00
Treehugger Robot
df0327b8ad Merge "Add boot AVB key setting to GSI" am: f9fcd028df am: d02479f849 am: 7ab456ee2a
Original change: https://android-review.googlesource.com/c/platform/build/+/2068887

Change-Id: Ic62f5c94f4159e5442204ccc11d9aa1865d2d132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:18:43 +00:00
Martin Stjernholm
2d068b59e6 Add a product for building linux_bionic in --soong-only mode.
Modelled after the mainline_sdk product.

Test: build/soong/soong_ui.bash --make-mode --soong-only \
        SOONG_ALLOW_MISSING_DEPENDENCIES=true \
        TARGET_PRODUCT=linux_bionic com.android.art.host
Bug: 31559095
Bug: 229123823
Change-Id: I6051d21cc4bae561e987561ddad5f1ec5435c4ca
2022-04-20 16:58:29 +01:00
SzuWei Lin
97064c53ff Add boot AVB key setting to GSI
Signing tool assumes GSI targets has boot.img and get error without
these settings.

Bug: 229814765
Change-Id: I1e8e7f6375e396e1c2feb858b97e7d27dc5a2dec
2022-04-20 07:20:45 +00:00
Treehugger Robot
fdfbd833eb Merge "Non-module targets." am: ff15a27bd7 am: 7c30a61bc6 am: 6687e127b0
Original change: https://android-review.googlesource.com/c/platform/build/+/2055031

Change-Id: I5a6aa6499b4c39a8933ffee3d622023f2e8e0bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:43:09 +00:00
Treehugger Robot
ff15a27bd7 Merge "Non-module targets." 2022-04-11 19:42:29 +00:00
SzuWei Lin
c9d8f2dde1 Merge "Support building EROFS for GSI targets" am: 36fc586e07 am: f1d3b2638b am: f68f5fd173
Original change: https://android-review.googlesource.com/c/platform/build/+/2052705

Change-Id: If425b06759d9c0a3f179ad34cf59818945c9569c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 09:49:02 +00:00
Bob Badour
3a0f0c157e Non-module targets.
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses

Change-Id: Ia7cddef9748f6c036a2fc7539dad717ebc131f7c
2022-04-07 22:03:29 -07:00
SzuWei Lin
0c791bedb4 Support building EROFS for GSI targets
The EROFS is planned to replace the ext4 as the file system format
of readonly partitions. This patch is enabling the ability to
build GSI with EROFS. The usage is

  $ GSI_FILE_SYSTEM_TYPE=erofs make -j

Bug: 227552340
Test: lunch gsi_arm64-user; GSI_FILE_SYSTEM_TYPE=erofs make -j
Test: Verify the file system format of system.img
Change-Id: Ie815002c677d099c4db0ab7ca22db16ac6123659
2022-04-07 07:11:24 +00:00
Treehugger Robot
7003c45166 Merge "Remove GKI from gsi_$arch" am: 9fee6befad am: 9b0c214673 am: 197e0be8ef
Original change: https://android-review.googlesource.com/c/platform/build/+/1936198

Change-Id: Id62f2a0f140183f1b2c767f1d097a0d434bad114
2022-03-16 08:41:49 +00:00
Treehugger Robot
9fee6befad Merge "Remove GKI from gsi_$arch" 2022-03-16 07:07:46 +00:00
Ramji Jiyani
c3b0cc5fde Pixel Common: system_dlkm: avb hashtree footer
Add avb hashtree footer args for the system_dlkm
partition required for the T launch devices.

Bug: 222334390
Test: TH, manual build, Code testing gs101 & R6
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I7a28ccfa2acad2e20c35a8a68edbffcca068678e
2022-03-02 12:38:10 -08:00
Anton Hansson
3327b9fc79 Add an ndk product and device
This adds a product that generates a soong.variables config similar to
the one manually maintained for the ndk build at the moment.

Bug: 174315599
Test: TARGET_PRODUCT=ndk m nothing && inspect out/soong/soong.variables
Change-Id: Ia10079b8a1ed8edf4efa2a6a5b04a079eece5360
2022-02-23 13:25:59 +00:00
SzuWei Lin
eec848fd6a Remove GKI from gsi_$arch
After having gki_$arch, there is no longer need for building GKI
by target gsi_$arch. The BoardConfigGkiCommon.mk is also moved
to /device/generic/common. The patch removes all GKI related
settings and files from target gsi_$arch.

Bug: 212486689
Test: build dist of gsi_arm64-userdebug
Test: build dist of aosp_arm64-userdebug
Change-Id: I369f42ad1f6e3f519bb62c3f035e699df1c7468f
2022-01-21 11:54:12 +08:00
Yi-Yo Chiang
cd6de3d8bb Remove GKI_SIGNING args from recovery & debug boot image build rules
These options are for certifying official GKI release, so they should
never be added to build command of recovery.img and boot-debug.img.

Also define gki_signing_signature_args in misc_info.txt iff.
BOARD_GKI_SIGNING_KEY_PATH is defined, so there's one less conditional.
We need to define it even if BOARD_GKI_SIGNING_SIGNATURE_ARGS is empty,
so that sign_target_files_apks.py can modify the option during image
signing.

Bug: 210367929
Test: Presubmit
Change-Id: I9546fcda796586d97af244955e15c1b8dc9f6d92
2022-01-05 02:59:45 +00:00
Jiyong Park
83ac8b7481 Revert "Set VNDK version to current for module builds"
This reverts commit af35677f03.

Bug: 185769808
Test: banchan com.android.media.swcodec module_arm64; m apps_only dist
Test: banchan com.android.media.swcodec aosp_arm64; m apps_only dist

In both cases, the built APEX doesn't have libsync.so in it.
apex_manifest.pb has libsync.so as requireNativeLibs.

Change-Id: I62397d50a6970a9316f0d6ddd36736f149bc7c2c
2021-10-12 13:45:50 +09:00
Treehugger Robot
93152fc87a Merge "Revert "Stop building boot-debug-*.img for GKI"" am: 8681e5ac2a
Original change: https://android-review.googlesource.com/c/platform/build/+/1845113

Change-Id: Ie7f16d55760fe866c47aecb3994b77bf7cde60cd
2021-10-06 05:45:29 +00:00
Yi-Yo Chiang
a62cc8a864 Revert "Stop building boot-debug-*.img for GKI"
This reverts commit f1679a0c1d.

Reason for revert: Unintentionally affects downstream, non-GSI-GKI products

Change-Id: Ic439ac586b9f27c7f83d0274f8ddfc6199cc05d5
2021-10-05 10:40:23 +00:00
Treehugger Robot
1508e90b94 Merge "Stop building boot-debug-*.img for GKI" am: 94ce4dbe2f
Original change: https://android-review.googlesource.com/c/platform/build/+/1839817

Change-Id: Id9f6eba26d02d1326fc6d8afbc318a76a0961a7b
2021-10-04 07:53:59 +00:00
Yi-Yo Chiang
f1679a0c1d Stop building boot-debug-*.img for GKI
GKI devices should be using vendor_boot-debug.img from their device
build instead.

Bug: 200945738
Test: Presubmit
Change-Id: I4ff19f8ccef9befc826c02a628cc15f5d2f68b10
2021-09-30 12:52:59 +00:00
Treehugger Robot
36ebb662c3 Merge "Clean up gki-5.4 related rules in GSI" am: 389170f9ec
Original change: https://android-review.googlesource.com/c/platform/build/+/1825192

Change-Id: I6db74dc855b814c00ee8cb90628b673633ae3d44
2021-09-16 09:38:52 +00:00
Howard Chen
cb6ea4a2a7 Clean up gki-5.4 related rules in GSI
There will be no android13-5.4. This CL is to clean up build rules
that refers to the gki-5.4.

Bug: 199807830
Test: lunch aosp_arm64-userdebug
Change-Id: Ia982eb2ee3d1eb64db72c1836e433bcc53e71e3f
2021-09-14 03:38:06 +00:00
Treehugger Robot
0d3f6e6f11 Merge "Sets BOOT_SECURITY_PATCH for the generic boot.img" am: 94bd6d7d5b am: e4348ac729
Original change: https://android-review.googlesource.com/c/platform/build/+/1773887

Change-Id: I25c2482ce5b9e62d72bf2182d36ec12368acf00d
2021-07-23 02:20:11 +00:00
Bowgo Tsai
81a23fed56 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
2021-07-22 16:09:05 +08:00
Treehugger Robot
86866377f7 Merge "Include kernel-*-allsyms into boot-*-allsyms.img" am: 0427fb4a97 am: 807d80a6e7
Original change: https://android-review.googlesource.com/c/platform/build/+/1749896

Change-Id: I5da0d0c23060d5f6a0fcfbfe3fe60e1af73084da
2021-06-30 09:17:59 +00:00
SzuWei Lin
0351d9da61 Include kernel-*-allsyms into boot-*-allsyms.img
The patch fixes the boot-*-allsyms.img of gsi_arm64-userdebug to
pack the kernel with allsyms instead of without allsyms.

Bug: 192318869
Test: build gsi_arm64-userdebug; check the kernel in boot-*-allsyms.img
Test: build gsi_x86_64-userdebug; check the kernel in boot-*-allsyms.img
Change-Id: Ic89dbe27e166d57283c7bef574d525863d20e79f
2021-06-29 10:40:48 +00:00
Treehugger Robot
b4681f81d3 Merge "Remove GKI APEX from build." am: bee97a2052 am: e8e08623a2
Original change: https://android-review.googlesource.com/c/platform/build/+/1746695

Change-Id: I85e4edb8e41d421a8a3856825983c1c225178788
2021-06-25 00:39:17 +00:00
Treehugger Robot
bee97a2052 Merge "Remove GKI APEX from build." 2021-06-25 00:08:51 +00:00
Yifan Hong
b948d59876 Remove GKI APEX from build.
Test: pass
Bug: 191954621
Change-Id: I4150c81fbe2446849608ac8dabee674485ba16c4
2021-06-24 12:11:34 -07:00
Treehugger Robot
064b7a58fd Merge "android-info.txt: do not output 'board=' if no board_name" am: 65f4412cc8 am: 2c9ae905cb
Original change: https://android-review.googlesource.com/c/platform/build/+/1726355

Change-Id: Ifc6964f9757822bdb6ec4aa13f0a8735abb4684f
2021-06-18 07:27:41 +00:00
SzuWei Lin
870752dfd2 Remove mainline boot.img from GSI targets
Originally, the mainline kernel is for Android12.
The mainline kernel is changing to the next Android version.
We don't need to includes mainline boot.img in GSI targets.

Bug: 191120961
Test: TH and check the built result
Change-Id: Icd7677f362077eb675760d51a8f01c5db8baf7e1
2021-06-15 16:43:46 +08:00
Bowgo Tsai
9346c4e2ad android-info.txt: do not output 'board=' if no board_name
If no board name, output nothing to the android-info.txt.
Currently the output of 'board=' might trigger some parsing error
on some clients.

Bug: 189990989
Test: make out/target/product/generic_arm64/android-info.txt
Change-Id: Ia9aab6c092c07349aa57f0e73f8c69b6e05874c1
2021-06-03 17:54:31 +08:00
Hsin-Yi Chen
6968d4dc9c Add GKI to generic x86_64 board
- Remove emulator configurations from generic_x86_64/device.mk.
- Add GKI configurations to generic_x86_64/device.mk.

Test: lunch gsi_x86_64-userdebug ; make dist
Bug: 181277965
Change-Id: I43c8005afcaeec6ed70648b5f74eeed1d46f9228
Merged-In: I43c8005afcaeec6ed70648b5f74eeed1d46f9228
(cherry picked from commit b212b0a92a)
2021-05-20 03:22:27 +00:00
SzuWei Lin
dea57a49e2 Move GKI common settings to BoardConfigGkiCommon.mk
There are GKI arm64 and x86_64 now. The patch restructures the
GKI common settings to a new common BoardConfig file
"BoardConfigGkiCommon.mk".

It includes the ramdisk and boot image settings for GKI.
The patch also removes obsolete TARGET_PRELINK_MODULE.

Bug: 177859525
Bug: 181277965
Test: lunch gsi_arm64-userdebug ; make dist
Test: lunch gsi_x86_64-userdebug ; make dist
Change-Id: I204c8937d97140cc3c6ed3473d494f03f534ed75
Merged-In: I204c8937d97140cc3c6ed3473d494f03f534ed75
2021-05-19 09:00:16 +00:00
Hsin-Yi Chen
b212b0a92a Add GKI to generic x86_64 board
- Remove emulator configurations from generic_x86_64/device.mk.
- Add GKI configurations to generic_x86_64/device.mk.

Test: lunch gsi_x86_64-userdebug ; make dist
Bug: 181277965
Change-Id: I43c8005afcaeec6ed70648b5f74eeed1d46f9228
2021-05-18 02:30:50 +00:00
SzuWei Lin
a74ea7e569 Move GKI common settings to BoardConfigGkiCommon.mk
There are GKI arm64 and x86_64 now. The patch restructures the
GKI common settings to a new common BoardConfig file
"BoardConfigGkiCommon.mk".

It includes the ramdisk and boot image settings for GKI.
The patch also removes obsolete TARGET_PRELINK_MODULE.

Bug: 177859525
Bug: 181277965
Test: lunch gsi_arm64-userdebug ; make dist
Test: lunch gsi_x86_64-userdebug ; make dist
Change-Id: I204c8937d97140cc3c6ed3473d494f03f534ed75
2021-05-17 01:53:17 +00:00
Yifan Hong
289141549d Merge "Rectify KMI version." am: c05ef17e31 am: 655e6a2c64 am: 51e07f62db
Original change: https://android-review.googlesource.com/c/platform/build/+/1706146

Change-Id: If66a79a2dea904e509216bbd8ca80a73a95fa3c3
2021-05-13 20:31:34 +00:00
Yifan Hong
29c1639715 Rectify KMI version.
Test: builds
Bug: 187913647
Bug: 187432172
Change-Id: Ic01c385b3474c78c5ac2da3b1a5a253eb241ed9b
2021-05-12 14:28:19 -07:00
Treehugger Robot
4ea660a62d Merge "Fix GKI 2.0 signing in the release process" am: 328a537e37 am: bde804c8cf am: daab4cb7c6
Original change: https://android-review.googlesource.com/c/platform/build/+/1699576

Change-Id: I939155566577ae36fd7626a080b2187919458222
2021-05-11 14:08:19 +00:00
Bowgo Tsai
7bcb55b414 Fix GKI 2.0 signing in the release process
In the release signing process, it uses --signing_helper_with_files
for avbtool. This can be done by passing
--gki_signing_signature_args="--signing_helper_with_files=/path/to/helper.sh"
for mkbootimg.

However, this only works when there is a default value of
"gki_signing_signature_args" in the misc_info.txt, to be appended
with more extra args. Adding a default value "--prop foo:bar" to make
it work.

Note: also move the BOARD_GKI_* signing config to
BoardConfigGsiCommon.mk, so we don't have to duplicate the settings
for each architecture.

Bug: 178559811
Bug: 177862434
Test: `make bootimage`
      `unpack_bootimg --boot_img $OUT/boot.img --out unpack`
      `avbtool info_image --image ./unpack/boot_signature`
Change-Id: I8bd8ad3acf324931b47d45fd30bc590206b1927e
2021-05-11 18:10:18 +08:00
Yifan Hong
4ec807cb77 Merge "Fix the KMI version mismatch" am: 27ec5744f5 am: f23a5dc45d am: e7774805d5
Original change: https://android-review.googlesource.com/c/platform/build/+/1681973

Change-Id: Idbac1eb8831ffd3234c242cb826dc50504a0420e
2021-05-07 20:00:58 +00:00
Yifan Hong
27ec5744f5 Merge "Fix the KMI version mismatch" 2021-05-07 19:18:15 +00:00
Howard Chen
a6bfa06b6c Fix the KMI version mismatch
Delete 5.10-android12 because it is not frozen yet.

Bug: 185445182
Bug: 186647770
Bug: 187432172
Test: build aosp_cf_arm64_phone-eng

Change-Id: Ic28cd0078ba65f92f6867c6106c1d70f442b7040
2021-05-06 19:22:51 +00:00
Treehugger Robot
4be97eae2f Merge "Usee sha256 to build the hashtree in GSI image" am: f1d8833075 am: 1fa3d79a24 am: c4ad3b6d10
Original change: https://android-review.googlesource.com/c/platform/build/+/1696885

Change-Id: I9d4d92353fe0a3eea6510399e086739043c9e67e
2021-05-05 11:11:43 +00:00
Bowgo Tsai
60074168da Usee sha256 to build the hashtree in GSI image
The default algorithm is sha1, which shouldn't be used now.
Becaues sha256 is more robust against malicious attacks.

Bug: 187021780
Test: TreeHugger
Change-Id: Ia325f59d09687d6d501d9710cbdd3339d7566c60
2021-05-05 12:27:09 +08:00
Anton Hansson
1da778ce91 Merge "Set VNDK version to current for module builds" am: 85c91dcee9 am: 4daa3fb610 am: ae6fb60a0b
Original change: https://android-review.googlesource.com/c/platform/build/+/1679349

Change-Id: I6f08948fe90e9a9400cd5e47eaa3f575b2ff9553
2021-04-22 14:00:20 +00:00
Anton Hansson
d7995cc8e7 Set VNDK version to current for module builds
This setting changes which libraries are included in the media.swcodec
apex, and is a step on the way of eliminating the differences when
building between module_arm64 and aosp_arm64.

Bug: 185769808
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Change-Id: Iafb0194827f984a7ba108f519016d24b2980e2e1
2021-04-21 09:58:51 +01:00
Treehugger Robot
2ba225f9f0 Merge "Enable GKI 2.0 signing" am: 214382e048 am: d8d232e23f am: 6cfc347cd5
Original change: https://android-review.googlesource.com/c/platform/build/+/1659680

Change-Id: I53bef0efb5db7b4d321bc9c883d6823a87e492c2
2021-04-15 08:07:36 +00:00
Roman Kiryanov
1eaa526e97 Merge "Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4" am: ac46742e38 am: 56c9341ba1 am: 3f988435a7
Original change: https://android-review.googlesource.com/c/platform/build/+/1676586

Change-Id: I3e38f8fd604c36f9c3223c4509ae3e9fdf3a8838
2021-04-15 08:07:27 +00:00
Treehugger Robot
214382e048 Merge "Enable GKI 2.0 signing" 2021-04-15 06:08:04 +00:00
Roman Kiryanov
0a2ef54d3b Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4
required for androidboot

Bug: 182291166
Test: boot emulator
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ib17f2ec6fb04eb8c7f592ec2a5d6cc886ad783c8
2021-04-14 18:18:08 -07:00
Bowgo Tsai
c1bb0247fb Enable GKI 2.0 signing
This is to check the interity of a generic boot.img.

Note: build/make/target/product/gsi/testkey_rsa2048.pem is generated by:
      `openssl genrsa -out testkey_rsa2048.pem 2048`.

Bug: 177862434
Test: `make bootimage`
      `unpack_bootimg --boot_img $OUT/boot.img --out unpack`
      `avbtool info_image --image ./unpack/boot_signature`
Change-Id: I12ea4c666f71ad6b6c245d629e41904eb8d90858
2021-04-14 23:26:14 +08:00
SzuWei Lin
a656a7361a Merge "Export prebuilt-info.txt of perbuilts kernel to dist" am: d58ae982cf am: 3a0acd5dbe am: 344e6d261b
Original change: https://android-review.googlesource.com/c/platform/build/+/1652239

Change-Id: Ia4d336d6137c710efe027357103e16aba914bc7b
2021-04-08 12:31:42 +00:00
SzuWei Lin
6ef237b9d0 Export prebuilt-info.txt of perbuilts kernel to dist
aosp_arm64 and gsi_arm64 build the boot.img binaries with prebuilt
kernels.Exporting the prebuilt-info.txt in dist folder makes to
easier to see which kernel build on AndroidCI.

Bug: 183504624
Test: lunch gsi_arm64-userdebug; make -j dist
Change-Id: I18f63af8588ced93e57b9d24e3b196d6f5694e72
2021-03-25 18:03:10 +08:00
Treehugger Robot
b1fc88399a Merge "Allow BOARD_VNDK_VERSION to be changed" am: 0181c7d33c am: 0fa0300013 am: 9831e65e7c
Original change: https://android-review.googlesource.com/c/platform/build/+/1608053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d8ef55f5276cf90e77505d9bb91bf1e0ea8b306
2021-03-02 19:54:13 +00:00
Inseob Kim
6e7693f159 Allow BOARD_VNDK_VERSION to be changed
Some devices e.g. cuttlefish include BoardConfigMainlineCommon.mk.
This allows BOARD_VNDK_VERSION to be changed other than current, to
allow mixed build experiment with BOARD_VNDK_VERSION.

Test: try setting BOARD_VNDK_VERSION and get_build_var
Change-Id: I7eb7fe6527f24ee2a3b4af32194a48ca98146a78
2021-02-25 21:22:27 +09:00
Roman Kiryanov
d3ce517627 Merge "Revert "Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish"" am: 52037cf027 am: 3cc2b4c489 am: d5fff8a680
Original change: https://android-review.googlesource.com/c/platform/build/+/1605133

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia487f8adaaf04488e68b0d3c65c24ae238484536
2021-02-24 21:54:53 +00:00
Roman Kiryanov
52037cf027 Merge "Revert "Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish"" 2021-02-24 18:26:30 +00:00
Inseob Kim
6952cb3583 Revert "Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish"
This reverts commit 05d595194b.

Reason for revert: fixed all goldfish properties

Change-Id: I7b6bf6c4fa94e0d6ba44dbc37b6451291e8fc9ad
2021-02-24 05:27:18 +00:00
Treehugger Robot
e7b5f3143c Merge changes from topic "vendor_property_enforce" am: 32b84909a1 am: b1cb721609 am: 1011fd35a5
Original change: https://android-review.googlesource.com/c/platform/build/+/1571847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53890953d1b5227d3d1e11d5d432468803f86eda
2021-02-17 08:53:27 +00:00
Treehugger Robot
32b84909a1 Merge changes from topic "vendor_property_enforce"
* changes:
  Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish
  Add BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE to BoardConfig
  Add PRODUCT_SHIPPING_API_LEVEL to productVariables
2021-02-17 07:12:30 +00:00
Treehugger Robot
df0880a6d8 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: 14201eb3a3 am: 27d927752e am: 11fc9e03e2
Original change: https://android-review.googlesource.com/c/platform/build/+/1589084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I868c39bb0d7efa427c63797ab2da8e7fb82c4132
2021-02-16 01:02:06 +00:00
Bob Badour
0390580262 [LSC] Add LOCAL_LICENSE_KINDS to build/make
Added SPDX-license-identifier-Apache-2.0 to:
  target/product/sysconfig/Android.bp
  tools/apicheck/Android.bp
  tools/product_config/Android.bp
  tools/releasetools/Android.bp
  tools/signapk/Android.bp
  tools/signtos/Android.bp
  tools/zipalign/Android.bp
  tools/ziptime/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CC-BY SPDX-license-identifier-GPL
    SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL
    SPDX-license-identifier-MIT legacy_not_a_contribution
    legacy_restricted
to:
  Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CC-BY SPDX-license-identifier-GPL
    SPDX-license-identifier-MIT
to:
  tools/Android.bp
  tools/droiddoc/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0
    SPDX-license-identifier-LGPL SPDX-license-identifier-MIT
to:
  core/base_rules.mk
  core/dex_preopt_libart.mk
  core/package_internal.mk

Added SPDX-license-identifier-Apache-2.0 legacy_not_a_contribution
to:
  target/board/Android.mk

Added legacy_restricted
to:
  core/tasks/tools/package-modules.mk
  target/product/gsi/Android.bp
  target/product/gsi/Android.mk
  target/product/security/Android.bp
  target/product/security/Android.mk
  tools/acp/Android.bp
  tools/atree/Android.bp
  tools/fs_config/Android.bp
  tools/fs_config/Android.mk
  tools/fs_get_stats/Android.bp
  tools/libhost/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Id67a4eb1312940f999643b2ae57f45f34f120724
2021-02-14 10:37:20 -08:00
Martin Stjernholm
900c7b49a1 Merge "Merge the module_* device.mk files into their corresponding product mk files." am: c7e1bdfede am: 2e6a0e59d4 am: 4e3ba6b5c8
Original change: https://android-review.googlesource.com/c/platform/build/+/1570300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I430efca87b8e04f7df2ab625f88387aebf5b49bd
2021-02-03 17:51:50 +00:00
Inseob Kim
05d595194b Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish
device/generic/goldfish/sepolicy/common/property_contexts still contains
violations, so temporarily setting build_broken to relax vendor property
check.

Bug: 176210699
Test: m vendor_property_contexts
Change-Id: Ia7d7830a7e994fd0766fd8854524bb6f9fa5cce6
2021-02-03 18:35:37 +09:00
Martin Stjernholm
4ca749cb11 Merge the module_* device.mk files into their corresponding product mk
files.

To clean up an unnecessary indirection. Instead introduce a common file
for module products.

Test: lunch module_{arm,arm64,x86,x86_64}
      inspect the build banners
Change-Id: Ia312431a664e731f5d801ee2671f62f5cd23bd51
2021-02-02 11:32:25 +00:00
Treehugger Robot
31f86aa67b Merge "Disable BLE_VND_INCLUDED in GSI" am: ee7aa0906c am: 3f5064ae05 am: 82389f1dd5
Original change: https://android-review.googlesource.com/c/platform/build/+/1398276

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80085ce0ad241e96c665c3e576806ae8b3287797
2021-01-26 11:18:55 +00:00
Treehugger Robot
ee7aa0906c Merge "Disable BLE_VND_INCLUDED in GSI" 2021-01-26 09:18:51 +00:00
Ulya Trafimovich
347be4037e resolve merge conflicts of 56bf7ca8c9 to master
Test: DIST_DIR=$PWD/dist \
    TARGET_BUILD_VARIANT=userdebug \
    vendor/google/build/build_mainline_modules.sh
Bug: None
Change-Id: I66049dfb90c2583ea6687ac3353e3ce3eb973bd4
2021-01-20 12:44:40 +00:00
Nicolas Geoffray
897fe0e8df Split out minimal ART dexpreopt config and use it in mainline builds.
The config sets a few system properties that end up in command-line
arguments passed to dex2oat. Without these properties dex2oat invocation
fails, because options -Xms and -Xmx are do not have an argument.

Test: buid_mainline_modules.sh
Bug: 176171716
Change-Id: I4fd1f059aad5d48495948bfd668307de8b3d9ee1
2021-01-19 17:03:30 +00:00
Anton Hansson
0bafe32068 Use 64 bit binder in module builds
Add a new BoardConfigModuleCommon for settings of this sort.

Bug: 176840868
Test: forrest module coverage build
Merged-In: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
Change-Id: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
(cherry picked from commit c0423c8dae)
2021-01-13 11:05:20 +00:00
Presubmit Automerger Backend
a43fb599c0 [automerge] Use 64 bit binder in module builds 2p: c0423c8dae
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13327146

Change-Id: Id34b5541f7b362d1418fe42697677cd7036ecd31
2021-01-13 11:05:13 +00:00
Anton Hansson
c0423c8dae Use 64 bit binder in module builds
Add a new BoardConfigModuleCommon for settings of this sort.

Bug: 176840868
Test: forrest module coverage build
Change-Id: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
2021-01-13 11:04:02 +00:00
Yifan Hong
552f36c2f2 Merge "Add 5.10-android12-0 KMI for generic_arm64" am: 1ed887f2c3 am: 42de1ac4c0 am: da6e54d6cb
Original change: https://android-review.googlesource.com/c/platform/build/+/1531942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ceb59b8093d4bb2879b0d0a45792dca1cc2e6e4
2021-01-07 22:34:55 +00:00
Yifan Hong
1ed887f2c3 Merge "Add 5.10-android12-0 KMI for generic_arm64" 2021-01-07 21:23:10 +00:00
Yifan Hong
f57771a299 Add 5.10-android12-0 KMI for generic_arm64
... to build 5.10 GKI APEXes.

Test: TH
Bug: 160995535
Change-Id: I822ac73e8fc23cb957f748d4e6becdc3f7ac9567
2021-01-05 11:51:32 -08:00
Isaac Chen
b835f3aee3 Merge "Update GF board variable for dynamic partition" am: a886df692e am: 471db4c7c5 am: d180c32852
Original change: https://android-review.googlesource.com/c/platform/build/+/1535670

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac31ecb625100b6c2240d0fbc5b15befe8e6d8f6
2020-12-30 03:32:57 +00:00
Isaac Chen
c311ff6b68 Update GF board variable for dynamic partition
Goldfish specific board variable:

BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE

is used to create misc_info.txt, which is needed to mix GSI or CSI on
Goldfish vendor image, and need to reflect the size of the current
super.img, which is now set to 4G+8M (from 3G+8M previously).

Bug: 174442566
Test: $ lunch aosp_x86_arm-userdebug; m
      $ ls -l $OUT/super.img	# make sure it's 4 GB
      $ grep -i dynamic_partitions_group_size $OUT/misc_info.txt
      super_emulator_dynamic_partitions_group_size=4294967296
Change-Id: Idd0fb302b20780ac97959fabec231a632205d46d
2020-12-25 06:14:43 +00:00
Isaac Chen
da255b5cdc Merge "Increase the size of super.img for Goldfish" am: 3aa08cfa94 am: a675bc6d18 am: d1306c0df2
Original change: https://android-review.googlesource.com/c/platform/build/+/1534301

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38006ba30aaf803b05105a3ccef7b91e32faa70c
2020-12-22 18:16:14 +00:00
Isaac Chen
3aa08cfa94 Merge "Increase the size of super.img for Goldfish" 2020-12-22 16:56:49 +00:00
Anton Hansson
3ce9d68bd3 Merge "Add mainline_sdk device and product" am: 6d10bf974a am: 87e92d6e57 am: 96fb33a5d1
Original change: https://android-review.googlesource.com/c/platform/build/+/1512778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d11513357f5ea21e84668529f1d9534e83f78f8
2020-12-22 13:07:48 +00:00
Anton Hansson
6d10bf974a Merge "Add mainline_sdk device and product" 2020-12-22 11:40:32 +00:00
Isaac Chen
91a641324c Increase the size of super.img for Goldfish
Current super image for GF is almost full in sdk_gphone_x86_arm
product, and not big enough to include CSI for mixed configuration,
which is a bit bigger than the system image of sdk_gphone_x86_arm.

Bug: 174442566
Test: $ lunch aosp_x86_arm-userdebug; m
      $ ls -l $OUT/super.img	# make sure it's 4 GB
Change-Id: Ia2473231c8490995a10700cbd6e0f82598a5e078
2020-12-22 03:43:26 +00:00
Anton Hansson
dc9a98bfd7 Merge "Add devices suitable for single-arch module builds" am: df38c92dd1 am: 1997f2c6d8 am: 8719b81073
Original change: https://android-review.googlesource.com/c/platform/build/+/1511789

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45b90df6605fc70c2e5b97a8a23ed5cbb8786d9f
2020-12-16 12:02:23 +00:00
Anton Hansson
82996e4bbc Add devices suitable for single-arch module builds
Prior to this the generic_* devices were typically used for this
purpose. There are a few reasons to create new specific ones:
- the generic_arm64 device has a hack specifically for building
  multi-arch packages that we want to avoid
- the generic_* devices include a bunch of emulator config that does not
  make sense for unbundled builds

Bug: 172256440
Test: verify unbundled builds migrated from generic_* don't change
Change-Id: Ia937461aa24a5d5b542f8688a1b71ac3fdeb596b
2020-12-15 18:59:40 +00:00
Anton Hansson
f68f92d3d5 Add mainline_sdk device and product
This device/product is suitable for a soong-only build that builds for
all the architectures needed for mainline modules sdk prebuilts.

Bug: 174315599
Test: TARGET_PRODUCT=mainline_sdk soong_ui --make-mode --skip-kati;
      (inspect soong.variables)
Change-Id: I3ab5d3611e25a666de39752dedaddbf32ddf6df7
2020-12-15 12:48:37 +00:00
Anton Hansson
bbd95df172 Add devices suitable for single-arch module builds
Prior to this the generic_* devices were typically used for this
purpose. There are a few reasons to create new specific ones:
- the generic_arm64 device has a hack specifically for building
  multi-arch packages that we want to avoid
- the generic_* devices include a bunch of emulator config that does not
  make sense for unbundled builds

Bug: 172256440
Test: verify unbundled builds migrated from generic_* don't change
Merged-In: Ia937461aa24a5d5b542f8688a1b71ac3fdeb596b
Change-Id: Ia937461aa24a5d5b542f8688a1b71ac3fdeb596b
2020-12-15 11:42:39 +00:00
Tianjie Xu
f6b0177efc Merge "Use sha256 to build the hashtree in avb image" am: 7d958f4fd0 am: 5e1d91756b am: f6dcbbe401
Original change: https://android-review.googlesource.com/c/platform/build/+/1518920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38e818e1fc340943ce675bb4247691b121f11cc1
2020-12-11 21:47:09 +00:00
Tianjie Xu
7d958f4fd0 Merge "Use sha256 to build the hashtree in avb image" 2020-12-11 20:56:05 +00:00
Tianjie
055128bf10 Use sha256 to build the hashtree in avb image
The hashtree is used in verified boot, and sha256 is more robust against
malicious attacks. Also, sha256 uses the same space as sha1 in the
hashtree. And there isn't much performance regression per
https://b.corp.google.com/issues/156162446#comment18

By putting the config in BoardConfigMainlineCommon.mk, we enable sha256
on all Pixels. And devices who want to use a different hash algorithm
can override it in it's own board configs.

Bug: 156162446
Test: boot the device and check performance
Change-Id: I9f1d3bcf241bc65adf10376cc5ae7ab1986216fa
2020-12-11 01:26:12 +00:00
Will McVicker
55cd0ee523 Update aosp_arm64 kernel 4.19 prebuilt name
The aosp_arm64 kernel 4.19 prebuilt name is now kernel-4.19-gz instead
of Image.gz.

Bug: 172246735
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I4e6a1fefdf207f97cc6ec5e6ebec261473d1218d
Merged-In: I4e6a1fefdf207f97cc6ec5e6ebec261473d1218d
2020-12-10 18:47:03 +00:00
Will McVicker
86f6344fbb Update aosp_arm64 kernel 4.19 prebuilt name
The aosp_arm64 kernel 4.19 prebuilt name is now kernel-4.19-gz instead
of Image.gz.

Bug: 172246735
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I4e6a1fefdf207f97cc6ec5e6ebec261473d1218d
2020-12-10 10:45:26 -08:00
Anton Hansson
bb7111322c Merge changes Ib2a4a208,Ic8235912 am: 63d3835f4a am: 5f71a978d0 am: c6bd47a429
Original change: https://android-review.googlesource.com/c/platform/build/+/1520781

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76f7065fa5c49c4ab33c024edeac9d5b11b92eab
2020-12-10 13:22:01 +00:00
Anton Hansson
63d3835f4a Merge changes Ib2a4a208,Ic8235912
* changes:
  Set allow list for generic ramdisk
  Add a "relaxed" mode for require-artifacts-in-path
2020-12-10 12:20:26 +00:00