Commit graph

6715 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Steven Moreland
be4cdda31b Update VNDK version for common graphics HALs.
We are adding things to them, and in order for core libraries like libui
to use them, the newer versions need to be in the VNDK.

Exempt-From-Owner-Approval: cherry-pick
Bug: 170435409
Test: build
Change-Id: I18495d303ae8bd68f35631b2be2dc9dcf915e991
Merged-In: I18495d303ae8bd68f35631b2be2dc9dcf915e991
2020-10-20 00:23:17 +00:00
Steven Moreland
40a9f49ced Update VNDK version for common graphics HALs.
We are adding things to them, and in order for core libraries like libui
to use them, the newer versions need to be in the VNDK.

Bug: 170435409
Test: build
Change-Id: I18495d303ae8bd68f35631b2be2dc9dcf915e991
Merged-In: I18495d303ae8bd68f35631b2be2dc9dcf915e991
2020-10-19 21:04:21 +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
David Anderson
607800d615 Add snapuserd to VABC product and base_system.mk.
Bug: 168259959
Test: builds
Change-Id: I289f84e293c84b12f5f33f8940643bac43ff5d35
2020-10-16 15:07:52 -07:00
Makoto Onuki
6be865dc5c Merge "Remove unneed jar files from the system partition" am: e1faea86f9 am: 282b6fce49
Original change: https://android-review.googlesource.com/c/platform/build/+/1462688

Change-Id: I8f0cf8db250d9fa955858c4214bddde69d8841cd
2020-10-16 16:29:01 +00:00
Makoto Onuki
e1faea86f9 Merge "Remove unneed jar files from the system partition" 2020-10-16 15:41:16 +00:00
Makoto Onuki
90ac5ae188 Remove unneed jar files from the system partition
Fix: 170967644
Test: boot
Test: Make sure the following jar files are removed
$OUT/system/framework/service-blobstore.jar
$OUT/system/framework/service-jobscheduler.jar

Change-Id: Ia5351d9d3b1dda7bf96e95bbaad171cd8c3b49fc
Merged-in: Ia5351d9d3b1dda7bf96e95bbaad171cd8c3b49fc
2020-10-15 13:06:58 -07:00
Martin Stjernholm
56348da7f9 Merge "Rename com.android.art module." am: a530fa9825 am: 8125de9276
Original change: https://android-review.googlesource.com/c/platform/build/+/1455023

Change-Id: I5455bb3c63c0fb11b8903ab1bd594f8044b4a4ef
2020-10-14 18:29:46 +00:00
Martin Stjernholm
a530fa9825 Merge "Rename com.android.art module." 2020-10-14 17:56:42 +00:00
Devin Moore
757b419fde Merge "Update vndk list for android.hardware.common.fmq" am: 761f5fe164 am: 2b37bd991e
Original change: https://android-review.googlesource.com/c/platform/build/+/1456139

Change-Id: If9160f3843c72e096cb1bf2113c397982c2a5321
2020-10-13 15:21:51 +00:00
Devin Moore
761f5fe164 Merge "Update vndk list for android.hardware.common.fmq" 2020-10-13 14:58:08 +00:00
Martin Stjernholm
1cced44791 Rename com.android.art module.
Paving the way for renaming the ART release APEX to com.android.art.

Test: m
Bug: 169639321
Change-Id: I55af4b3dcba48757e7fb65d5d4bc7517c91ae80f
2020-10-13 14:37:19 +01:00
Steve Muckle
c9eefe4ad2 Merge "Revert^2 "use new GKI kernel location"" am: a5e1dc4b1c am: 4231172840
Original change: https://android-review.googlesource.com/c/platform/build/+/1455798

Change-Id: Ic014ca1905bb2f907e58861f786e2238bf565af4
2020-10-12 01:30:23 +00:00
Devin Moore
68a3cef45e Update vndk list for android.hardware.common.fmq
Change created with update-vndk-list.sh for the new package.

Test: m
Bug: 142326204
Change-Id: Iecd2ad2fc2f00c0214dc3ad4bf60661b492c5e4f
2020-10-09 13:48:01 -07: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
b60960d28b Merge "Revert "use new GKI kernel location"" am: f07902e84f am: 677a13713c
Original change: https://android-review.googlesource.com/c/platform/build/+/1455939

Change-Id: I3bf4583b62969d2b2ae15b9a4d0b1afb3bb80696
2020-10-09 08:03:13 +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
4e0897d57c Merge "use new GKI kernel location" am: 1d83969db8 am: b3f99cd4cd
Original change: https://android-review.googlesource.com/c/platform/build/+/1455075

Change-Id: Id85c1bd7e884be34973b71fae2cc18e744f975c8
2020-10-09 06:20:17 +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
b6e3ccfd59 Merge "Include selinux_policy_* for product and system_ext." am: 09da8b1ba1 am: 7917ae1355
Original change: https://android-review.googlesource.com/c/platform/build/+/1452335

Change-Id: Ib072d4f98c487951313b2b0ee55b60e7e1ae182d
2020-10-08 01:29:24 +00:00
Treehugger Robot
09da8b1ba1 Merge "Include selinux_policy_* for product and system_ext." 2020-10-08 00:49:44 +00:00
Treehugger Robot
31c473d748 Merge "Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt" am: c50ba5554a am: d9bf9e3e2c
Original change: https://android-review.googlesource.com/c/platform/build/+/1425158

Change-Id: Ieccf9cde1955beca632407f99e615a97334da36e
2020-10-07 21:31:50 +00:00
Treehugger Robot
c50ba5554a Merge "Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt" 2020-10-07 20:45:52 +00:00
Justin Yun
599330f865 Include selinux_policy_* for product and system_ext.
After separating selinux_policy_system_ext and selinux_policy_product
from the selinux_policy_nonsystem module, add them to
base_system_ext.mk and base_product.mk, respectively.

Bug: 170282998
Test: build and check boot
Change-Id: I03a4ae435898dd773f418d37f321ad0a37f17c3e
2020-10-07 18:16:45 +09:00
Treehugger Robot
385a043d90 Merge "Remove build tasks for vts10" am: 70b4738324 am: e57ea5ed1b
Original change: https://android-review.googlesource.com/c/platform/build/+/1449155

Change-Id: Idebca2d02a97631f7aa283ddf9e9075e97a7210f
2020-10-06 04:04:01 +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