Rename to db410c and base the configs on Juno

Renamed the device to db410c (shorter), and based it upon
Juno configs.

Be sure to use androidboot.hardware=db410c in the kernel command
line args.

Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>

17 files changed, 286 insertions, 294 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 0c22826..101b909 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-PRODUCT_MAKEFILES := $(LOCAL_DIR)/full_dragonboard410c.mk
+PRODUCT_MAKEFILES := $(LOCAL_DIR)/db410c.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index f4c472d..b52b05d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,71 +1,83 @@
-# config.mk
-#
-# Product-specific compile-time definitions.
-#
-
-# The generic product target doesn't have any hardware-specific pieces.
-TARGET_NO_BOOTLOADER := true
-TARGET_NO_KERNEL := true
-TARGET_NO_RADIOIMAGE := true
-
+# Primary Arch
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
+ifneq (,$(wildcard $(LOCAL_PATH)/../../../bionic/libc/arch-arm64/cortex-a57))
+TARGET_CPU_VARIANT := cortex-a57
+else
+TARGET_CPU_VARIANT := cortex-a53
+endif
 TARGET_CPU_ABI := arm64-v8a
-TARGET_CPU_ABI2 :=
-TARGET_CPU_VARIANT := generic
-TARGET_CPU_SMP := true
 
+# Secondary Arch
 TARGET_2ND_ARCH := arm
 TARGET_2ND_ARCH_VARIANT := armv7-a-neon
+ifneq (,$(wildcard $(LOCAL_PATH)/../../../bionic/libc/arch-arm/cortex-a57))
+TARGET_2ND_CPU_VARIANT := cortex-a57
+else
+TARGET_2ND_CPU_VARIANT := cortex-a53
+endif
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := cortex-a15
 
-#SMALLER_FONT_FOOTPRINT := true
-#MINIMAL_FONT_FOOTPRINT := true
+TARGET_USES_64_BIT_BINDER := true
+TARGET_SUPPORTS_32_BIT_APPS := true
+TARGET_SUPPORTS_64_BIT_APPS := true
+
+TARGET_BOARD_PLATFORM := db410c
+ANDROID_64=true
+WITH_DEXPREOPT ?= true
+USE_OPENGL_RENDERER := true
+BIONIC_TESTS ?= true
 
 # Some framework code requires this to enable BT
 # For now:
 BOARD_HAVE_BLUETOOTH := false
-#BOARD_HAVE_BLUETOOTH := true
-#BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/generic/common/bluetooth
 
-BOARD_USES_GENERIC_AUDIO := true
+ifeq ($(strip $(USE_LINARO_TOOLCHAIN)),true)
+# 64bit toolchain
+KERNEL_TOOLS_PREFIX ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro/bin/aarch64-linux-android-
+TARGET_TOOLS_PREFIX ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro/bin/aarch64-linux-android-
+# 32bit toolchain
+# Linaro 32bit toolchain is disabled because of this bug https://bugs.linaro.org/show_bug.cgi?id=383
+2ND_TARGET_TOOLCHAIN_ROOT ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro
+2ND_TARGET_TOOLS_PREFIX ?= $(realpath $(TOP))/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro/bin/arm-linux-androideabi-
+endif
 
-BOARD_GPU_DRIVERS := freedreno
-#BOARD_EGL_CFG := device/generic/common/gpu/egl_mesa.cfg
+BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200n8 console=ttyMSM0,115200n8 debug earlyprintk=serial,0x16640000,115200 verbose androidboot.selinux=permissive androidboot.hardware=qcom user_debug=31
 
+TARGET_NO_BOOTLOADER := true
+TARGET_NO_KERNEL := false
+TARGET_NO_RECOVERY := true
+TARGET_USE_XLOADER := false
+TARGET_USE_UBOOT := false
+TARGET_HARDWARE_3D := true
+TARGET_SHELL := ash
+BOARD_USES_GENERIC_AUDIO := false
+BOARD_USES_ALSA_AUDIO := false
 USE_CAMERA_STUB := true
