commit 79101977dca93ab4942de281b32944aa092af488
author bohu <bohu@google.com> Fri Aug 30 08:17:14 2019 -0700
committer Bo Hu <bohu@google.com> Fri Aug 30 16:22:43 2019 +0000
tree 90e2584ca0efa7dc6a787b2f381282e0fc9726f4
parent 4112a020fa74213a1b1be24d3586d1eab4ed83e2

goldfish: sync arm mk file with aosp to avoid merge conflict

Change-Id: I06d6be4f25e3f0a83235dffe424353b8c1df6613

arm32-vendor.mk

diff --git a/arm32-vendor.mk b/arm32-vendor.mk
index f047b4b..a1bb772 100644
--- a/arm32-vendor.mk
+++ b/arm32-vendor.mk
@@ -1,4 +1,3 @@
-PRODUCT_KERNEL_VERSION := 4.4
 
 PRODUCT_PROPERTY_OVERRIDES += \
        vendor.rild.libpath=/vendor/lib/libgoldfish-ril.so
@@ -8,13 +7,10 @@
 # Note: the following lines need to stay at the beginning so that it can
 # take priority  and override the rules it inherit from other mk files
 # see copy file rules in core/Makefile
-PRODUCT_SDK_ADDON_COPY_FILES += \
-    device/generic/goldfish/data/etc/advancedFeatures.ini.arm:images/armeabi-v7a/advancedFeatures.ini \
-    prebuilts/qemu-kernel/arm64/$(PRODUCT_KERNEL_VERSION)/kernel-qemu2:images/armeabi-v7a/kernel-ranchu-64
 PRODUCT_COPY_FILES += \
     device/generic/goldfish/fstab.ranchu.initrd.arm:$(TARGET_COPY_OUT_RAMDISK)/fstab.ranchu \
+    prebuilts/qemu-kernel/arm64/4.4/kernel-qemu2:kernel-ranchu-64 \
     device/generic/goldfish/data/etc/advancedFeatures.ini.arm:advancedFeatures.ini \
-    prebuilts/qemu-kernel/arm64/$(PRODUCT_KERNEL_VERSION)/kernel-qemu2:kernel-ranchu-64 \
     device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu
 
 EMULATOR_VENDOR_NO_GNSS := true

arm64-vendor.mk

diff --git a/arm64-vendor.mk b/arm64-vendor.mk
index e04bdd0..12100c8 100644
--- a/arm64-vendor.mk
+++ b/arm64-vendor.mk
@@ -1,4 +1,3 @@
-PRODUCT_KERNEL_VERSION := 4.4
 
 PRODUCT_PROPERTY_OVERRIDES += \
        vendor.rild.libpath=/vendor/lib64/libgoldfish-ril.so
@@ -8,14 +7,11 @@
 # Note: the following lines need to stay at the beginning so that it can
 # take priority  and override the rules it inherit from other mk files
 # see copy file rules in core/Makefile
-PRODUCT_SDK_ADDON_COPY_FILES += \
-    device/generic/goldfish/data/etc/advancedFeatures.ini.arm:images/arm64-v8a/advancedFeatures.ini \
-    prebuilts/qemu-kernel/arm64/$(PRODUCT_KERNEL_VERSION)/kernel-qemu2:images/arm64-v8a/kernel-ranchu
-
 PRODUCT_COPY_FILES += \
     device/generic/goldfish/fstab.ranchu.initrd.arm:$(TARGET_COPY_OUT_RAMDISK)/fstab.ranchu \
+    prebuilts/qemu-kernel/arm64/4.4/kernel-qemu2:kernel-ranchu \
     device/generic/goldfish/data/etc/advancedFeatures.ini.arm:advancedFeatures.ini \
-    prebuilts/qemu-kernel/arm64/$(PRODUCT_KERNEL_VERSION)/kernel-qemu2:kernel-ranchu \
     device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu
+
 EMULATOR_VENDOR_NO_GNSS := true