Commit Graph

1306 Commits

Author SHA1 Message Date
Yifan Hong
c10e367912 Enable BOARD_USES_GKI on aosp_arm64
Enable BOARD_USES_GENERIC_KERNEL_IMAGE := true. In addition:
- Disable recovery_as_boot
- Disable recovery (PRODUCT_BUILD_RECOVERY_IMAGE=false)

Test: builds, and mmma packages/modules/Gki
Bug: 156098440
Change-Id: If6988f6b44f098ed8f1dc214eee1f2223fd03ae8
2020-11-02 11:28:20 -08:00
Daniel Norman
f2b6c1a4c8 Merge "Removes usage of TARGET_NO_VENDOR_BOOT." am: 6a93af91dc am: 140548db2c am: 0828ddae58 am: e7a11c1024
Original change: https://android-review.googlesource.com/c/platform/build/+/1457443

Change-Id: Iddcff042ee65fb8e691e782c325bd5e3a86bba52
2020-10-20 18:53:40 +00:00
Daniel Norman
ad6293c098 Removes usage of TARGET_NO_VENDOR_BOOT.
- true -> PRODUCT_BUILD_VENDOR_BOOT_IMAGE=false
- false -> (removed, uses default option which builds vendor-boot.img
            if BOARD_BOOT_HEADER_VERSION>=3)

Bug: 170423509
Test: Inspect build artifacts from treehugger.
Change-Id: Id16fbda7fdfc70d62db389d6efb5201cb0d6d4e3
2020-10-16 15:10:21 -07:00
Steve Muckle
0fcb904e0f Merge "Revert^2 "use new GKI kernel location"" am: a5e1dc4b1c am: 4231172840 am: c9eefe4ad2 am: e468a9fd20
Original change: https://android-review.googlesource.com/c/platform/build/+/1455798

Change-Id: I0b0c37733e3a71869ddd5be6b50bdfa099880eac
2020-10-12 01:54:52 +00:00
Steve Muckle
0f0fa1a07d Revert^2 "use new GKI kernel location"
a0281768fe

This revert includes a fix to use the lz4 variant of the kernel,
as was the case before, rather than the uncompressed one.

Bug: 170451791
Change-Id: Iaab082d8bba04df82d742d682251447f3e21fe9b
2020-10-09 10:32:57 -07:00
Xiao Ma
92e18d10ae Merge "Revert "use new GKI kernel location"" am: f07902e84f am: 677a13713c am: b60960d28b am: b236cef699
Original change: https://android-review.googlesource.com/c/platform/build/+/1455939

Change-Id: I09f00e5483ced47fd10280f7c7a718472e81fc42
2020-10-09 09:05:52 +00:00
Xiao Ma
a0281768fe Revert "use new GKI kernel location"
Revert "Update kernel to builds 6888926"

Revert submission 1454075-2020-10-07-gki-update

Reason for revert: Looks like this topic changes caused daily build broken, the error log as:

error: +out/target/product/emulator_arm64/boot.img too large (34934784 > 33484800)

I tried to revert this topic first and then feel free to revert revert it.

Reverted Changes:
Ie74ca26e8:use new GKI kernel location
Ibff0d9638:Update kernel to builds 6889747
I693476e82:Update kernel to builds 6888926
I35d7f320c:Update kernel to builds 6888926
Id221a7a30:Update kernel to builds 6888926
I4421dbf67:remove kernel, kernel modules from cuttlefish_kern...
I991f9a6af:Allow downstream devices to customize vendor modul...
I598630e09:load kernel, kernel modules from updated locations...

Bug: 170451791
Change-Id: I4d8f18a7c80eb92cb475c48e1dcf04ceabd08984
2020-10-09 07:22:45 +00:00
Steve Muckle
b5187faf37 Merge "use new GKI kernel location" am: 1d83969db8 am: b3f99cd4cd am: 4e0897d57c am: 0957ed5e4b
Original change: https://android-review.googlesource.com/c/platform/build/+/1455075

Change-Id: Icc6db4538379ca5413c3a907122d05721060e299
2020-10-09 07:01:06 +00:00
Steve Muckle
4f10706721 use new GKI kernel location
The GKI kernel is now stored in kernel/prebuilts.