-
-BUILD_EMULATOR_OPENGL := false
-USE_OPENGL_RENDERER := true
-
-BOARD_USE_LEGACY_UI := true
-VSYNC_EVENT_PHASE_OFFSET_NS := 0
-
-BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hdc.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 earlyprintk androidboot.selinux=permissive
-
-TARGET_USES_64_BIT_BCMDHD := true
-TARGET_USES_64_BIT_BINDER := true
-TARGET_USES_LOGD := true
-
 TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 524288000
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 880803840
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
 BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_FLASH_BLOCK_SIZE := 512
 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
 
-BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy
+BOARD_SEPOLICY_DIRS += device/linaro/build/sepolicy
 BOARD_SEPOLICY_UNION += \
-        bootanim.te \
-        device.te \
-        domain.te \
-        file.te \
-        file_contexts \
-        qemud.te \
-        rild.te \
-        shell.te \
-        surfaceflinger.te \
-        system_server.te
+        gatord.te  \
+        init.te  \
+        kernel.te  \
+        logd.te  \
+        mediaserver.te  \
+        netd.te  \
+        shell.te  \
+        surfaceflinger.te
+
+#TARGET_HAS_A53ERRATUM835769 := true
+
+#GRALLOC_FB_SWAP_RED_BLUE:=1
+GRALLOC_DEPTH:=GRALLOC_32_BITS
+
+# Applies only to AOSP master build for db410c where it needs prebuilt STLPORT
+INCLUDE_STLPORT_FOR_MASTER := true
diff --git a/full_dragonboard410c.mk b/db410c.mk
index 4d39cad..f1c4855 100644
--- a/full_dragonboard410c.mk
+++ b/db410c.mk
@@ -14,10 +14,10 @@
 # limitations under the License.
 #
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
-$(call inherit-product, device/freedreno/dragonboard410c/device.mk)
+$(call inherit-product, device/linaro/db410c/device.mk)
 
-PRODUCT_NAME := full_dragonboard410c
-PRODUCT_DEVICE := dragonboard410c
+PRODUCT_NAME := db410c
+PRODUCT_DEVICE := db410c
 PRODUCT_BRAND := Android
-PRODUCT_MODEL := dragonboard410c
-PRODUCT_MANUFACTURER := freedreno
+PRODUCT_MODEL := db410c
+PRODUCT_MANUFACTURER := linaro
diff --git a/db410c_monkey_blacklist b/db410c_monkey_blacklist
new file mode 100644
index 0000000..f629af4
--- /dev/null
+++ b/db410c_monkey_blacklist
@@ -0,0 +1,5 @@
+com.android.bluetooth
+com.android.cts.opengl
+com.android.development
+com.android.quicksearchbox
+com.android.speechrecorder
diff --git a/device.mk b/device.mk
index 78172b6..daba980 100644
--- a/device.mk
+++ b/device.mk
@@ -14,39 +14,62 @@
 # limitations under the License.
 #
 
