From e3f21e815dd533c5e7a83b61b42ca790a5a34317 Mon Sep 17 00:00:00 2001 From: "Kevin F. Haggerty" Date: Tue, 31 Oct 2017 06:10:39 -0600 Subject: [PATCH] hlte: Drop all of our releasetools stuff * The OSS RIL gets us down to a single blob that we can instruct rild to make use of using a property. We've done that, so this has ceased to serve its purpose. Revert "hlte: Use hlte-common releasetools extension" This reverts commit 89664cd20585b37cce6535f6672acb66665ccc9d. Change-Id: I3e0b966381040a6e142bddb5e7b4e83aa2be053f --- BoardConfig.mk | 3 --- device.mk | 5 ----- releasetools/variant_blobs_hook.sh | 21 --------------------- 3 files changed, 29 deletions(-) delete mode 100644 releasetools/variant_blobs_hook.sh diff --git a/BoardConfig.mk b/BoardConfig.mk index 054672e..5696dde 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -35,8 +35,5 @@ BOARD_RECOVERYIMAGE_PARTITION_SIZE := 13631488 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1572864000 BOARD_USERDATAIMAGE_PARTITION_SIZE := 28651290624 -# Releasetools -TARGET_RELEASETOOLS_EXTENSIONS := device/samsung/hlte-common/releasetools - # inherit from the proprietary version -include vendor/samsung/hlte/BoardConfigVendor.mk diff --git a/device.mk b/device.mk index 7ed7fc6..babaf44 100644 --- a/device.mk +++ b/device.mk @@ -41,10 +41,5 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/libnfc-brcm-20791b04.conf:system/etc/libnfc-brcm-20791b04.conf \ $(LOCAL_PATH)/configs/libnfc-brcm-20791b05.conf:system/etc/libnfc-brcm-20791b05.conf -# Variant blobs script -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/releasetools/variant_blobs_hook.sh:install/bin/variant_blobs_hook.sh \ - device/samsung/hlte-common/releasetools/variant_blobs.sh:install/bin/variant_blobs.sh - # Common hlte $(call inherit-product, device/samsung/hlte-common/hlte.mk) diff --git a/releasetools/variant_blobs_hook.sh b/releasetools/variant_blobs_hook.sh deleted file mode 100644 index f3751f8..0000000 --- a/releasetools/variant_blobs_hook.sh +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (C) 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. -# - - -case $BOOTLOADER in - N900P*) VARIANT="spr" ;; - *) VARIANT="gsm" ;; -esac