Bug: 161563956
Change-Id: Ie74ca26e8e9bf05c824eb87e03eeda865d861dde
2020-10-08 20:25:49 +00:00
Treehugger Robot
249d2639fc Merge "Remove build tasks for vts10" am: 70b4738324 am: e57ea5ed1b am: 385a043d90 am: 27b0727b68
Original change: https://android-review.googlesource.com/c/platform/build/+/1449155

Change-Id: I6a861791c30cc430b817cc25740e945fe05493f4
2020-10-06 04:38:00 +00:00
Dan Shi
82c4cb74c6 Remove build tasks for vts10
Bug: 169581727
Test: build
Change-Id: I865553ae07bc6eac3b90f87a494537102c398280
2020-10-05 10:17:21 -07:00
Sam Lin
7c9f562d00 Add an aosp target that supports 64-bit app only
Bug: 168796046
Test: N/A
Change-Id: I57116fe67cbe1322f348c9d0506655f32a900dcc
Merged-In: I57116fe67cbe1322f348c9d0506655f32a900dcc
2020-09-21 17:44:46 +00:00
Calvin Huang
e308c88b3d Merge "Add an aosp target that supports 64-bit app only" into rvc-qpr-dev am: 0605e11f99 am: d05c58cf12
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12503225

Change-Id: I3e059dc67216ad34e575b44da7237d50a1f27f39
2020-09-17 20:15:02 +00:00
Calvin Huang
d05c58cf12 Merge "Add an aosp target that supports 64-bit app only" into rvc-qpr-dev am: 0605e11f99
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12503225

Change-Id: I8594b3044d28b6469172e1dd33852cf5add8f955
2020-09-17 19:08:42 +00:00
Sam Lin
d001fb334d Add an aosp target that supports 64-bit app only
Bug: 164166032
Test: N/A
Change-Id: I57116fe67cbe1322f348c9d0506655f32a900dcc
2020-09-16 17:15:10 -07:00
Treehugger Robot
8fcefc2936 Merge "Disable sparse image for GSI products" am: 6651152c08 am: 3ef10eee71 am: 76efa7d199 am: 6304ce5a66 am: 655bee3cd2
Original change: https://android-review.googlesource.com/c/platform/build/+/1421368

Change-Id: Ie124348eb9bc46dfd04e1790294b5771d3aa1ba0
2020-09-12 00:11:41 +00:00
Treehugger Robot
6651152c08 Merge "Disable sparse image for GSI products" 2020-09-11 08:17:49 +00:00
Yo Chiang
90339f9563 Disable sparse image for GSI products
There are a couple of use cases where we don't want sparse image:
1. `DynamicSystemInstallationService` in Q framework doesn't support
   sparse images.
2. Super image manipulation tools (like `lpadd`) doesn't play nice with
   sparse images.

Force non-sparse GSI so we don't break backwards compatibility (1) and
we don't need to write `simg2img` everywhere (2).

Bug: 167695592
Test: Prepare a device flashed with Q framework
Test: Build system.img and create system.img.zip; the image is non-sparsed
Test: m tradefed-all && \
  tradefed.sh run commandAndExit template/atest_local_min \
  --template:map preparers=template/preparers/dsu-preparer \
  --extra-file system-img.zip=out/.../system.img.zip \
  --dynamic-system-update:disable-tear-down
Change-Id: Ib7667165ce53e87eb86bc7d3f56c80a418123a62
2020-09-08 16:55:43 +08:00
Xin Li
c2fd58fe67 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ie00dbea32e074838466eeed00f316250c2b4f3c2
Change-Id: I9ee3441fd4d063b9dd489cb1b01d3dbc11332457
2020-08-29 01:19:44 -07:00
Treehugger Robot
65a60f347c Merge "Set BOARD_KERNEL_MODULE_INTERFACE_VERSIONS for aosp_arm64" am: 5c9667d1ac am: 59a4a06170 am: a05aba7c86 am: 88eb59d624 am: 67d2fe8058
Original change: https://android-review.googlesource.com/c/platform/build/+/1392541

Change-Id: I6b72628aa4d13db31b8afd0113bf063507a0a08d
2020-08-25 02:29:59 +00:00
Treehugger Robot
a05aba7c86 Merge "Set BOARD_KERNEL_MODULE_INTERFACE_VERSIONS for aosp_arm64" am: 5c9667d1ac am: 59a4a06170
Original change: https://android-review.googlesource.com/c/platform/build/+/1392541

