Cleanup
Remove unnecessary bloat.
Update vendor setup script.
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index a72d485..80a841c 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,6 +1,3 @@
LOCAL_PATH := device/samsung/j5lte
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/omni_j5lte.mk \
- $(LOCAL_DIR)/rr_j5lte.mk \
- $(LOCAL_DIR)/pa_j5lte.mk \
- $(LOCAL_DIR)/lineage_j5lte.mk
+ $(LOCAL_DIR)/omni_j5lte.mk
diff --git a/lineage_j5lte.mk b/lineage_j5lte.mk
deleted file mode 100644
index 09ee105..0000000
--- a/lineage_j5lte.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# Inherit from common
-$(call inherit-product, device/samsung/j5-common/lineage.mk)
-
-$(call inherit-product, device/samsung/j5lte/device.mk)
-
-## Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := j5lte
-PRODUCT_NAME := lineage_j5lte
-PRODUCT_BRAND := samsung
-PRODUCT_MODEL := SM-J500F
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_CHARACTERISTICS := phone
-
-PRODUCT_GMS_CLIENTID_BASE := android-samsung
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index a35e758..0000000
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2017, The LineageOS 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- The RadioAccessFamilies supported by the device.
- Empty is viewed as "all". Only used on devices which
- don't support RIL_REQUEST_GET_RADIO_CAPABILITY
- format is UMTS|LTE|... -->
- <string translatable="false" name="config_radio_access_family">LTE|GSM|GPRS|EDGE|UMTS|HSPA|HSPAP</string>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml
deleted file mode 100644
index 3d92cb8..0000000
--- a/overlay/packages/services/Telephony/res/values/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The CyanogenMod 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.
--->
-
-<resources>
- <!-- Show enabled lte option for lte device -->
- <bool name="config_enabled_lte" translatable="false">true</bool>
-</resources>
\ No newline at end of file
diff --git a/pa_j5lte.mk b/pa_j5lte.mk
deleted file mode 100644
index 0640fa5..0000000
--- a/pa_j5lte.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# Inherit from common
-$(call inherit-product, device/samsung/j5-common/pa.mk)
-
-$(call inherit-product, device/samsung/j5lte/device.mk)
-
-## Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := j5lte
-PRODUCT_NAME := pa_j5lte
-PRODUCT_BRAND := samsung
-PRODUCT_MODEL := SM-J500F
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_CHARACTERISTICS := phone
-
-PRODUCT_GMS_CLIENTID_BASE := android-samsung
diff --git a/rr_j5lte.mk b/rr_j5lte.mk
deleted file mode 100644
index 204a146..0000000
--- a/rr_j5lte.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# Inherit from common
-$(call inherit-product, device/samsung/j5-common/rr.mk)
-
-$(call inherit-product, device/samsung/j5lte/device.mk)
-
-## Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := j5lte
-PRODUCT_NAME := rr_j5lte
-PRODUCT_BRAND := samsung
-PRODUCT_MODEL := SM-J500F
-PRODUCT_MANUFACTURER := samsung
-PRODUCT_CHARACTERISTICS := phone
-
-PRODUCT_GMS_CLIENTID_BASE := android-samsung
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 5fd03a5..f25816c 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,3 +1,6 @@
for i in eng userdebug user; do
- add_lunch_combo lineage_j5lte-${i}
+ add_lunch_combo omni_j5lte-${i}
+
+export LC_ALL=C
+export ALLOW_MISSING_DEPENDENCIES=true
done