Yifan Hong
254a91de7e
Merge "aosp_arm64 Copy boot image from $OUT to target files" am: f07ceb45b2 am: 1564782378
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1493256
Change-Id: Ie56a170cf6f7a7aa3d12250beb1bae9f65b7f3a6
2020-11-13 00:49:22 +00:00
Hridya Valsaraju
cfd80b3a6e
Add libdmabufheap to VNDK SP list
...
Test: make
Bug: 154310076
Change-Id: I0ec2bce1a6636ac332c7dee370173a727d9d013b
2020-11-11 16:31:31 -08:00
Jeff Sharkey
688682b235
Merge "Custom binary XML wire protocol tools."
2020-11-11 18:11:52 +00:00
Palmer Dabbelt
2d691edf69
Add dmuserd to PRODUCT_PACKAGES_DEBUG
...
This is a simple dm-user daemon that will be used for the QA tests.
Test: manual, b/171749628
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com >
Change-Id: I37b78a1479f08f37fe7cff3f2e201dc6d8a6e584
2020-11-10 13:48:02 -08:00
Yifan Hong
49968aa137
aosp_arm64 Copy boot image from $OUT to target files
...
If BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES is defined,
in target files, instead of rebuilding the boot image, copy the boot
image already built in $OUT to target files package directly so that
they are the same package.
Define BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES for aosp_arm64.
The GKI APEX is built using the boot image in $OUT. If the boot image in
$OUT is different from the boot image in target files, aka the generic
boot image we release, the GKI APEX we built is invalid.
If another device needs to copy $OUT/boot.img to target files, it can
define BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES.
Fixes: 172682114
Test: lunch aosp_arm64 &&
Change-Id: I10fc7a5aa36e976dbeaf25434239687455bba061
2020-11-10 12:55:40 -08:00
Sasha Smundak
66589d1328
Use 'inherit-product/inherit-product-if-exists to include config files
...
Bug: 172923994
Test: treehugger
Change-Id: I762dfa8dc48c0b09597d2f7b6ef7f53062915a79
2020-11-10 09:59:28 -08:00
David Anderson
84fe04bef7
Merge "Add snapuserd to VABC product and base_system.mk." am: 7cd99eb450 am: c0a5fefc1f am: 498a4291ff am: 015a38a81c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1464824
Change-Id: Ic6a99179687a029cd64e5df0cdb6c937f63e43dc
2020-11-07 04:15:20 +00:00
Yifan Hong
3917b2019b
Merge "Install e2fsck_ramdisk to GKI ramdisk." am: 97c8455634 am: 38d4d432b7 am: d0e4a325d5 am: c4803f8900
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1489086
Change-Id: Ie1b1c7848ba3eae13b045c3cd06e70dd531f2a71
2020-11-07 04:14:55 +00:00
David Anderson
015a38a81c
Merge "Add snapuserd to VABC product and base_system.mk." am: 7cd99eb450 am: c0a5fefc1f am: 498a4291ff
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1464824
Change-Id: I971745c0a7861b1e017ec273d3da8cc188a81443
2020-11-07 03:44:49 +00:00
Yifan Hong
c4803f8900
Merge "Install e2fsck_ramdisk to GKI ramdisk." am: 97c8455634 am: 38d4d432b7 am: d0e4a325d5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1489086
Change-Id: Ibd03e59df3801149912b1e6664999fc556ab0a36
2020-11-07 03:44:25 +00:00
David Anderson
498a4291ff
Merge "Add snapuserd to VABC product and base_system.mk." am: 7cd99eb450 am: c0a5fefc1f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1464824
Change-Id: Icce918e6ee1ffece1e8515929095e9aaa5a2d83e
2020-11-07 00:28:25 +00:00
David Anderson
7cd99eb450
Merge "Add snapuserd to VABC product and base_system.mk."
2020-11-06 23:26:18 +00:00
Jeff Sharkey
447f859deb
Custom binary XML wire protocol tools.
...
To support local development work, add new "xml2abx" and "abx2xml"
shell utilities which offer to convert between human-readable XML and
our new binary XML protocol.
Interally this utility uses Xml.copy() which is already covered by
existing unit tests that verify lossless conversion between the two
underlying protocols.
Bug: 171832118
Test: manual
Change-Id: I85edae46607352dc306d131eeb50b81c475e3d6f
2020-11-06 13:14:36 -07:00
Yifan Hong
d0e4a325d5
Merge "Install e2fsck_ramdisk to GKI ramdisk." am: 97c8455634 am: 38d4d432b7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1489086
Change-Id: I08e57e694b541fe7ccc5f1461420fafde4bb9607
2020-11-06 19:39:44 +00:00
Yifan Hong
97c8455634
Merge "Install e2fsck_ramdisk to GKI ramdisk."
2020-11-06 19:17:15 +00:00
Yifan Hong
84ae75cd3c
Install e2fsck_ramdisk to GKI ramdisk.
...
Test: build and inspect output
Bug: 172603832
Fixes: 171326057
Change-Id: If656efdea8a503dc837f23898a5f0ed56884eda4
2020-11-06 10:28:03 -08:00
Treehugger Robot
e7d780307e
Merge "Phase out Legacy GSI" am: a0aebc1081 am: e2aef95b2d am: 2c1648bbc8 am: cbc7970d10
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1485796
Change-Id: Idbf640ec5b38877b5486901582ef1f8a189410ed
2020-11-06 05:46:55 +00:00
Treehugger Robot
cbc7970d10
Merge "Phase out Legacy GSI" am: a0aebc1081 am: e2aef95b2d am: 2c1648bbc8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1485796
Change-Id: Idbb42bc720a648a2c3a20990ced65b52a3098be4
2020-11-06 05:25:25 +00:00
Treehugger Robot
2c1648bbc8
Merge "Phase out Legacy GSI" am: a0aebc1081 am: e2aef95b2d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1485796
Change-Id: I9aa232d0e9279ed709ac4cede63dedef0d98d692
2020-11-06 04:37:57 +00:00
Treehugger Robot
a0aebc1081
Merge "Phase out Legacy GSI"
2020-11-06 04:00:40 +00:00
Treehugger Robot
296df581df
Merge "Switch ramdisk.img to the LZ4 format" am: d41b82563f am: af00a45d17 am: 5c7500deb9 am: c3d4dfa4f0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1489080
Change-Id: Ie4ff0b08b40d536fc53ee9bceb674fddee156303
2020-11-05 22:40:10 +00:00
Treehugger Robot
c3d4dfa4f0
Merge "Switch ramdisk.img to the LZ4 format" am: d41b82563f am: af00a45d17 am: 5c7500deb9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1489080
Change-Id: I47866f70c3e6982750a12887b84524620f2227c7
2020-11-05 22:27:59 +00:00
Treehugger Robot
5c7500deb9
Merge "Switch ramdisk.img to the LZ4 format" am: d41b82563f am: af00a45d17
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1489080
Change-Id: I16fa98800f3332c8b0f861c94e2cd17a79e774a4
2020-11-05 22:19:03 +00:00
Treehugger Robot
d41b82563f
Merge "Switch ramdisk.img to the LZ4 format"
2020-11-05 21:30:28 +00:00
Roman Kiryanov
49803e35b9
Switch ramdisk.img to the LZ4 format
...
Bug: 169336853
Test: file out/target/product/emulator_x86_64/ramdisk.img
Signed-off-by: Roman Kiryanov <rkir@google.com >
Change-Id: I085d230a49cd92cc7fe3a620eec411d0e8b90667
2020-11-05 10:47:55 -08:00
Yi Kong
f6f2253aa3
Merge "Add profcollect to PLATFORM_PACKAGES_DEBUG" am: da1cf9f1c1 am: a216a3e2c6 am: 5fcea7ab25 am: a8d60ab3de
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1485800
Change-Id: Ic13d513e8b0cfaf352e184f55f8cdbf1987717b6
2020-11-04 20:28:31 +00:00
Yi Kong
a8d60ab3de
Merge "Add profcollect to PLATFORM_PACKAGES_DEBUG" am: da1cf9f1c1 am: a216a3e2c6 am: 5fcea7ab25
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1485800
Change-Id: I9e8abf5019ccbb944d5d41b3fb672834f0bd9626
2020-11-04 20:05:53 +00:00
Yi Kong
5fcea7ab25
Merge "Add profcollect to PLATFORM_PACKAGES_DEBUG" am: da1cf9f1c1 am: a216a3e2c6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1485800
Change-Id: I2ac90f493820187f3b694a4113faeb5dbcaa9299
2020-11-04 19:53:22 +00:00
Yi Kong
25328f5cb9
Add profcollect to PLATFORM_PACKAGES_DEBUG
...
... but it does not get turned on automatically. This is controlled by
profcollect_native_boot.enabled device config.
Test: boot device and verify profcollectd is disabled by default
Bug: 79161490
Change-Id: Ia91b9759e108896f275633e3156355b65dc94299
2020-11-04 09:44:27 +08:00
Treehugger Robot
5011824af0
Merge "Add keystore2 to PLATFORM_PACKAGES" am: c0f701287c am: e383447ffe am: 47767ebd8a am: ed4bce9aed
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1479457
Change-Id: Iacbf1d8dd0aa156132caba80dcb1209e7ceddd8d
2020-11-03 21:46:20 +00:00
Treehugger Robot
ed4bce9aed
Merge "Add keystore2 to PLATFORM_PACKAGES" am: c0f701287c am: e383447ffe am: 47767ebd8a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1479457
Change-Id: I6e457563acdc072b3ffda3f66f5a9d87de23c3d8
2020-11-03 21:33:07 +00:00
Treehugger Robot
47767ebd8a
Merge "Add keystore2 to PLATFORM_PACKAGES" am: c0f701287c am: e383447ffe
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1479457
Change-Id: I6fac0ea9a1815b005e0735844b7100043099a975
2020-11-03 21:20:30 +00:00
Treehugger Robot
c0f701287c
Merge "Add keystore2 to PLATFORM_PACKAGES"
2020-11-03 20:37:23 +00:00
Yifan Hong
7e9c7bfcf1
Merge "Enable BOARD_USES_GKI on aosp_arm64" am: 4503e6e383 am: edd0abfbc0 am: 254552fdb2 am: f53b60d8dd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1455954
Change-Id: I9932ab67652dfccb5ad85442812a10e56f4875ed
2020-11-03 20:37:08 +00:00
Yifan Hong
f53b60d8dd
Merge "Enable BOARD_USES_GKI on aosp_arm64" am: 4503e6e383 am: edd0abfbc0 am: 254552fdb2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1455954
Change-Id: I663c57223d90e7d22d6169f0588a23164743b9ce
2020-11-03 20:06:28 +00:00
Yifan Hong
254552fdb2
Merge "Enable BOARD_USES_GKI on aosp_arm64" am: 4503e6e383 am: edd0abfbc0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1455954
Change-Id: I49841c1a3baa308127d7ee2ebd97146690ebd917
2020-11-03 19:35:40 +00:00
SzuWei Lin
d418471390
Phase out Legacy GSI
...
Legacy GSI is the GSI for the O/O-MR1 launching devices. VINTF and
VNDK do not support O/O-MR1 now. It is the time to phase out Legacy
GSI.
Bug: 162277261
Test: none
Change-Id: I55901604da21daa58b51ee6676cd61bb9e4ff5e6
2020-11-03 18:23:57 +08:00
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
Janis Danisevskis
95799b056e
Add keystore2 to PLATFORM_PACKAGES
...
Add keystore 2 to the PLATFORM_PACKAGES in anticipation for the Keystore
2.0 migration. This builds and installs keystore2 on the device, but it
does not get started yet. Staring keystore2 is currently controlled with
the platform property ro.android.security.keystore2.enable=true.
Bug: 171305684
Test: keystore2 builds and is present on the device but does not start
unconditionally.
Change-Id: Id92cb2aa38022516067853d89d6c3210db1100a8
2020-10-28 19:40:51 -07:00
Treehugger Robot
a9ff9573d2
Merge "Add fs_config_(dirs|files) for product and system_ext" am: 1391c95f32 am: 324a3729d6 am: 75f2758912 am: 1645d4075a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1465965
Change-Id: I05aa2551e0caf8ad12d169d44e183cdb4408205e
2020-10-22 08:23:57 +00:00
Treehugger Robot
1645d4075a
Merge "Add fs_config_(dirs|files) for product and system_ext" am: 1391c95f32 am: 324a3729d6 am: 75f2758912
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1465965
Change-Id: Ie4d3da25cb9cb49507b439412a1cb564bcb27914
2020-10-22 07:54:04 +00:00
Treehugger Robot
75f2758912
Merge "Add fs_config_(dirs|files) for product and system_ext" am: 1391c95f32 am: 324a3729d6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1465965
Change-Id: Ia39fe375a6b3cc1898d1cc5132862b095062cd57
2020-10-22 07:25:20 +00:00
Justin Yun
75f7cf9a2d
Add fs_config_(dirs|files) for product and system_ext
...
These files were added to devices with the fs_config_files_nonsystem
module in base_vendor.mk. As they are partition-specific, move them
to each base_<partition>.mk file.
To add the fs_config_* files to the base_<partition>.mk files, it is
required to define the fs_config_* regardless of the existance of
partitions.
Bug: 170282998
Test: build and check if they are installed.
Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-21 03:39:22 +00:00
Treehugger Robot
611f7f5ca0
Merge "Update VNDK version for common graphics HALs."
2020-10-20 23:56:51 +00:00
Steven Moreland
0189ce2216
Merge "Update VNDK version for common graphics HALs." into rvc-d1-dev-plus-aosp am: a4995363e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12874991
Change-Id: I141c489cf5dee08a76300c2eedf4e481b3d89c49
2020-10-20 20:42:33 +00:00
Steven Moreland
a4995363e5
Merge "Update VNDK version for common graphics HALs." into rvc-d1-dev-plus-aosp
2020-10-20 20:36:42 +00: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
e7a11c1024
Merge "Removes usage of TARGET_NO_VENDOR_BOOT." am: 6a93af91dc am: 140548db2c am: 0828ddae58
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1457443
Change-Id: I3cae59bc7c977ddcc065213e08da1a035c903bce
2020-10-20 18:26:12 +00:00
Daniel Norman
0828ddae58
Merge "Removes usage of TARGET_NO_VENDOR_BOOT." am: 6a93af91dc am: 140548db2c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1457443
Change-Id: I392d8e9bc442ee0fcbaf9e14ca8fc83ab79b9e6b
2020-10-20 18:12:11 +00:00
Daniel Norman
6a93af91dc
Merge "Removes usage of TARGET_NO_VENDOR_BOOT."
2020-10-20 17:18:01 +00:00