diff --git a/a30s/BoardConfig.mk b/a30s/BoardConfig.mk
new file mode 100644
index 0000000..ce899d8
--- /dev/null
+++ b/a30s/BoardConfig.mk
@@ -0,0 +1,19 @@
+DEVICE_PATH := device/samsung/a30s
+
+# Asserts
+TARGET_OTA_ASSERT_DEVICE := a30s,a30sdd
+
+# Kernel
+TARGET_KERNEL_CONFIG := exynos7885-a30s_defconfig
+
+# Display
+TARGET_SCREEN_DENSITY := 420
+
+# Partitions
+BOARD_RECOVERYIMAGE_PARTITION_SIZE := 55574528
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 5158993920
+BOARD_CACHEIMAGE_PARTITION_SIZE := 157286400
+BOARD_VENDORIMAGE_PARTITION_SIZE   := 452984832
+
+# Inherit common board flags
+include device/samsung/universal7885-common/BoardConfigCommon.mk
diff --git a/a30s/device.mk b/a30s/device.mk
new file mode 100644
index 0000000..c202128
--- /dev/null
+++ b/a30s/device.mk
@@ -0,0 +1,26 @@
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
+
+# Inherit common device configuration
+$(call inherit-product, device/samsung/universal7885-common/universal7885-common.mk)
+
+$(call inherit-product, vendor/samsung/a30s/a30s-vendor.mk)
+
+$(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk)
+
+# USB
+PRODUCT_PACKAGES += \
+    android.hardware.usb@1.3-service.samsung
+
+TARGET_SCREEN_HEIGHT := 2280
+TARGET_SCREEN_WIDTH := 1080
+
+# Feature Permissions
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
+    frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml
+    
+PRODUCT_PACKAGES += \
+   fstab.exynos7904
+
+PRODUCT_PACKAGES += \
+   android.hardware.sensors@1.0-service
diff --git a/a30s/dtbo/Android.mk b/a30s/dtbo/Android.mk
new file mode 100644
index 0000000..e04cb76
--- /dev/null
+++ b/a30s/dtbo/Android.mk
@@ -0,0 +1,4 @@
+ifeq ($(TARGET_DEVICE),a40)
+LOCAL_PATH := $(call my-dir)
+$(call add-radio-file,eureka_dtbo.img)
+endif
diff --git a/a30s/dtbo/eureka_dtbo.img b/a30s/dtbo/eureka_dtbo.img
new file mode 100644
index 0000000..ccda4f7
Binary files /dev/null and b/a30s/dtbo/eureka_dtbo.img differ
diff --git a/a30s/extract-files.sh b/a30s/extract-files.sh
new file mode 100644
index 0000000..db24d0a
--- /dev/null
+++ b/a30s/extract-files.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017-2020 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# If we're being sourced by the common script that we called,
+# stop right here. No need to go down the rabbit hole.
+if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
+    return
+fi
+
+set -e
+
+export DEVICE=a30s
+export DEVICE_COMMON=universal7885-common
+export VENDOR=samsung
+
+"./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@"
diff --git a/a30s/full_a30s.mk b/a30s/full_a30s.mk
new file mode 100644
index 0000000..bdaef7a
--- /dev/null
+++ b/a30s/full_a30s.mk
@@ -0,0 +1,18 @@
+# Copyright (C) 2018 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+
+# Inherit from those products. Most specific first.
+$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_p.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+
+# Inherit device configuration
+$(call inherit-product, device/samsung/a40/device.mk)
+
+# Device identifier. This must come after all inclusions
+PRODUCT_DEVICE := a30s
+PRODUCT_NAME := full_a30s
+PRODUCT_MODEL := SM-A307F
+PRODUCT_BRAND := samsung
+PRODUCT_MANUFACTURER := samsung
diff --git a/a30s/overlay/frameworks/base/core/res/res/values/config.xml b/a30s/overlay/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..30bde11
--- /dev/null
+++ b/a30s/overlay/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,68 @@
+<!--
+/**
+ * Copyright (c) 2009, 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.  Do not translate. -->
+<resources>
+   <!-- The bounding path of the cutout region of the main built-in display.
+         Must either be empty if there is no cutout region, or a string that is parsable by
+         {@link android.util.PathParser}.
+         The path is assumed to be specified in display coordinates with pixel units and in
+         the display's native orientation, with the origin of the coordinate system at the
+         center top of the display.
+         To facilitate writing device-independent emulation overlays, the marker `@dp` can be
+         appended after the path string to interpret coordinates in dp instead of px units.
+         Note that a physical cutout should be configured in pixels for the best results.
+         Example for a 10px x 10px square top-center cutout:
+                <string ...>M -5,0 L -5,10 L 5,10 L 5,0 Z</string>
+         Example for a 10dp x 10dp square top-center cutout:
+                <string ...>M -5,0 L -5,10 L 5,10 L 5,0 Z @dp</string>
+         @see https://www.w3.org/TR/SVG/paths.html#PathData
+         -->
+   <string translatable="false" name="config_mainBuiltInDisplayCutout">M 0,0 H -67.42857142857143 V 30.85714285714286 H 67.42857142857143 V 0 H 0 Z @dp</string>
+   <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">@*android:string/config_mainBuiltInDisplayCutout</string>
+   <!-- If supported, are dreams enabled? (by default) -->
+   <bool name="config_dreamsEnabledByDefault">false</bool>
+   <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
+   <bool name="config_displayBlanksAfterDoze">false</bool>
+   <bool name="config_dozePulsePickup">false</bool>
+   <bool name="config_supportDoubleTapWake">true</bool>
+   <bool name="config_enableBurnInProtection">true</bool>
+   <!-- Amount of time it takes for the light sensor to warm up in milliseconds.
+         For this time after the screen turns on, the Power Manager
+         will not debounce light sensor readings -->
+   <integer name="config_lightSensorWarmupTime">200</integer>
+   <!-- The type of the light sensor to be used by the display framework for things like
+         auto-brightness. If unset, then it just gets the default sensor of type TYPE_LIGHT. -->
+   <string name="config_displayLightSensorType">com.samsung.sensor.physical_light</string>
+   <!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
+         when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
+         where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
+         and Strength as defined in Authenticators.java -->
+   <string-array name="config_biometric_sensors" translatable="false">
+      <item>0:2:15</item>
+      <!-- ID0:Fingerprint:Strong -->
+   </string-array>
+   <!-- For performance and storage reasons, limit the number of fingerprints per user -->
+   <integer name="config_fingerprintMaxTemplatesPerUser">4</integer>
+   <!-- Specify if the fingerprint hardware support gestures-->
+   <bool name="config_fingerprintSupportsGestures">true</bool>
+   <!-- True if the device supports system navigation keys. -->
+   <bool name="config_supportSystemNavigationKeys">true</bool>
+   <!-- Limit for the number of face templates per user -->
+   <integer name="config_faceMaxTemplatesPerUser">2</integer>
+</resources>
diff --git a/a30s/overlay/frameworks/base/core/res/res/values/dimens.xml b/a30s/overlay/frameworks/base/core/res/res/values/dimens.xml
new file mode 100644
index 0000000..4ccec08
--- /dev/null
+++ b/a30s/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -0,0 +1,10 @@
+<resources>
+   <!-- Height of the status bar in landscape. The height should be
+         Max((status bar content height + waterfall top size), top cutout size) -->
+   <dimen name="status_bar_height_landscape">24.0dip</dimen>
+   <!-- Height of the status bar in portrait. The height should be
+         Max((status bar content height + waterfall top size), top cutout size) -->
+   <dimen name="status_bar_height">86.0px</dimen>
+   <!-- Default radius of the software rounded corners. -->
+   <dimen name="rounded_corner_radius">40px</dimen>
+</resources>
diff --git a/a30s/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/a30s/overlay/frameworks/base/core/res/res/xml/power_profile.xml
new file mode 100644
index 0000000..dd27681
--- /dev/null
+++ b/a30s/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -0,0 +1,87 @@
+<device name="Android">
+   <item name="none">0</item>
+   <item name="screen.on.display0">93</item>
+   <item name="screen.full.display0">313</item>
+   <item name="bluetooth.active">118</item>
+   <item name="bluetooth.on">0.98</item>
+   <item name="wifi.on">0.43</item>
+   <item name="wifi.active">488</item>
+   <item name="wifi.scan">502</item>
+   <item name="dsp.audio">45</item>
+   <item name="dsp.video">286</item>
+   <item name="camera.flashlight">124</item>
+   <item name="camera.avg">662</item>
+   <item name="gps.on">32</item>
+   <item name="radio.active">164</item>
+   <item name="radio.scanning">115</item>
+   <array name="radio.on">
+      <value>7.3</value>
+      <value>7.3</value>
+   </array>
+   <array name="cpu.clusters.cores">
+      <value>6</value>
+      <value>2</value>
+   </array>
+   <array name="cpu.speeds.cluster0">
+      <value>1586000</value>
+      <value>1482000</value>
+      <value>1352000</value>
+      <value>1248000</value>
+      <value>1144000</value>
+      <value>1014000</value>
+      <value>902000</value>
+      <value>839000</value>
+      <value>757000</value>
+      <value>676000</value>
+      <value>546000</value>
+      <value>449000</value>
+   </array>
+   <array name="cpu.active.cluster0">
+      <value>50</value>
+      <value>43</value>
+      <value>34</value>
+      <value>28</value>
+      <value>24</value>
+      <value>18</value>
+      <value>15</value>
+      <value>13</value>
+      <value>11</value>
+      <value>10</value>
+      <value>7</value>
+      <value>6</value>
+   </array>
+   <array name="cpu.speeds.cluster1">
+      <value>1768000</value>
+      <value>1664000</value>
+      <value>1560000</value>
+      <value>1352000</value>
+      <value>1144000</value>
+      <value>936000</value>
+   </array>
+   <array name="cpu.active.cluster1">
+      <value>162</value>
+      <value>142</value>
+      <value>120</value>
+      <value>87</value>
+      <value>61</value>
+      <value>41</value>
+   </array>
+   <item name="cpu.idle">3.79</item>
+   <item name="cpu.awake">23</item>
+   <item name="battery.capacity">3100</item>
+   <item name="battery.typical.capacity">3100</item>
+   <item name="wifi.controller.idle">1</item>
+   <item name="wifi.controller.rx">65</item>
+   <item name="wifi.controller.tx">265</item>
+   <array name="wifi.controller.tx_levels">
+      <value>0</value>
+   </array>
+   <item name="wifi.controller.voltage">3600</item>
+   <array name="wifi.batchedscan">
+      <value>.0002</value>
+      <value>.002</value>
+      <value>.02</value>
+      <value>.2</value>
+      <value>2</value>
+   </array>
+</device>
diff --git a/a30s/proprietary-files.txt b/a30s/proprietary-files.txt
new file mode 100644
index 0000000..b9dc983
--- /dev/null
+++ b/a30s/proprietary-files.txt
@@ -0,0 +1,135 @@
+vendor/bin/hw/gpsd
+vendor/etc/mixer_gains.xml
+vendor/etc/mixer_paths.xml
+vendor/etc/wifi/hydra_config.sdb
+vendor/etc/wifi/indoorchannel.info
+vendor/etc/wifi/mx
+vendor/etc/wifi/mx140/debug/common/log-strings.bin
+vendor/etc/wifi/mx140/debug/hardware/moredump/bt_registers.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/cortexM4.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/cortexR4.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/mailbox16.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/mailbox4.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/mailbox8.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/moredump.bin
+vendor/etc/wifi/mx140/debug/hardware/moredump/moredump.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/pl192vic.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/rf_chip_registers.xml
+vendor/etc/wifi/mx140/debug/hardware/moredump/wlan_sys_registers.xml
+vendor/etc/wifi/mx140/debug/wlan/hip_signals.xml
+vendor/etc/wifi/mx140/debug/wlan/hydra_config.sdb
+vendor/etc/wifi/mx140/debug/wlan/id.txt
+vendor/etc/wifi/mx140/debug/wlan/mib_out.xml
+vendor/etc/wifi/mx140/debug/wlan/symbols.dbg
+vendor/etc/wifi/mx140/debug/wlan/unicli.dbg
+vendor/etc/wifi/mx140/debug/wlan/unitab.dbg
+vendor/etc/wifi/mx140/debug/wlan/univif.dbg
+vendor/etc/wifi/mx140/debug/wlan/xide_mib.dbg
+vendor/etc/wifi/mx140.bin
+vendor/etc/wifi/mx140_bt.hcf
+vendor/etc/wifi/mx140_t/debug/common/log-strings.bin
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/bt_registers.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/cortexM4.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/cortexR4.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/mailbox16.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/mailbox4.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/mailbox8.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/moredump.bin
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/moredump.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/pl192vic.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/rf_chip_registers.xml
+vendor/etc/wifi/mx140_t/debug/hardware/moredump/wlan_sys_registers.xml
+vendor/etc/wifi/mx140_t/debug/wlan/hip_signals.xml
+vendor/etc/wifi/mx140_t/debug/wlan/hydra_config.sdb
+vendor/etc/wifi/mx140_t/debug/wlan/id.txt
+vendor/etc/wifi/mx140_t/debug/wlan/mib_out.xml
+vendor/etc/wifi/mx140_t/debug/wlan/symbols.dbg
+vendor/etc/wifi/mx140_t/debug/wlan/unicli.dbg
+vendor/etc/wifi/mx140_t/debug/wlan/unitab.dbg
+vendor/etc/wifi/mx140_t/debug/wlan/univif.dbg
+vendor/etc/wifi/mx140_t/debug/wlan/xide_mib.dbg
+vendor/etc/wifi/mx140_t.bin
+vendor/etc/wifi/mx140_t_wlan.hcf
+vendor/etc/wifi/mx140_t_wlan_t.hcf
+vendor/etc/wifi/mx140_wlan.hcf
+vendor/etc/wifi/mx140_wlan_t.hcf
+vendor/etc/wifi/p2p_supplicant_overlay.conf
+vendor/etc/wifi/platform.txt
+vendor/etc/wifi/wpa_supplicant.conf
+vendor/etc/wifi/wpa_supplicant_overlay.conf
+vendor/etc/yas_set.cfg
+vendor/firmware/dax_param.bin
+vendor/firmware/dual_cal_wide_sub.bin
+vendor/firmware/fimc_is_lib.bin
+vendor/firmware/fimc_is_rta.bin
+vendor/firmware/mfc_fw.bin
+vendor/firmware/setfile_4ha.bin
+vendor/firmware/setfile_gc5035.bin
+vendor/firmware/setfile_hi1631.bin
+vendor/firmware/setfile_imx576.bin
+vendor/lib/hw/audio.primary.exynos7904.so
+vendor/lib/hw/camera.exynos7904.so
+vendor/lib/hw/gatekeeper.exynos7904.so
+vendor/lib/hw/hwcomposer.exynos7904.so
+vendor/lib/hw/memtrack.exynos7904.so
+vendor/lib/hw/sensors.universal7904.so
+vendor/lib/hw/thermal.universal7904.so
+vendor/lib/libaudio-ril.so
+vendor/lib/libaudio_soundtrigger.so
+vendor/lib/libegis_fp_normal_sensor_test.so
+vendor/lib/libexynoscamera3.so
+vendor/lib/libexynosdisplay.so
+vendor/lib/libexynosgraphicbuffer.so
+vendor/lib/libexynosgraphicbuffer_public.so
+vendor/lib/libExynosHWCService.so
+vendor/lib/libexynosscaler.so
+vendor/lib/libexynosutils.so
+vendor/lib/libexynosv4l2.so
+vendor/lib/libgiantmscl.so
+vendor/lib/libhwjpeg.so
+vendor/lib/libmpbase.so
+vendor/lib/libOpenCv.camera.samsung.so
+vendor/lib/librecordalive.so
+vendor/lib/libsamsungDiamondVoice.so
+vendor/lib/libSEF.quram.so
+vendor/lib/libsensorlistener.so
+vendor/lib/libskhynix_q2b_shared.so
+vendor/lib/libuniapi.so
+vendor/lib/libuniplugin.so
+vendor/lib/libvideobeauty.arcsoft.so
+vendor/lib/libvideobeauty_interface.so
+vendor/lib/libwrappergps.so
+vendor/lib/libyasalgo.so
+vendor/lib/soundfx/libswdap.so
+vendor/lib/vndk/libaudioroute.so
+vendor/lib64/hw/camera.exynos7904.so
+vendor/lib64/hw/gatekeeper.exynos7904.so
+vendor/lib64/hw/gralloc.exynos7904.so
+vendor/lib64/hw/hwcomposer.exynos7904.so
+vendor/lib64/hw/memtrack.exynos7904.so
+vendor/lib64/hw/sensors.universal7904.so
+vendor/lib64/hw/thermal.universal7904.so
+vendor/lib64/libegis_fp_normal_sensor_test.so
+vendor/lib64/libengmode_client.so
+vendor/lib64/libexynoscamera3.so
+vendor/lib64/libexynosdisplay.so
+vendor/lib64/libexynosgraphicbuffer.so
+vendor/lib64/libexynosgscaler.so
+vendor/lib64/libExynosHWCService.so
+vendor/lib64/libexynosscaler.so
+vendor/lib64/libexynosutils.so
+vendor/lib64/libexynosv4l2.so
+vendor/lib64/libgiantmscl.so
+vendor/lib64/libhwjpeg.so
+vendor/lib64/libmpbase.so
+vendor/lib64/libSEF.quram.so
+vendor/lib64/libsensorlistener.so
+vendor/lib64/libskhynix_q2b_shared.so
+vendor/lib64/libuniapi.so
+vendor/lib64/libuniplugin.so
+vendor/lib64/libvideobeauty.arcsoft.so
+vendor/lib64/libvideobeauty_interface.so
+vendor/lib64/libwrappergps.so
+vendor/lib64/libyasalgo.so
+vendor/lib64/soundfx/libaudioroute.so
+vendor/lib64/soundfx/libswdap.so
diff --git a/a30s/setup-makefiles.sh b/a30s/setup-makefiles.sh
new file mode 100644
index 0000000..f5eeae7
--- /dev/null
+++ b/a30s/setup-makefiles.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017-2020 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+# Required!
+export DEVICE=a30s
+export DEVICE_COMMON=universal7885-common
+export VENDOR=samsung
+
+"./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"
diff --git a/a30s/setup.sh b/a30s/setup.sh
new file mode 100644
index 0000000..a8768ff
--- /dev/null
+++ b/a30s/setup.sh
@@ -0,0 +1,22 @@
+VENDOR=$(cat device/samsung/universal7885-common/vendor_name)
+if [ ! $VENDOR ]; then
+VENDOR=aosp;
+fi
+# Generate AndroidProducts.mk
+echo "# Auto-Generated by device/samsung/a30s/setup.sh" > device/samsung/a30s/AndroidProducts.mk
+echo "PRODUCT_MAKEFILES += \$(LOCAL_DIR)/"$VENDOR"_a30s.mk" >>  device/samsung/a30s/AndroidProducts.mk
+
+# Generate <vendor>_a30s.mk
+echo "# Auto-Generated by device/samsung/a30s/setup.sh" > device/samsung/a30s/"$VENDOR"_a30s.mk
+echo "\$(call inherit-product, device/samsung/a30s/full_a30s.mk)" >> device/samsung/a30s/"$VENDOR"_a30s.mk
+if test -f vendor/"$VENDOR"/config/common_full_phone.mk && echo "common_full_phone"; then
+	echo "\$(call inherit-product, vendor/"$VENDOR"/config/common_full_phone.mk)" >> device/samsung/a30s/"$VENDOR"_a30s.mk
+elif test -f vendor/"$VENDOR"/config/common.mk && echo "common"; then
+	echo "\$(call inherit-product, vendor/"$VENDOR"/config/common.mk)" >> device/samsung/a30s/"$VENDOR"_a30s.mk
+fi
+echo "PRODUCT_NAME := "$VENDOR"_a30s" >> device/samsung/a30s/"$VENDOR"_a30s.mk
+echo "" >>  device/samsung/a30s/"$VENDOR"_a30s.mk
+echo "# Additional Props" >>  device/samsung/a30s/"$VENDOR"_a30s.mk
+echo "TARGET_FACE_UNLOCK_SUPPORTED := true" >>  device/samsung/a30s/"$VENDOR"_a30s.mk
+echo "TARGET_BOOT_ANIMATION_RES := 1080" >> device/samsung/a30s/"$VENDOR"_a30s.mk
+