commit c5fd7066f592f4be4ac6c725f0292283a678d04f
author Paul Duffin <paulduffin@google.com> Thu Jun 18 12:16:47 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 18 12:16:47 2020 +0000
tree e22926ef611aa129ba425a2a2df17214223ea169
parent dd592d87ecd5af8016cb42c7ccc831d59c09b70d
parent 92d41de8f225d70616ac3ab9a4723bf019e60c52

Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev

target/board/generic_arm64/BoardConfig.mk

diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk
index 0ac2f94..ba69623 100644
--- a/target/board/generic_arm64/BoardConfig.mk
+++ b/target/board/generic_arm64/BoardConfig.mk
@@ -64,6 +64,7 @@
 BOARD_KERNEL-5.4-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
 
+BOARD_RAMDISK_USE_LZ4 := true
 BOARD_BOOT_HEADER_VERSION := 3
 BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
 

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 7c5c809..4569bce 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -27,7 +27,6 @@
     android.test.base \
     android.test.mock \
     android.test.runner \
-    ANGLE \
     apexd \
     appops \
     app_process \
@@ -119,6 +118,7 @@
     javax.obex \
     service-jobscheduler \
     keystore \
+    credstore \
     ld.mc \
     libaaudio \
     libamidi \