Add support for arm64 kernels
BUG: 118442619
Test: Ran builds, verified the proper kernel landed
Change-Id: Ibf1b6391e66c79f31e380718af2365bdab2c0bb1
diff --git a/shared/device.mk b/shared/device.mk
index 712b98f..2520572 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -17,8 +17,6 @@
# Enable updating of APEXes
$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
-PRODUCT_COPY_FILES += device/google/cuttlefish_kernel/4.14-x86_64/kernel:kernel
-
PRODUCT_SHIPPING_API_LEVEL := 29
PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
diff --git a/vsoc_arm64/device.mk b/vsoc_arm64/device.mk
new file mode 100644
index 0000000..2433569
--- /dev/null
+++ b/vsoc_arm64/device.mk
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+PRODUCT_COPY_FILES += device/google/cuttlefish_kernel/4.14-arm64/kernel:kernel
diff --git a/vsoc_arm64/phone/device.mk b/vsoc_arm64/phone/device.mk
index c05d456..0053ec5 100644
--- a/vsoc_arm64/phone/device.mk
+++ b/vsoc_arm64/phone/device.mk
@@ -16,6 +16,7 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, device/google/cuttlefish/shared/phone/device.mk)
+$(call inherit-product, device/google/cuttlefish/vsoc_arm64/device.mk)
PRODUCT_NAME := aosp_cf_arm64_phone
PRODUCT_DEVICE := vsoc_arm64
diff --git a/vsoc_x86/auto/device.mk b/vsoc_x86/auto/device.mk
index 233785b..72adfdd 100644
--- a/vsoc_x86/auto/device.mk
+++ b/vsoc_x86/auto/device.mk
@@ -15,6 +15,7 @@
#
$(call inherit-product, device/google/cuttlefish/shared/auto/device.mk)
+$(call inherit-product, device/google/cuttlefish/vsoc_x86/device.mk)
PRODUCT_NAME := aosp_cf_x86_auto
PRODUCT_DEVICE := vsoc_x86
diff --git a/vsoc_x86/device.mk b/vsoc_x86/device.mk
new file mode 100644
index 0000000..ed4433a
--- /dev/null
+++ b/vsoc_x86/device.mk
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+PRODUCT_COPY_FILES += device/google/cuttlefish_kernel/4.14-x86_64/kernel:kernel
diff --git a/vsoc_x86/go_phone/device.mk b/vsoc_x86/go_phone/device.mk
index ef62d70..b61edc5 100644
--- a/vsoc_x86/go_phone/device.mk
+++ b/vsoc_x86/go_phone/device.mk
@@ -16,6 +16,7 @@
$(call inherit-product, device/google/cuttlefish/shared/go/device.mk)
$(call inherit-product, device/google/cuttlefish/vsoc_x86/phone/device.mk)
+$(call inherit-product, device/google/cuttlefish/vsoc_x86/device.mk)
PRODUCT_NAME := aosp_cf_x86_go_phone
PRODUCT_DEVICE := vsoc_x86
diff --git a/vsoc_x86/pasan/device.mk b/vsoc_x86/pasan/device.mk
index f78c2d1..a0dad87 100644
--- a/vsoc_x86/pasan/device.mk
+++ b/vsoc_x86/pasan/device.mk
@@ -15,6 +15,7 @@
#
$(call inherit-product, device/google/cuttlefish/shared/phone/device.mk)
+$(call inherit-product, device/google/cuttlefish/vsoc_x86/device.mk)
PRODUCT_NAME := aosp_cf_x86_pasan
PRODUCT_DEVICE := vsoc_x86
diff --git a/vsoc_x86/phone/device.mk b/vsoc_x86/phone/device.mk
index 0f64829..a3caa19 100644
--- a/vsoc_x86/phone/device.mk
+++ b/vsoc_x86/phone/device.mk
@@ -15,6 +15,7 @@
#
$(call inherit-product, device/google/cuttlefish/shared/phone/device.mk)
+$(call inherit-product, device/google/cuttlefish/vsoc_x86/device.mk)
PRODUCT_NAME := aosp_cf_x86_phone
PRODUCT_DEVICE := vsoc_x86
diff --git a/vsoc_x86/tv/device.mk b/vsoc_x86/tv/device.mk
index 336993f..7689ee3 100644
--- a/vsoc_x86/tv/device.mk
+++ b/vsoc_x86/tv/device.mk
@@ -15,6 +15,7 @@
#
$(call inherit-product, device/google/cuttlefish/shared/tv/device.mk)
+$(call inherit-product, device/google/cuttlefish/vsoc_x86/device.mk)
PRODUCT_NAME := aosp_cf_x86_tv
PRODUCT_DEVICE := vsoc_x86
