From 95bafadbeeebc4352ead6f2b1b2804b0c7391ce3 Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Wed, 22 Feb 2017 13:52:24 +0100 Subject: llvmpipe and LineageOS rebranding Signed-off-by: Wolfgang Wiedmeyer --- BoardConfig.mk | 9 +++------ cm.dependencies | 22 ---------------------- cm.mk | 47 ----------------------------------------------- lineage.dependencies | 22 ++++++++++++++++++++++ lineage.mk | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 72 insertions(+), 75 deletions(-) delete mode 100644 cm.dependencies delete mode 100644 cm.mk create mode 100644 lineage.dependencies create mode 100644 lineage.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index 09c8fbf..456d709 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -28,15 +28,15 @@ BOARD_MODEM_TYPE := xmm6262 TARGET_SPECIFIC_HEADER_PATH := device/samsung/n7100/include COMMON_GLOBAL_CFLAGS += -DDISABLE_ASHMEM_TRACKING -# Graphics -TARGET_REQUIRES_SYNCHRONOUS_SETSURFACE := true +# enable llvmpipe +BOARD_GPU_DRIVERS := swrast # Bluetooth BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/n7100/bluetooth # Kernel TARGET_KERNEL_SOURCE := kernel/samsung/smdk4412 -TARGET_KERNEL_CONFIG := cyanogenmod_n7100_defconfig +TARGET_KERNEL_CONFIG := lineageos_n7100_defconfig # assert TARGET_OTA_ASSERT_DEVICE := t03g,n7100,GT-N7100 @@ -44,9 +44,6 @@ TARGET_OTA_ASSERT_DEVICE := t03g,n7100,GT-N7100 # inherit from the proprietary version -include vendor/samsung/n7100/BoardConfigVendor.mk -# External apps on SD -TARGET_EXTERNAL_APPS = sdcard1 - # Recovery TARGET_RECOVERY_FSTAB := device/samsung/n7100/rootdir/fstab.smdk4x12 TARGET_USERIMAGES_USE_F2FS := true diff --git a/cm.dependencies b/cm.dependencies deleted file mode 100644 index 4969689..0000000 --- a/cm.dependencies +++ /dev/null @@ -1,22 +0,0 @@ -[ - { - "repository": "android_device_samsung_smdk4412-common", - "target_path": "device/samsung/smdk4412-common" - }, - { - "repository": "android_kernel_samsung_smdk4412", - "target_path": "kernel/samsung/smdk4412" - }, - { - "repository": "android_packages_apps_SamsungServiceMode", - "target_path": "packages/apps/SamsungServiceMode" - }, - { - "repository": "android_hardware_samsung", - "target_path": "hardware/samsung" - }, - { - "repository": "android_external_stlport", - "target_path": "external/stlport" - } -] diff --git a/cm.mk b/cm.mk deleted file mode 100644 index a4e556e..0000000 --- a/cm.mk +++ /dev/null @@ -1,47 +0,0 @@ -# Inherit device configuration -$(call inherit-product, device/samsung/n7100/full_n7100.mk) - -# Copyright (C) 2012 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. - -# -# This file is the build configuration for a full Android -# build for toro hardware. This cleanly combines a set of -# device-specific aspects (drivers) with a device-agnostic -# product configuration (apps). Except for a few implementation -# details, it only fundamentally contains two inherit-product -# lines, full and toro, hence its name. -# - -# Release name -PRODUCT_RELEASE_NAME := n7100 - -# Boot animation -TARGET_BOOTANIMATION_NAME := vertical-720x1280 - -# Inherit some common CM stuff. -$(call inherit-product, vendor/replicant/config/common_full_phone.mk) - -# Inherit device configuration -$(call inherit-product, device/samsung/n7100/full_n7100.mk) - -# Device identifier. This must come after all inclusions -PRODUCT_DEVICE := n7100 -PRODUCT_NAME := replicant_n7100 -PRODUCT_BRAND := samsung -PRODUCT_MODEL := GT-N7100 -PRODUCT_MANUFACTURER := samsung - -# Set build fingerprint / ID / Product Name ect. -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=t03gxx TARGET_DEVICE=t03g BUILD_FINGERPRINT="samsung/t03gxx/t03g:4.3/JSS15J/N7100XXUEMK4:user/release-keys" PRIVATE_BUILD_DESC="t03gxx-user 4.3 JSS15J N7100XXUEMK4 release-keys" diff --git a/lineage.dependencies b/lineage.dependencies new file mode 100644 index 0000000..4969689 --- /dev/null +++ b/lineage.dependencies @@ -0,0 +1,22 @@ +[ + { + "repository": "android_device_samsung_smdk4412-common", + "target_path": "device/samsung/smdk4412-common" + }, + { + "repository": "android_kernel_samsung_smdk4412", + "target_path": "kernel/samsung/smdk4412" + }, + { + "repository": "android_packages_apps_SamsungServiceMode", + "target_path": "packages/apps/SamsungServiceMode" + }, + { + "repository": "android_hardware_samsung", + "target_path": "hardware/samsung" + }, + { + "repository": "android_external_stlport", + "target_path": "external/stlport" + } +] diff --git a/lineage.mk b/lineage.mk new file mode 100644 index 0000000..03ac1c4 --- /dev/null +++ b/lineage.mk @@ -0,0 +1,47 @@ +# Inherit device configuration +$(call inherit-product, device/samsung/n7100/full_n7100.mk) + +# Copyright (C) 2012 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. + +# +# This file is the build configuration for a full Android +# build for toro hardware. This cleanly combines a set of +# device-specific aspects (drivers) with a device-agnostic +# product configuration (apps). Except for a few implementation +# details, it only fundamentally contains two inherit-product +# lines, full and toro, hence its name. +# + +# Release name +PRODUCT_RELEASE_NAME := n7100 + +# Boot animation +TARGET_BOOTANIMATION_NAME := vertical-720x1280 + +# Inherit some common stuff. +$(call inherit-product, vendor/replicant/config/common_full_phone.mk) + +# Inherit device configuration +$(call inherit-product, device/samsung/n7100/full_n7100.mk) + +# Device identifier. This must come after all inclusions +PRODUCT_DEVICE := n7100 +PRODUCT_NAME := replicant_n7100 +PRODUCT_BRAND := samsung +PRODUCT_MODEL := GT-N7100 +PRODUCT_MANUFACTURER := samsung + +# Set build fingerprint / ID / Product Name ect. +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=t03gxx TARGET_DEVICE=t03g BUILD_FINGERPRINT="samsung/t03gxx/t03g:4.3/JSS15J/N7100XXUEMK4:user/release-keys" PRIVATE_BUILD_DESC="t03gxx-user 4.3 JSS15J N7100XXUEMK4 release-keys" -- cgit v1.1