Change-Id: I9b0c5e001fbbbf25b6fb86559e376fc8804a48ad
2020-08-25 00:25:57 +00:00
Yifan Hong
e5ab7a241b Set BOARD_KERNEL_MODULE_INTERFACE_VERSIONS for aosp_arm64
Test: m com.android.gki.boot-5.4_5.4-android12-0
Bug: 162888350
Change-Id: I8ac387cc52e498c2790c0b84e866a307fdd1ae8b
2020-08-24 12:23:27 -07:00
Steve Muckle
2f17246fe7 enable LZ4 ramdisks for aosp_arm64
LZ4 is much faster to decompress than gzip.

Bug: 158791155
Change-Id: Id962c439c54e8c4fcca003acad3b7e09d1dec424
2020-08-20 10:17:37 -07:00
Treehugger Robot
14797cb81b Merge "add kernels with untrimmed symbols to aosp_arm64" am: a74903c755 am: 896997628d am: 4a0f6c33a4 am: e288469a00 am: 73e5c2b624
Original change: https://android-review.googlesource.com/c/platform/build/+/1402952

Change-Id: I1c8a9b9d3092152460b4c73335685ab3e21bd847
2020-08-18 03:44:10 +00:00
Treehugger Robot
4a0f6c33a4 Merge "add kernels with untrimmed symbols to aosp_arm64" am: a74903c755 am: 896997628d
Original change: https://android-review.googlesource.com/c/platform/build/+/1402952

Change-Id: I90d74be12eb421bb01ab6d5f7e663fba56d32e34
2020-08-18 03:13:49 +00:00
Steve Muckle
2ad32ef3af add kernels with untrimmed symbols to aosp_arm64
For development and debugging it is useful to have boot images with all
kernel symbols exported.

Bug: 163613927
Change-Id: I6118e5f0fff6e9cbc20ecca6bd362a26a79544b1
2020-08-17 15:16:30 -07:00
SzuWei Lin
33157a2da8 Disable BLE_VND_INCLUDED in GSI
Not all devices support BLE_VND_INCLUDED. Disable BLE_VND_INCLUDED
in GSI before it becoming a runtime enabled feature.

Bug: 146149698
Bug: 160930886
Test: build aosp_arm64-userdebug, check the feature manually
Change-Id: I17fd2c1c3cdb87fde11362683d4a7bec1d989b6f
2020-08-13 15:40:31 +08:00
Treehugger Robot
f0f315dd38 Merge "Remove vbmeta_system from GSI targets" am: 3041178a7d am: 9fa3b271f2 am: 2997e42efa am: e6bc570563 am: 443369ab2e
Original change: https://android-review.googlesource.com/c/platform/build/+/1366537

Change-Id: Idb8f571cb0d4f489fab7fb2e734a85b484b995f3
2020-08-06 22:55:51 +00:00
Treehugger Robot
2997e42efa Merge "Remove vbmeta_system from GSI targets" am: 3041178a7d am: 9fa3b271f2
Original change: https://android-review.googlesource.com/c/platform/build/+/1366537

Change-Id: Ib8cc3b9c920ac0fbe0001416aca16624b7f7b19c
2020-08-06 21:43:37 +00:00
Hung-ying Tyan
81f3929867 Remove vbmeta_system from GSI targets
This partially reverts commit 1785816ca1
so that the hash tree at the end of GSI is properly signed by AVB.

Bug: 161503491
Test: 'm dist' and check that vbmeta_system.im is gone
Test: boot GSI on android10 CF
Test: 'avbtool info_image --image system.img' and check AVB signing
Change-Id: I9f488380c0c410fdbd02c3c0803b6dc06cf7faab
2020-07-31 18:59:40 +08:00
TreeHugger Robot
8c2ae4f697 Merge "add android-mainline kernels to aosp_arm64 build" into rvc-dev-plus-aosp am: ac69af7fc0 am: 98d4f05bff am: 40eaccde22
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12226085