+# Adjust the dalvik heap to be appropriate for a tablet.
+$(call inherit-product-if-exists,frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
+
 ifeq ($(TARGET_PREBUILT_KERNEL),)
-LOCAL_KERNEL := device/freedreno/dragonboard410c-kernel/kernel
+LOCAL_KERNEL := device/linaro/dragonboard410c-kernel/kernel
 else
 LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
 endif
 
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES := \
-	ro.sf.lcd_density=180 \
-	dalvik.vm.heapsize=48m \
 
-PRODUCT_COPY_FILES := \
-	$(foreach f,$(wildcard $(LOCAL_PATH)/root/*),$(f):$(subst $(LOCAL_PATH)/,,$(f))) \
-	$(LOCAL_KERNEL):kernel
+PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
+			$(LOCAL_PATH)/root/fstab.db410c:root/fstab.db410c \
+			$(LOCAL_PATH)/root/init.db410c.rc:root/init.db410c.rc \
+			$(LOCAL_PATH)/db410c_monkey_blacklist:data/db410c_monkey_blacklist)
 
-# firmware distributed separately, copy these files from your device and
-# use ADRENO_FIRMWARE=path/to/firmware/directory on the make cmdline:
-PRODUCT_COPY_FILES += \
-	$(ADRENO_FIRMWARE)/a300_pfp.fw:root/lib/firmware/a300_pfp.fw \
-	$(ADRENO_FIRMWARE)/a300_pm4.fw:root/lib/firmware/a300_pm4.fw \
+PRODUCT_COPY_FILES += $(LOCAL_KERNEL):kernel \
+
+# Set custom settings
+DEVICE_PACKAGE_OVERLAYS := device/linaro/db410c/overlay
+
+# Add openssh support for remote debugging and job submission
+# PRODUCT_PACKAGES += ssh sftp scp sshd ssh-keygen sshd_config start-ssh
 
-$(call inherit-product-if-exists, vendor/freedreno/dragonboard410c/device-vendor.mk)
+# Build and run only ART
+PRODUCT_RUNTIMES := runtime_libart_default
 
+# Build libion for new double-buffering HDLCD driver
+# PRODUCT_PACKAGES += libion
 
-PRODUCT_CHARACTERISTICS := tablet
+# Build gatord daemon for DS-5/Streamline
+PRODUCT_PACKAGES += gatord
 
-PRODUCT_AAPT_CONFIG := normal large xlarge mdpi hdpi
-PRODUCT_AAPT_PREF_CONFIG := mdpi
+# Build libGLES_android for Juno
+PRODUCT_PACKAGES += libGLES_android
 
-DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
+# Include ION tests
+#PRODUCT_PACKAGES += iontest \
+#                    ion-unit-tests
 
-# Get the hardware acceleration libraries
-$(call inherit-product-if-exists,$(LOCAL_PATH)/gpu/gpu_mesa.mk)
+# Set zygote config
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32
+PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc
 
-PRODUCT_PACKAGES += \
-	Trebuchet \
+# Copy hardware config file(s)
+PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
+                        device/linaro/build/android.hardware.screen.xml:system/etc/permissions/android.hardware.screen.xml )
+
+PRODUCT_COPY_FILES +=   frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \
+                        frameworks/native/data/etc/android.software.app_widgets.xml:system/etc/permissions/android.software.app_widgets.xml \
+                        frameworks/native/data/etc/android.software.backup.xml:system/etc/permissions/android.software.backup.xml \
+                        frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml
+
+# firmware distributed separately, copy these files from your device and
+# use ADRENO_FIRMWARE=path/to/firmware/directory on the make cmdline:
+PRODUCT_COPY_FILES += \
+        $(ADRENO_FIRMWARE)/a300_pfp.fw:root/lib/firmware/a300_pfp.fw \
+        $(ADRENO_FIRMWARE)/a300_pm4.fw:root/lib/firmware/a300_pm4.fw \
 
+$(call inherit-product-if-exists, device/linaro/build/common-device.mk)
diff --git a/gpu/gpu_mesa.mk b/gpu/gpu_mesa.mk
index 70854cb..8d818a5 100644
--- a/gpu/gpu_mesa.mk
+++ b/gpu/gpu_mesa.mk
@@ -9,11 +9,22 @@
 #
 
 PRODUCT_PACKAGES += \
-    gralloc.drm     \
-    libGLES_mesa
+	libGLES_android \
+	gralloc.default \
+	hwcomposer.default \
+	libGLESv1_CM_emulation \
+	lib_renderControl_enc \
+	libEGL_emulation \
+	libGLESv2_enc \
+	libOpenglSystemCommon \
+	libGLESv2_emulation \
+	libGLESv1_enc
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
-    hal.gralloc=drm \
-    debug.egl.hw=1 \
-    ro.opengles.version=196608
+	ro.nohardwaregfx=true \
+	ro.opengles.version=131072 \
+	ro.sf.lcd_density=160 \
+	debug.sf.no_hw_vsync=1 \
+	ro.kernel.qemu.gles=0 \
+	ro.kernel.qemu=1
 
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..029bdec
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2011, 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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources>
+
+    <!-- This device is not "voice capable"; it's data-only. -->
+    <bool name="config_voice_capable">false</bool>
+
+    <!-- This device does not allow sms service. -->
+    <bool name="config_sms_capable">false</bool>
+
+    <!-- Separate software navigation bar required on this device. -->
+    <bool name="config_showNavigationBar">true</bool>
+
+    <!-- XXXXX NOTE THE FOLLOWING RESOURCES USE THE WRONG NAMING CONVENTION.
+         Please don't copy them, copy anything else. -->
+
+    <!-- the 5th element "resore-time" indicates the number of milliseconds to delay
+        before automatically restore the default connection.  Set -1 if the connection
+         does not require auto-restore. -->
+    <!-- the 6th element indicates boot-time dependency-met value. -->
+    <string-array translatable="false" name="networkAttributes">
+        <item>"wifi,1,1,1,-1,true"</item>
+        <item>"wifi_p2p,13,1,0,-1,true"</item>
+        <item>"ethernet,9,9,2,-1,true"</item>
+    </string-array>
+
+    <!-- This string array should be overridden by the device to present a list of radio
+         attributes.  This is used by the connectivity manager to decide which networks can coexist
+         based on the hardware -->
+    <!-- An Array of "[ConnectivityManager connectionType],
+                      [# simultaneous connection types]"  -->
+    <string-array translatable="false" name="radioAttributes">
+        <item>"1,1"</item>
+        <item>"9,1"</item>
+    </string-array>
+
+
+</resources>
diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
new file mode 100644
index 0000000..34d5433
--- /dev/null
+++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="def_screen_off_timeout">-1</integer>
+    <bool name="def_lockscreen_disabled">true</bool>
+    <bool name="def_stay_on_while_plugged_in">true</bool>
+</resources>
diff --git a/root/fstab.db410c b/root/fstab.db410c
new file mode 100644
index 0000000..2b8efdf
--- /dev/null
+++ b/root/fstab.db410c
@@ -0,0 +1,7 @@
+# Android fstab file.
+#<src>                                                  <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+/dev/block/mmcblk0p22	/system      ext4    ro,barrier=1,discard                                wait
+/dev/block/mmcblk0p29	/data        ext4    nosuid,nodev,barrier=1,noauto_da_alloc,discard      wait,check,encryptable=footer
+/devices/*/xhci-hcd.0.auto/usb*             auto            auto    defaults	voldmanaged=usb:auto
diff --git a/root/fstab.qcom b/root/fstab.qcom
deleted file mode 100644
index 1148a86..0000000
--- a/root/fstab.qcom
+++ /dev/null
@@ -1,10 +0,0 @@
-# Android fstab file.
-#<src>                                                  <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-/dev/mmcblk0p22	/system      ext4    ro,barrier=1,discard                                wait
-/dev/mmcblk0p29	/data        ext4    nosuid,nodev,barrier=1,noauto_da_alloc,discard      wait,check,encryptable=footer
-#/devices/soc.0/7864900.sdhci/mmc_host	/storage/sdcard1   vfat    nosuid,nodev         wait,voldmanaged=sdcard1:auto,noemulatedsd
-#/devices/soc.0/78d9000.usb		/ 	auto vfat defaults voldmanaged=usbotg:auto
-#/dev/block/zram0             none         swap    defaults zramsize=536870912
-#/dev/block/bootdevice/by-name/config         /frp         emmc    defaults                                            defaults
diff --git a/root/fstab.qualcomm b/root/fstab.qualcomm
deleted file mode 100644
index 1148a86..0000000
--- a/root/fstab.qualcomm
+++ /dev/null
@@ -1,10 +0,0 @@
-# Android fstab file.
-#<src>                                                  <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-/dev/mmcblk0p22	/system      ext4    ro,barrier=1,discard                                wait
-/dev/mmcblk0p29	/data        ext4    nosuid,nodev,barrier=1,noauto_da_alloc,discard      wait,check,encryptable=footer
-#/devices/soc.0/7864900.sdhci/mmc_host	/storage/sdcard1   vfat    nosuid,nodev         wait,voldmanaged=sdcard1:auto,noemulatedsd
-#/devices/soc.0/78d9000.usb		/ 	auto vfat defaults voldmanaged=usbotg:auto
-#/dev/block/zram0             none         swap    defaults zramsize=536870912
-#/dev/block/bootdevice/by-name/config         /frp         emmc    defaults                                            defaults
diff --git a/root/init.db410c.rc b/root/init.db410c.rc
new file mode 100644
index 0000000..ed46150
--- /dev/null
+++ b/root/init.db410c.rc
@@ -0,0 +1,72 @@
+on init
+    # mount debugfs
+    mount debugfs /sys/kernel/debug /sys/kernel/debug
+
+on init
+    # disable transparent huge pages
+    write /sys/kernel/mm/transparent_hugepage/enabled "never"
+
+on fs
+    mount_all /fstab.db410c
+
+on post-fs-data
+    mkdir /data/media 0770 media_rw media_rw
+    mkdir /data/misc/gatord 0700 root root
+
+    # Set SELinux security contexts for files used by lava.
+    restorecon_recursive /data/local/tmp/lava
+
+on post-fs
+    chmod 0666 /dev/graphics/fb0
+
+    # For legacy support
+    # See storage config details at http://source.android.com/tech/storage/
+    # since /storage is mounted on post-fs in init.rc
+    symlink /sdcard /mnt/sdcard
+    symlink /sdcard /storage/sdcard0
+
+on boot
+
+    setprop ARGH ARGH
+    setprop ro.radio.use-ppp no
+    setprop ro.build.product generic
+    setprop ro.product.device generic
+
+# fake some battery state
+    setprop status.battery.state Slow
+    setprop status.battery.level 5
+    setprop status.battery.level_raw  50
+    setprop status.battery.level_scale 9
+
+# Set Display density
+    setprop ro.sf.lcd_density 160
+
+# Disable GPU support
+    setprop ro.kernel.qemu 1
+    setprop ro.kernel.qemu.gles 0
+
+# change permissions for process groups
+# https://bugs.launchpad.net/bugs/1037611
+    chmod 0660 /dev/cpuctl
+
+# enable Google-specific location features,
+# like NetworkLocationProvider and LocationCollector
+    setprop ro.com.google.locationfeatures 1
+
+# enable test harness
+    setprop ro.test_harness true
+
+    # Setup paths used for socket communication with the dhcp daemon (dhcpd)
+    mkdir /data/misc/dhcp 0770 dhcp dhcp
+    chown dhcp dhcp /data/misc/dhcp
+
+service dhcpcd_eth0 /system/bin/dhcpcd -aABDKL
+    class main
+    group dhcp
+    oneshot
+
+service iprenew_eth0 /system/bin/dhcpcd -n
+     class late_start
+     disabled
+     oneshot
+
diff --git a/root/init.partitions.db410c.rc b/root/init.partitions.db410c.rc
new file mode 100644
index 0000000..3f16d08
--- /dev/null
+++ b/root/init.partitions.db410c.rc
@@ -0,0 +1,12 @@
+on init
+    # mount debugfs
+    mount debugfs /sys/kernel/debug /sys/kernel/debug
+
+    symlink /sdcard /mnt/sdcard
+    symlink /sdcard /storage/sdcard0
+
+on post-fs-data
+    mkdir /data/media 0770 media_rw media_rw
+
+on fs
+    mount_all /fstab.qcom
diff --git a/root/init.partitions.qualcomm.rc b/root/init.partitions.qualcomm.rc
deleted file mode 100644
index a235df3..0000000
--- a/root/init.partitions.qualcomm.rc
+++ /dev/null
@@ -1,31 +0,0 @@
-on init
-    # mount debugfs
-    mount debugfs /sys/kernel/debug /sys/kernel/debug
-
-    # See storage config details at http://source.android.com/tech/storage/
-    mkdir /mnt/shell/emulated 0700 shell shell
-    mkdir /storage/emulated 0555 root root
-
-    export EXTERNAL_STORAGE /storage/emulated/legacy
-    export EMULATED_STORAGE_SOURCE /mnt/shell/emulated
-    export EMULATED_STORAGE_TARGET /storage/emulated
-
-    # Support legacy paths
-    symlink /storage/emulated/legacy /sdcard
-    symlink /storage/emulated/legacy /mnt/sdcard
-    symlink /storage/emulated/legacy /storage/sdcard0
-    symlink /mnt/shell/emulated/0 /storage/emulated/legacy
-
-    # Disabled virtual memory randomization
-    # (if randomization is enabled the AEM-JIT will have a lower cache hit rate)
-    write /proc/sys/kernel/randomize_va_space 0
-
-# virtual sdcard daemon running as media_rw (1023)
-service sdcard /system/bin/sdcard /data/media /mnt/shell/emulated 1023 1023
-    class late_start
-
-on post-fs-data
-    mkdir /data/media 0770 media_rw media_rw
-
-on fs
-    mount_all /fstab.qualcomm
diff --git a/root/init.qcom.rc b/root/init.qcom.rc
deleted file mode 100644
index d081831..0000000
--- a/root/init.qcom.rc
+++ /dev/null
@@ -1,81 +0,0 @@
-import /init.partitions.qualcomm.rc
-
-on init
-    # mount debugfs
-    mount debugfs /sys/kernel/debug /sys/kernel/debug
-
-# power management
-# Enable off mode by default
-    #write /sys/kernel/debug/pm_debug/enable_off_mode 1
-
-on boot
-    # create dhcpcd dir
-    mkdir /data/misc/dhcp 0770 dhcp dhcp
-    mkdir /data/misc/gatord 0700 root root
-    chmod 0770 /data/misc/dhcp
-
-    # For TC2, set A15 and A7 clusters A7s to interactive governor
-    # (Other CoreTiles don't have cpu_freq so this doesn't affect them.)
-    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor interactive
-    write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor interactive
-    write /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor interactive
-    write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor interactive
-    write /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor interactive
-
-    # change permissions for alsa nodes
-    chmod 0777 /dev/snd/pcmC0D0c
-    chmod 0777 /dev/snd/pcmC0D0p
-    chmod 0777 /dev/snd/controlC0
-    chmod 0777 /dev/snd/timer
-
-    #change permissions for alsa nodes for audio modem
-    chmod 0777 /dev/snd/pcmC0D5c
-    chmod 0777 /dev/snd/pcmC0D5p
-
-    #change permissions for alsa nodes for HDMI
-    chmod 777  /dev/snd/pcmC0D7p
-
-    chown system system /sys/class/graphics/fb0/overlays
-    chown system system /sys/class/graphics/fb0/fit_to_screen
-    chown system system /sys/class/graphics/fb1/overlays
-
-# Load gator module
-    insmod /system/modules/gator.ko
-
-on post-fs-data
-    # Set SELinux security contexts for files used by lava.
-    restorecon_recursive /data/local/tmp/lava
-
-service boardtweaks /sbin/tweaks.qualcomm.sh
-    class main
-    user root
-    oneshot
-
-# setup IRQ affinity to the A7s
-service setirqaffinity /sbin/set_irq_affinity.sh 0xc07
-    class main
-    user root
-    oneshot
-
-service faketsd /system/bin/faketsd
-    class main
-    user bluetooth
-    group bluetooth
-    oneshot
-
-service dhcpcd_eth0 /system/bin/dhcpcd -aABDKL
-    class main
-    disabled
-    oneshot
-
-service iprenew_eth0 /system/bin/dhcpcd -n
-    class late_start
-    disabled
-    oneshot
-
-service gatord /system/bin/gatord -c /data/misc/gatord/configuration.xml
-    class main
-    user root
-    oneshot
-    seclabel u:r:gatord:s0
-
diff --git a/root/init.qualcomm.rc b/root/init.qualcomm.rc
deleted file mode 100644
index d081831..0000000
--- a/root/init.qualcomm.rc
+++ /dev/null
@@ -1,81 +0,0 @@
-import /init.partitions.qualcomm.rc
-
-on init
-    # mount debugfs
-    mount debugfs /sys/kernel/debug /sys/kernel/debug
-
-# power management
-# Enable off mode by default
-    #write /sys/kernel/debug/pm_debug/enable_off_mode 1
-
-on boot
-    # create dhcpcd dir
-    mkdir /data/misc/dhcp 0770 dhcp dhcp
-    mkdir /data/misc/gatord 0700 root root
-    chmod 0770 /data/misc/dhcp
-
-    # For TC2, set A15 and A7 clusters A7s to interactive governor
-    # (Other CoreTiles don't have cpu_freq so this doesn't affect them.)
-    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor interactive
-    write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor interactive
-    write /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor interactive
-    write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor interactive
-    write /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor interactive
-
-    # change permissions for alsa nodes
-    chmod 0777 /dev/snd/pcmC0D0c
-    chmod 0777 /dev/snd/pcmC0D0p
-    chmod 0777 /dev/snd/controlC0
-    chmod 0777 /dev/snd/timer
-
-    #change permissions for alsa nodes for audio modem
-    chmod 0777 /dev/snd/pcmC0D5c
-    chmod 0777 /dev/snd/pcmC0D5p
-
-    #change permissions for alsa nodes for HDMI
-    chmod 777  /dev/snd/pcmC0D7p
-
-    chown system system /sys/class/graphics/fb0/overlays
-    chown system system /sys/class/graphics/fb0/fit_to_screen
-    chown system system /sys/class/graphics/fb1/overlays
-
-# Load gator module
-    insmod /system/modules/gator.ko
-
-on post-fs-data
-    # Set SELinux security contexts for files used by lava.
-    restorecon_recursive /data/local/tmp/lava
-
-service boardtweaks /sbin/tweaks.qualcomm.sh
-    class main
-    user root
-    oneshot
-
-# setup IRQ affinity to the A7s
-service setirqaffinity /sbin/set_irq_affinity.sh 0xc07
-    class main
-    user root
-    oneshot
-
-service faketsd /system/bin/faketsd
-    class main
-    user bluetooth
-    group bluetooth
-    oneshot
-
-service dhcpcd_eth0 /system/bin/dhcpcd -aABDKL
-    class main
-    disabled
-    oneshot
-
-service iprenew_eth0 /system/bin/dhcpcd -n
-    class late_start
-    disabled
-    oneshot
-
-service gatord /system/bin/gatord -c /data/misc/gatord/configuration.xml
-    class main
-    user root
-    oneshot
-    seclabel u:r:gatord:s0
-
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 41a4d58..5f3425a 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -14,6 +14,6 @@
 # limitations under the License.
 #
 
-add_lunch_combo full_dragonboard410c-user
-add_lunch_combo full_dragonboard410c-userdebug
-add_lunch_combo full_dragonboard410c-eng
+add_lunch_combo db410c-user
+add_lunch_combo db410c-userdebug
+add_lunch_combo db410c-eng