summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-02-15 19:15:35 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-02-15 19:15:35 +0000
commit9058b5c75006221218953f9b5bdfd12edbcc93af (patch)
treec9f9360c5e0c352eaa9fe27dbf0fd90f6b8cc19e
parente9573ceb2b68369efd8c9fa46c4f40991b4e6912 (diff)
parent8d2e8167e444496315da728854deefeb24ba514b (diff)
Snap for 8185906 from 8d2e8167e444496315da728854deefeb24ba514b to tm-frc-conscrypt-release
Change-Id: I57880231bdbddd340f8f5207542f98ebac42685b
-rw-r--r--Android.mk10
-rw-r--r--db845c/BoardConfig.mk1
2 files changed, 11 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index ed787c7..ca9d582 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,16 @@ ifneq ($(filter db845c pixel3_mainline rb5, $(TARGET_BOARD_PLATFORM)),)
LOCAL_PATH := $(call my-dir)
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,.conf))
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,.kl))
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,.policy))
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,.rc))
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,.sh))
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,.xml))
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,fstab.db845c))
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,fstab.pixel3_mainline))
+$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,fstab.rb5))
+
# If some modules are built directly from this directory (not subdirectories),
# their rules should be written here.
diff --git a/db845c/BoardConfig.mk b/db845c/BoardConfig.mk
index 7ef8549..2a23017 100644
--- a/db845c/BoardConfig.mk
+++ b/db845c/BoardConfig.mk
@@ -6,6 +6,7 @@ TARGET_BOARD_PLATFORM := db845c
TARGET_NO_KERNEL := false
BOARD_INCLUDE_DTB_IN_BOOTIMG := true
+TARGET_USES_BOOT_HDR_V3 ?= true
ifeq ($(TARGET_USES_BOOT_HDR_V3), true)
BOARD_BOOT_HEADER_VERSION := 3
BOARD_KERNEL_PAGESIZE := 4096