Change-Id: If2a66738db41fc07ea027fd420c151cd34744ac4
2020-07-24 20:14:22 +00:00
Steve Muckle
5cbd88ab6c add android-mainline kernels to aosp_arm64 build
To enable testing with android-mainline kernels, and them to the
aosp_arm64 build so android-mainline-based GKI boot images are produced.

Bug: 162020942
Change-Id: Ib1f957608a720a763a14324e4ca25ee170154fbb
Merged-In: Ib1f957608a720a763a14324e4ca25ee170154fbb
2020-07-24 08:09:15 -07:00
Steve Muckle
3aeee6daea add android-mainline kernels to aosp_arm64 build
To enable testing with android-mainline kernels, and them to the
aosp_arm64 build so android-mainline-based GKI boot images are produced.

Bug: 162020942
Change-Id: Ib1f957608a720a763a14324e4ca25ee170154fbb
2020-07-24 08:06:12 -07:00
Jing Ji
836d14b961 Merge "Remove LMK properties from GSI image" am: 228e6b2494 am: ac0a178166 am: f3c6680218 am: 31288b12e2 am: f750523730
Original change: https://android-review.googlesource.com/c/platform/build/+/1366417

Change-Id: Ib3b600c1556d5ed35194ec068a76e1f70b687a86
2020-07-20 23:39:25 +00:00
Jing Ji
f3c6680218 Merge "Remove LMK properties from GSI image" am: 228e6b2494 am: ac0a178166
Original change: https://android-review.googlesource.com/c/platform/build/+/1366417

Change-Id: I28091b1445da12e96e4e6dff2fbca7ff2c15a673
2020-07-20 22:42:06 +00:00
Jing Ji
cc5d2cca25 Remove LMK properties from GSI image
These two properties shouldn't be set in GSI image from R on,
otherwise they'll force lmkd to use the legacy strategy.

Bug: 136212765
Test: run cts-on-gsi -m CtsFileSystemTestCases
Test: run cts-on-gsi -m CtsAppExitTestCases
Change-Id: Id0001f8c4187a280cffe6c72d7a39be29065ca4e
2020-07-20 18:52:40 +00:00
Jing Ji
5f97d6d24f Remove a couple of LMK properties from GSI image
These two properties shouldn't be set in GSI image from R on,
otherwise they'll force lmkd to use the legacy strategy.

Bug: 136212765
Test: run cts-on-gsi -m CtsFileSystemTestCases
Test: run cts-on-gsi -m CtsAppExitTestCases
Change-Id: Id0001f8c4187a280cffe6c72d7a39be29065ca4e
Merged-In: Id0001f8c4187a280cffe6c72d7a39be29065ca4e
2020-07-20 18:27:33 +00:00
Ruchir Rastogi
e433f7d2b1 Merge "Remove ro.statsd.enable property" 2020-07-15 18:06:43 +00:00
Hung-ying Tyan
9ca864f88a Merge "Enable vbmeta_system for GSI targets" am: 6fa0dd9b94 am: 38267e1455
Original change: https://android-review.googlesource.com/c/platform/build/+/1359124

Change-Id: I85ad96c79f7d04c00a3aaee2fdbca7ddec709dad
2020-07-15 07:05:59 +00:00
Hung-ying Tyan
1785816ca1 Enable vbmeta_system for GSI targets
in order to mix GSI onto android10 Cuttlefish.

Bug: 158302764
Test: mixing GSI onto android10 Cuttlefish
Change-Id: I77385495583034324f5e29bed27c588dc98215e2
2020-07-14 16:04:20 +00:00
Ruchir Rastogi
e78b9cdfc2 Remove ro.statsd.enable property
statsd is now enabled on all devices (including Go devices), and this
property is no longer queried either. Accordingly, the property override
is no longer needed.

Test: T/H
Bug: 157082130
Change-Id: I9ea37cf8104b7b7a3f4437b68714c12d6c3acb81
2020-07-13 10:14:35 -07:00
Jiyong Park
8b266f16a9 Don't inherit tablet-dalvik-heap for GSI and emulator
GSI and emulator should not be specialized for tablet.

This is also to avoid the expected sysprop conflict after
I9c073a21c8257987cf2378012cadaeeeb698a4fb gets in. With the change,
duplicate assignments of a sysprop is prohibited. We currently have the
duplication due to the following hierarchy chain:

