From d7a6300c940f1d61f5d587f7b004ffbda89f6488 Mon Sep 17 00:00:00 2001 From: Isaac Chen Date: Mon, 18 Dec 2017 18:42:05 +0800 Subject: [PATCH] Use proper make variable for vendor directory Usually, we use $(TARGET_COPY_OUT_VENDOR) in make file to refer to the vendor directory on the device. In target/product/emulator.mk on AOSP, this make variable is used, but in internal master, "vendor" is used! This would cause some automerger conflict when new CLs are commited to AOSP. Test: $ lunch aosp_x86-userdebug; m -j; emulator Change-Id: I18667ac76d0ba3000aa361051d02e4cbb62a4f2f --- target/product/emulator.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/product/emulator.mk b/target/product/emulator.mk index 474a03f64a..0f33f38601 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -114,8 +114,8 @@ PRODUCT_PACKAGES += \ vndk-sp PRODUCT_COPY_FILES += \ - device/generic/goldfish/init.ranchu-core.sh:vendor/bin/init.ranchu-core.sh \ - device/generic/goldfish/init.ranchu-net.sh:vendor/bin/init.ranchu-net.sh \ + device/generic/goldfish/init.ranchu-core.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-core.sh \ + device/generic/goldfish/init.ranchu-net.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-net.sh \ device/generic/goldfish/init.ranchu.rc:root/init.ranchu.rc \ device/generic/goldfish/fstab.ranchu:root/fstab.ranchu \ device/generic/goldfish/fstab.ranchu.early:root/fstab.ranchu.early \