Remove sdm845-userdebug build target
Remove the common sdm845-userdebug build target.
Move the common device configs to device-common.mk and
{beryllium,enchilada}/device.mk file.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
diff --git a/beryllium/device.mk b/beryllium/device.mk
index c9af082..92319a0 100644
--- a/beryllium/device.mk
+++ b/beryllium/device.mk
@@ -14,11 +14,15 @@
# limitations under the License.
#
+PRODUCT_COPY_FILES := \
+ $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.beryllium \
+ $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.beryllium \
+ device/generic/sdm845/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.beryllium.rc \
+ device/generic/sdm845/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.beryllium.usb.rc \
+ device/generic/sdm845/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/beryllium.kl
+
# Build generic Audio HAL
-PRODUCT_PACKAGES := audio.primary.$(TARGET_DEVICE)
+PRODUCT_PACKAGES := audio.primary.beryllium
# Build generic lights HAL
-PRODUCT_PACKAGES += lights.$(TARGET_DEVICE)
-
-RAMDISK_FSTAB_TARGET := $(LOCAL_PATH)/fstab.ramdisk
-$(call inherit-product, device/generic/sdm845/sdm845/device.mk)
\ No newline at end of file
+PRODUCT_PACKAGES += lights.beryllium