aosp_arm64.mk
 -> emulator_vendor.mk -> goldfish/vendor.mk -> phone-xhdpi-2048-dalvik-heap.mk
 -> generic_arm64/device.mk -> tablet-dalvik-heap.mk

Many of the dalvik.vm.* properties are duplicated between phone-*-
dalvik-heap.mk and tablet-dalvik-heap.mk files.

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: I4d1e2f819fe688a4a85e58387b6af58d603399d3
(cherry picked from commit 9f2f6dd9c9)
Change-Id: I4d1e2f819fe688a4a85e58387b6af58d603399d3
2020-06-30 18:44:11 +09:00
Jiyong Park
6ce12029b0 Don't inherit tablet-dalvik-heap for GSI and emulator
GSI and emulator should not be specialized for tablet.

This is also to avoid the expected sysprop conflict after
I9c073a21c8257987cf2378012cadaeeeb698a4fb gets in. With the change,
duplicate assignments of a sysprop is prohibited. We currently have the
duplication due to the following hierarchy chain:

aosp_arm64.mk
 -> emulator_vendor.mk -> goldfish/vendor.mk -> phone-xhdpi-2048-dalvik-heap.mk
 -> generic_arm64/device.mk -> tablet-dalvik-heap.mk

Many of the dalvik.vm.* properties are duplicated between phone-*-
dalvik-heap.mk and tablet-dalvik-heap.mk files.

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: I4d1e2f819fe688a4a85e58387b6af58d603399d3
(cherry picked from commit 9f2f6dd9c9)
Change-Id: I4d1e2f819fe688a4a85e58387b6af58d603399d3
2020-06-30 14:27:58 +09:00
Jiyong Park
9f2f6dd9c9 Don't inherit tablet-dalvik-heap for GSI and emulator
GSI and emulator should not be specialized for tablet.

This is also to avoid the expected sysprop conflict after
I9c073a21c8257987cf2378012cadaeeeb698a4fb gets in. With the change,
duplicate assignments of a sysprop is prohibited. We currently have the
duplication due to the following hierarchy chain:

aosp_arm64.mk
 -> emulator_vendor.mk -> goldfish/vendor.mk -> phone-xhdpi-2048-dalvik-heap.mk
 -> generic_arm64/device.mk -> tablet-dalvik-heap.mk

Many of the dalvik.vm.* properties are duplicated between phone-*-
dalvik-heap.mk and tablet-dalvik-heap.mk files.

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Change-Id: I4d1e2f819fe688a4a85e58387b6af58d603399d3
2020-06-25 09:46:57 +09:00
TreeHugger Robot
d8b16dcab4 Merge "enable LZ4 ramdisks for aosp_arm64" into rvc-dev am: f854cf8317
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895387

Change-Id: I59e68fca3916d07490f0cab90060ce1dbb1d7e01
2020-06-17 18:02:30 +00:00
Steve Muckle
a6da7bc44a enable LZ4 ramdisks for aosp_arm64
LZ4 is much faster to decompress than gzip.

Bug: 158791155
Change-Id: Id962c439c54e8c4fcca003acad3b7e09d1dec424
2020-06-17 09:00:51 -07:00
TreeHugger Robot
61802a76d1 Merge "add 4.19 kernel to aosp_arm64" into rvc-dev am: d9673e768a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11887882

Change-Id: Ie30dc40aafa47cfba1fae7376a7bdbd295afac66
2020-06-17 03:11:04 +00:00
Steve Muckle
9c4a0ea67f add 4.19 kernel to aosp_arm64
Create a 4.19 kernel GKI boot image.

Bug: 158791155
Change-Id: I2dcfe29f2e8414c0362992a6e6ca68a86f367d4e
2020-06-16 17:49:18 -07:00
Jiyong Park
cd0c931b89 Merge "Organize product vars for adding properties" 2020-06-15 10:00:22 +00:00
Yo Chiang
d0935e46f5 Merge "Remove default GSI libnfc-nci.conf" am: 2294009766 am: b1f03ab796
Original change: https://android-review.googlesource.com/c/platform/build/+/1322636

Change-Id: I0c7a1a306edb314e52bf3c50cfd6727b97889d04
2020-06-12 03:11:30 +00:00