Merge remote-tracking branch 'refs/remotes/brx86/r11-r17'
Change-Id: Ibf0f06ef60a35eae10648ae08bdfb28546f396f6
Conflicts:
build/tasks/kernel.mk
diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index 521624c..b2b3678 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -17,38 +17,6 @@
pluginFor: ["soong_build"],
}
-bliss_generator {
- name: "generated_kernel_includes",
-
- // The headers make command
- cmd: "$(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install",
-
- // Directories that can be imported by a cc_* module generated_headers property
- export_include_dirs: [
- "usr/audio/include/uapi",
- "usr/include",
- "usr/include/audio/include/uapi",
- "usr/techpack/audio/include",
- ],
-
- // Sources for dependency tracking
- dep_root: "$(TARGET_KERNEL_SOURCE)",
- dep_files: [
- "Makefile",
- "include/**/*",
- "arch/$(KERNEL_ARCH)/include/**/*",
- "techpack/audio/include/**/*",
- ],
-}
-
-cc_library_headers {
- name: "generated_kernel_headers",
- generated_headers: ["generated_kernel_includes"],
- export_generated_headers: ["generated_kernel_includes"],
- vendor_available: true,
- recovery_available: true,
-}
-
// Target platform agnostic config modules
soong_config_module_type {
name: "disable_postrender_cleanup",
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
deleted file mode 100644
index 32af3c9..0000000
--- a/build/tasks/kernel.mk
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright (C) 2012 The CyanogenMod Project
-# (C) 2017-2020 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.
-
-
-# Android makefile to build kernel as a part of Android Build
-#
-# Configuration
-# =============
-#
-# These config vars are usually set in BoardConfig.mk:
-#
-# TARGET_KERNEL_CONFIG = Kernel defconfig
-# TARGET_KERNEL_VARIANT_CONFIG = Variant defconfig, optional
-# TARGET_KERNEL_SELINUX_CONFIG = SELinux defconfig, optional
-# TARGET_KERNEL_ADDITIONAL_CONFIG = Additional defconfig, optional
-#
-# TARGET_KERNEL_CLANG_COMPILE = Compile kernel with clang, defaults to false
-#
-# TARGET_KERNEL_CLANG_VERSION = Clang prebuilts version, optional, defaults to clang-stable
-#
-# TARGET_KERNEL_CLANG_PATH = Clang prebuilts path, optional
-#
-# BOARD_KERNEL_IMAGE_NAME = Built image name
-# for ARM use: zImage
-# for ARM64 use: Image.gz
-# for uncompressed use: Image
-# If using an appended DT, append '-dtb'
-# to the end of the image name.
-# For example, for ARM devices,
-# use zImage-dtb instead of zImage.
-#
-# BOARD_DTBO_CFG = Path to a mkdtboimg.py config file
-#
-# BOARD_CUSTOM_DTBOIMG_MK = Path to a custom dtboimage makefile
-#
-# KERNEL_CC = The C Compiler used. This is automatically set based
-# on whether the clang version is set, optional.
-# KERNEL_LD = The Linker used. This is automatically set based
-# on whether the clang/gcc version is set, optional.
-#
-# KERNEL_CLANG_TRIPLE = Target triple for clang (e.g. aarch64-linux-gnu-)
-# defaults to arm-linux-gnu- for arm
-# aarch64-linux-gnu- for arm64
-# x86_64-linux-gnu- for x86
-#
-# NEED_KERNEL_MODULE_ROOT = Optional, if true, install kernel
-# modules in root instead of vendor
-# NEED_KERNEL_MODULE_SYSTEM = Optional, if true, install kernel
-# modules in system instead of vendor
-# NEED_KERNEL_MODULE_VENDOR_OVERLAY = Optional, if true, install kernel
-# modules in vendor_overlay instead of vendor
-
-ifneq ($(TARGET_NO_KERNEL),true)
-ifneq ($(TARGET_NO_KERNEL_OVERRIDE),true)
-
-## Externally influenced variables
-KERNEL_SRC := $(TARGET_KERNEL_SOURCE)
-# kernel configuration - mandatory
-KERNEL_DEFCONFIG := $(TARGET_KERNEL_CONFIG)
-VARIANT_DEFCONFIG := $(TARGET_KERNEL_VARIANT_CONFIG)
-SELINUX_DEFCONFIG := $(TARGET_KERNEL_SELINUX_CONFIG)
-
-## Internal variables
-DTC := $(HOST_OUT_EXECUTABLES)/dtc
-KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ
-DTBO_OUT := $(TARGET_OUT_INTERMEDIATES)/DTBO_OBJ
-DTB_OUT := $(TARGET_OUT_INTERMEDIATES)/DTB_OBJ
-KERNEL_CONFIG := $(KERNEL_OUT)/.config
-KERNEL_RELEASE := $(KERNEL_OUT)/include/config/kernel.release
-
-ifeq ($(KERNEL_ARCH),x86_64)
-KERNEL_DEFCONFIG_ARCH := x86
-else
-KERNEL_DEFCONFIG_ARCH := $(KERNEL_ARCH)
-endif
-KERNEL_DEFCONFIG_DIR := $(KERNEL_SRC)/arch/$(KERNEL_DEFCONFIG_ARCH)/configs
-KERNEL_DEFCONFIG_SRC := $(KERNEL_DEFCONFIG_DIR)/$(KERNEL_DEFCONFIG)
-
-ifneq ($(TARGET_KERNEL_ADDITIONAL_CONFIG),)
-KERNEL_ADDITIONAL_CONFIG := $(TARGET_KERNEL_ADDITIONAL_CONFIG)
-KERNEL_ADDITIONAL_CONFIG_SRC := $(KERNEL_DEFCONFIG_DIR)/$(KERNEL_ADDITIONAL_CONFIG)
- ifeq ("$(wildcard $(KERNEL_ADDITIONAL_CONFIG_SRC))","")
- $(warning TARGET_KERNEL_ADDITIONAL_CONFIG '$(TARGET_KERNEL_ADDITIONAL_CONFIG)' doesn't exist)
- KERNEL_ADDITIONAL_CONFIG_SRC := /dev/null
- endif
-else
- KERNEL_ADDITIONAL_CONFIG_SRC := /dev/null
-endif
-
-ifeq ($(TARGET_PREBUILT_KERNEL),)
- ifeq ($(BOARD_KERNEL_IMAGE_NAME),)
- $(error BOARD_KERNEL_IMAGE_NAME not defined.)
- endif
-endif
-TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/$(BOARD_KERNEL_IMAGE_NAME)
-
-ifeq "$(wildcard $(KERNEL_SRC) )" ""
- ifneq ($(TARGET_PREBUILT_KERNEL),)
- HAS_PREBUILT_KERNEL := true
- NEEDS_KERNEL_COPY := true
- else
- $(foreach cf,$(PRODUCT_COPY_FILES), \
- $(eval _src := $(call word-colon,1,$(cf))) \
- $(eval _dest := $(call word-colon,2,$(cf))) \
- $(ifeq kernel,$(_dest), \
- $(eval HAS_PREBUILT_KERNEL := true)))
- endif
-
- ifneq ($(HAS_PREBUILT_KERNEL),)
- $(warning ***************************************************************)
- $(warning * Using prebuilt kernel binary instead of source *)
- $(warning * THIS IS DEPRECATED, AND IS NOT ADVISED. *)
- $(warning * Please configure your device to download the kernel *)
- $(warning * source repository to $(KERNEL_SRC))
- $(warning * for more information *)
- $(warning ***************************************************************)
- FULL_KERNEL_BUILD := false
- KERNEL_BIN := $(TARGET_PREBUILT_KERNEL)
- else
- $(warning ***************************************************************)
- $(warning * *)
- $(warning * No kernel source found, and no fallback prebuilt defined. *)
- $(warning * Please make sure your device is properly configured to *)
- $(warning * download the kernel repository to $(KERNEL_SRC))
- $(warning * and add the TARGET_KERNEL_CONFIG variable to BoardConfig.mk *)
- $(warning * *)
- $(warning * As an alternative, define the TARGET_PREBUILT_KERNEL *)
- $(warning * variable with the path to the prebuilt binary kernel image *)
- $(warning * in your BoardConfig.mk file *)
- $(warning * *)
- $(warning ***************************************************************)
- $(error "NO KERNEL")
- endif
-else
- NEEDS_KERNEL_COPY := true
- ifeq ($(TARGET_KERNEL_CONFIG),)
- $(warning **********************************************************)
- $(warning * Kernel source found, but no configuration was defined *)
- $(warning * Please add the TARGET_KERNEL_CONFIG variable to your *)
- $(warning * BoardConfig.mk file *)
- $(warning **********************************************************)
- $(error "NO KERNEL CONFIG")
- else
- FULL_KERNEL_BUILD := true
- KERNEL_BIN := $(TARGET_PREBUILT_INT_KERNEL)
- endif
-endif
-
-ifeq ($(FULL_KERNEL_BUILD),true)
-
-ifeq ($(NEED_KERNEL_MODULE_ROOT),true)
-KERNEL_MODULES_OUT := $(TARGET_ROOT_OUT)
-KERNEL_DEPMOD_STAGING_DIR := $(KERNEL_BUILD_OUT_PREFIX)$(call intermediates-dir-for,PACKAGING,depmod_recovery)
-KERNEL_MODULE_MOUNTPOINT :=
-else ifeq ($(NEED_KERNEL_MODULE_SYSTEM),true)
-KERNEL_MODULES_OUT := $(TARGET_OUT)
-KERNEL_DEPMOD_STAGING_DIR := $(KERNEL_BUILD_OUT_PREFIX)$(call intermediates-dir-for,PACKAGING,depmod_system)
-KERNEL_MODULE_MOUNTPOINT := system
-$(INSTALLED_SYSTEMIMAGE_TARGET): $(TARGET_PREBUILT_INT_KERNEL)
-else ifeq ($(NEED_KERNEL_MODULE_VENDOR_OVERLAY),true)
-KERNEL_MODULES_OUT := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)
-KERNEL_DEPMOD_STAGING_DIR := $(KERNEL_BUILD_OUT_PREFIX)$(call intermediates-dir-for,PACKAGING,depmod_product)
-KERNEL_MODULE_MOUNTPOINT := vendor
-$(INSTALLED_PRODUCTIMAGE_TARGET): $(TARGET_PREBUILT_INT_KERNEL)
-else
-KERNEL_MODULES_OUT := $(TARGET_OUT_VENDOR)
-KERNEL_DEPMOD_STAGING_DIR := $(KERNEL_BUILD_OUT_PREFIX)$(call intermediates-dir-for,PACKAGING,depmod_vendor)
-KERNEL_MODULE_MOUNTPOINT := vendor
-$(INSTALLED_VENDORIMAGE_TARGET): $(TARGET_PREBUILT_INT_KERNEL)
-endif
-MODULES_INTERMEDIATES := $(KERNEL_BUILD_OUT_PREFIX)$(call intermediates-dir-for,PACKAGING,kernel_modules)
-
-KERNEL_VENDOR_RAMDISK_DEPMOD_STAGING_DIR := $(KERNEL_BUILD_OUT_PREFIX)$(call intermediates-dir-for,PACKAGING,depmod_vendor_ramdisk)
-$(INTERNAL_VENDOR_RAMDISK_TARGET): $(TARGET_PREBUILT_INT_KERNEL)
-
-# Add host bin out dir to path
-PATH_OVERRIDE := PATH=$(KERNEL_BUILD_OUT_PREFIX)$(HOST_OUT_EXECUTABLES):$$PATH
-ifeq ($(TARGET_KERNEL_CLANG_COMPILE),true)
- ifneq ($(TARGET_KERNEL_CLANG_VERSION),)
- KERNEL_CLANG_VERSION := clang-$(TARGET_KERNEL_CLANG_VERSION)
- else
- # Use the default version of clang if TARGET_KERNEL_CLANG_VERSION hasn't been set by the device config
- KERNEL_CLANG_VERSION := $(LLVM_PREBUILTS_VERSION)
- endif
- TARGET_KERNEL_CLANG_PATH ?= $(BUILD_TOP)/prebuilts/clang/host/$(HOST_OS)-x86/$(KERNEL_CLANG_VERSION)
- ifeq ($(KERNEL_ARCH),arm64)
- KERNEL_CLANG_TRIPLE ?= CLANG_TRIPLE=aarch64-linux-gnu-
- else ifeq ($(KERNEL_ARCH),arm)
- KERNEL_CLANG_TRIPLE ?= CLANG_TRIPLE=arm-linux-gnu-
- else ifeq ($(KERNEL_ARCH),x86)
- KERNEL_CLANG_TRIPLE ?= CLANG_TRIPLE=x86_64-linux-gnu-
- endif
- PATH_OVERRIDE += PATH=$(TARGET_KERNEL_CLANG_PATH)/bin:$$PATH LD_LIBRARY_PATH=$(TARGET_KERNEL_CLANG_PATH)/lib64:$$LD_LIBRARY_PATH
- ifeq ($(KERNEL_CC),)
- KERNEL_CC := CC="$(CCACHE_BIN) clang"
- endif
- ifeq ($(KERNEL_LD),)
- KERNEL_LD :=
- endif
-endif
-
-ifneq ($(TARGET_KERNEL_MODULES),)
- $(error TARGET_KERNEL_MODULES is no longer supported!)
-endif
-
-PATH_OVERRIDE += PATH=$(KERNEL_TOOLCHAIN_PATH_gcc)/bin:$$PATH
-
-# System tools are no longer allowed on 10+
-PATH_OVERRIDE += $(TOOLS_PATH_OVERRIDE)
-
-KERNEL_ADDITIONAL_CONFIG_OUT := $(KERNEL_OUT)/.additional_config
-
-# Internal implementation of make-kernel-target
-# $(1): output path (The value passed to O=)
-# $(2): target to build (eg. defconfig, modules, dtbo.img)
-define internal-make-kernel-target
-$(PATH_OVERRIDE) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_BUILD_OUT_PREFIX)$(1) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(KERNEL_LD) $(2)
-endef
-
-# Make a kernel target
-# $(1): The kernel target to build (eg. defconfig, modules, modules_install)
-define make-kernel-target
-$(call internal-make-kernel-target,$(KERNEL_OUT),$(1))
-endef
-
-# Make a DTBO target
-# $(1): The DTBO target to build (eg. dtbo.img, defconfig)
-define make-dtbo-target
-$(call internal-make-kernel-target,$(DTBO_OUT),$(1))
-endef
-
-# Make a DTB targets
-# $(1): The DTB target to build (eg. dtbs, defconfig)
-define make-dtb-target
-$(call internal-make-kernel-target,$(DTB_OUT),$(1))
-endef
-
-# $(1): modules list
-# $(2): output dir
-# $(3): mount point
-# $(4): staging dir
-# $(5): module load list
-# Depmod requires a well-formed kernel version so 0.0 is used as a placeholder.
-define build-image-kernel-modules-lineage
- mkdir -p $(2)/lib/modules
- cp $(1) $(2)/lib/modules/
- rm -rf $(4)
- mkdir -p $(4)/lib/modules/0.0/$(3)lib/modules
- cp $(1) $(4)/lib/modules/0.0/$(3)lib/modules
- $(DEPMOD) -b $(4) 0.0
- sed -e 's/\(.*modules.*\):/\/\1:/g' -e 's/ \([^ ]*modules[^ ]*\)/ \/\1/g' $(4)/lib/modules/0.0/modules.dep > $(2)/lib/modules/modules.dep
- cp $(4)/lib/modules/0.0/modules.softdep $(2)/lib/modules
- cp $(4)/lib/modules/0.0/modules.alias $(2)/lib/modules
- rm -f $(2)/lib/modules/modules.load
- for MODULE in $(5); do \
- basename $$MODULE >> $(2)/lib/modules/modules.load; \
- done
-endef
-
-$(KERNEL_OUT):
- mkdir -p $(KERNEL_OUT)
-
-$(KERNEL_ADDITIONAL_CONFIG_OUT): $(KERNEL_OUT)
- $(hide) cmp -s $(KERNEL_ADDITIONAL_CONFIG_SRC) $@ || cp $(KERNEL_ADDITIONAL_CONFIG_SRC) $@;
-
-$(KERNEL_CONFIG): $(KERNEL_DEFCONFIG_SRC) $(KERNEL_ADDITIONAL_CONFIG_OUT)
- @echo "Building Kernel Config"
- $(call make-kernel-target,VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG))
- $(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
- echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \
- echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \
- $(call make-kernel-target,oldconfig); \
- fi
- # Create defconfig build artifact
- $(call make-kernel-target,savedefconfig)
- $(hide) if [ ! -z "$(KERNEL_ADDITIONAL_CONFIG)" ]; then \
- echo "Using additional config '$(KERNEL_ADDITIONAL_CONFIG)'"; \
- $(KERNEL_SRC)/scripts/kconfig/merge_config.sh -m -O $(KERNEL_OUT) $(KERNEL_OUT)/.config $(KERNEL_SRC)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_ADDITIONAL_CONFIG); \
- $(call make-kernel-target,KCONFIG_ALLCONFIG=$(KERNEL_OUT)/.config alldefconfig); \
- fi
-
-$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_CONFIG) $(DEPMOD) $(DTC)
- @echo "Building Kernel Image ($(BOARD_KERNEL_IMAGE_NAME))"
- $(call make-kernel-target,$(BOARD_KERNEL_IMAGE_NAME))
- $(hide) if grep -q '^CONFIG_OF=y' $(KERNEL_CONFIG); then \
- echo "Building DTBs"; \
- $(call make-kernel-target,dtbs); \
- fi
- $(hide) if grep -q '=m' $(KERNEL_CONFIG); then \
- echo "Building Kernel Modules"; \
- $(call make-kernel-target,modules) || exit "$$?"; \
- echo "Installing Kernel Modules"; \
- $(call make-kernel-target,INSTALL_MOD_PATH=$(MODULES_INTERMEDIATES) INSTALL_MOD_STRIP=1 modules_install); \
- kernel_release=$$(cat $(KERNEL_RELEASE)) \
- kernel_modules_dir=$(MODULES_INTERMEDIATES)/lib/modules/$$kernel_release \
- $(foreach s, $(TARGET_MODULE_ALIASES),\
- $(eval p := $(subst :,$(space),$(s))) \
- ; mv $$(find $$kernel_modules_dir -name $(word 1,$(p))) $$kernel_modules_dir/$(word 2,$(p))); \
- modules=$$(find $$kernel_modules_dir -type f -name '*.ko'); \
- ($(call build-image-kernel-modules-lineage,$$modules,$(KERNEL_MODULES_OUT),$(KERNEL_MODULE_MOUNTPOINT)/,$(KERNEL_DEPMOD_STAGING_DIR),$(BOARD_VENDOR_KERNEL_MODULES_LOAD))); \
- $(if $(BOOT_KERNEL_MODULES),\
- vendor_boot_modules=$$(for m in $(BOOT_KERNEL_MODULES); do \
- p=$$(find $$kernel_modules_dir -type f -name $$m); \
- if [ -n "$$p" ]; then echo $$p; else echo "ERROR: $$m from BOOT_KERNEL_MODULES was not found" 1>&2 && exit 1; fi; \
- done); \
- [ $$? -ne 0 ] && exit 1; \
- ($(call build-image-kernel-modules-lineage,$$vendor_boot_modules,$(TARGET_VENDOR_RAMDISK_OUT),/,$(KERNEL_VENDOR_RAMDISK_DEPMOD_STAGING_DIR),$(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD))); \
- ) \
- fi
-
-.PHONY: kerneltags
-kerneltags: $(KERNEL_CONFIG)
- $(call make-kernel-target,tags)
-
-.PHONY: kernelsavedefconfig alldefconfig
-
-kernelsavedefconfig: $(KERNEL_OUT)
- $(call make-kernel-target,$(KERNEL_DEFCONFIG))
- env KCONFIG_NOTIMESTAMP=true \
- $(call make-kernel-target,savedefconfig)
- cp $(KERNEL_OUT)/defconfig $(KERNEL_DEFCONFIG_SRC)
-
-alldefconfig: $(KERNEL_OUT)
- env KCONFIG_NOTIMESTAMP=true \
- $(call make-kernel-target,alldefconfig)
-
-ifeq (true,$(filter true, $(TARGET_NEEDS_DTBOIMAGE) $(BOARD_KERNEL_SEPARATED_DTBO)))
-ifneq ($(BOARD_CUSTOM_DTBOIMG_MK),)
-include $(BOARD_CUSTOM_DTBOIMG_MK)
-else
-MKDTIMG := $(HOST_OUT_EXECUTABLES)/mkdtimg$(HOST_EXECUTABLE_SUFFIX)
-MKDTBOIMG := $(HOST_OUT_EXECUTABLES)/mkdtboimg.py$(HOST_EXECUTABLE_SUFFIX)
-$(BOARD_PREBUILT_DTBOIMAGE): $(DTC) $(MKDTIMG) $(MKDTBOIMG)
-ifeq ($(BOARD_KERNEL_SEPARATED_DTBO),true)
-$(BOARD_PREBUILT_DTBOIMAGE):
- @echo "Building dtbo.img"
- $(call make-dtbo-target,$(KERNEL_DEFCONFIG))
- $(call make-dtbo-target,dtbs)
-ifdef BOARD_DTBO_CFG
- $(MKDTBOIMG) cfg_create $@ $(BOARD_DTBO_CFG) -d $(DTBO_OUT)/arch/$(KERNEL_ARCH)/boot/dts
-else
- $(MKDTBOIMG) create $@ --page_size=$(BOARD_KERNEL_PAGESIZE) $(shell find $(DTBO_OUT)/arch/$(KERNEL_ARCH)/boot/dts -type f -name "*.dtbo" | sort)
-endif
-else
-$(BOARD_PREBUILT_DTBOIMAGE):
- @echo "Building dtbo.img"
- $(call make-dtbo-target,$(KERNEL_DEFCONFIG))
- $(call make-dtbo-target,dtbo.img)
-endif # BOARD_KERNEL_SEPARATED_DTBO
-endif # BOARD_CUSTOM_DTBOIMG_MK
-endif # TARGET_NEEDS_DTBOIMAGE/BOARD_KERNEL_SEPARATED_DTBO
-
-ifeq ($(BOARD_INCLUDE_DTB_IN_BOOTIMG),true)
-ifeq ($(BOARD_PREBUILT_DTBIMAGE_DIR),)
-$(INSTALLED_DTBIMAGE_TARGET): $(DTC)
- @echo "Building dtb.img"
- $(call make-dtb-target,$(KERNEL_DEFCONFIG))
- $(call make-dtb-target,dtbs)
- cat $(shell find $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts -type f -name "*.dtb" | sort) > $@
-endif # !BOARD_PREBUILT_DTBIMAGE_DIR
-endif # BOARD_INCLUDE_DTB_IN_BOOTIMG
-
-endif # FULL_KERNEL_BUILD
-
-## Install it
-
-ifeq ($(NEEDS_KERNEL_COPY),true)
-file := $(INSTALLED_KERNEL_TARGET)
-ALL_PREBUILT += $(file)
-$(file) : $(KERNEL_BIN) | $(ACP)
- $(transform-prebuilt-to-target)
-
-ALL_PREBUILT += $(INSTALLED_KERNEL_TARGET)
-endif
-
-.PHONY: kernel
-kernel: $(INSTALLED_KERNEL_TARGET)
-
-.PHONY: dtboimage
-dtboimage: $(INSTALLED_DTBOIMAGE_TARGET)
-
-.PHONY: dtbimage
-dtbimage: $(INSTALLED_DTBIMAGE_TARGET)
-
-endif # TARGET_NO_KERNEL_OVERRIDE
-endif # TARGET_NO_KERNEL
diff --git a/config/BoardConfigBliss.mk b/config/BoardConfigBliss.mk
index e17ab06..0fca74e 100644
--- a/config/BoardConfigBliss.mk
+++ b/config/BoardConfigBliss.mk
@@ -1,4 +1,3 @@
-include vendor/bliss/config/BoardConfigKernel.mk
ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
include vendor/bliss/config/BoardConfigQcom.mk
diff --git a/config/common.mk b/config/common.mk
index 112a39d..effb389 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -67,8 +67,8 @@
vendor/bliss/config/permissions/org.lineageos.android.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.android.xml
# Enforce privapp-permissions whitelist
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
- ro.control_privapp_permissions=enforce
+#~ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+#~ ro.control_privapp_permissions=enforce
# Include AOSP audio files
include vendor/bliss/config/aosp_audio.mk
@@ -137,9 +137,13 @@
-include vendor/overlays/bliss_overlays.mk
# Gapps
+ifneq ($(USE_FOSS), true)
ifeq ($(BLISS_BUILD_VARIANT), gapps)
$(call inherit-product, vendor/gapps/common/common-vendor.mk)
endif
+endif
-include $(WORKSPACE)/build_env/image-auto-bits.mk
+ifneq ($(USE_FOSS), true)
-include vendor/bliss/config/partner_gms.mk
+endif
diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
index 30f69e0..170357c 100644
--- a/prebuilt/common/Android.mk
+++ b/prebuilt/common/Android.mk
@@ -1,44 +1,5 @@
LOCAL_PATH := $(call my-dir)
-# a wrapper for curl which provides wget syntax, for compatibility
-include $(CLEAR_VARS)
-LOCAL_MODULE := wget
-LOCAL_SRC_FILES := bin/wget
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-include $(BUILD_PREBUILT)
-
-################################
-# Copies the APN list file into $(TARGET_COPY_OUT_PRODUCT)/etc for the product as apns-conf.xml.
-# In the case where $(CUSTOM_APNS_FILE) is defined, the content of $(CUSTOM_APNS_FILE)
-# is added or replaced to the $(DEFAULT_APNS_FILE).
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := apns-conf.xml
-LOCAL_MODULE_CLASS := ETC
-
-DEFAULT_APNS_FILE := vendor/bliss/prebuilt/common/etc/apns-conf.xml
-
-ifdef CUSTOM_APNS_FILE
-CUSTOM_APNS_SCRIPT := vendor/bliss/tools/custom_apns.py
-FINAL_APNS_FILE := $(local-generated-sources-dir)/apns-conf.xml
-
-$(FINAL_APNS_FILE): PRIVATE_SCRIPT := $(CUSTOM_APNS_SCRIPT)
-$(FINAL_APNS_FILE): PRIVATE_CUSTOM_APNS_FILE := $(CUSTOM_APNS_FILE)
-$(FINAL_APNS_FILE): $(CUSTOM_APNS_SCRIPT) $(DEFAULT_APNS_FILE)
- rm -f $@
- python $(PRIVATE_SCRIPT) $@ $(PRIVATE_CUSTOM_APNS_FILE)
-else
-FINAL_APNS_FILE := $(DEFAULT_APNS_FILE)
-endif
-
-LOCAL_PREBUILT_MODULE_FILE := $(FINAL_APNS_FILE)
-
-LOCAL_PRODUCT_MODULE := true
-
-include $(BUILD_PREBUILT)
-
include $(CLEAR_VARS)
LOCAL_MODULE := fonts_customization.xml
LOCAL_SRC_FILES := etc/fonts_customization.xml
diff --git a/prebuilt/common/bin/wget b/prebuilt/common/bin/wget
deleted file mode 100755
index 1d04de5..0000000
--- a/prebuilt/common/bin/wget
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/system/bin/sh
-# wget-curl, a curl wrapper acting as a wget drop-in replacement - version git-HEAD
-# Usage: wget [wget args] [i need to fill this in later] <url(s)>
-# Download all URLs given using curl, but using wget's options.
-#
-#
-# End of help.
-# Copyright (c) 2015 Kylie McClain <somasis@exherbo.org>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-#
-# End of copyright.
-#
-
-set -o pipefail
-shopt -u shift_verbose >/dev/null 2>&1
-
-help() {
- sed -n '/^#/!d;s/^# //;s/^#//;3,${p;}' "$0" | \
- while IFS= read help_line;do
- if [[ "$help_line" == "End of help." ]];then
- exit 0
- else
- printf "%s\n" "$help_line"
- fi
- done
- exit 0
-}
-
-version() {
- sed 's/^# //;s/, .* - version / /;2q;$!d' "$0"
- copyright
- exit 0
-}
-
-copyright() {
- sed -n '/^#/!d;s/^# //;s/^#//;/End of help./,${p;}' "$0" | \
- while IFS= read copyright_line;do
- if [[ "$copyright_line" == "End of help." ]];then
- true
- elif [[ "$copyright_line" == "End of copyright." ]];then
- break
- else
- printf '%s\n' "$copyright_line"
- fi
- done
-}
-
-stderr() {
- printf "$@" >&2
-}
-
-error() {
- stderr "$0: $1\n"
- exit "$2"
-}
-
-invalid_arg() {
- error "invalid option -- '$1'" 2
-}
-
-append_opt() {
- for opt in $@;do
- CURL_OPTS="${CURL_OPTS} ${opt}"
- done
-}
-
-curl() {
- eval "command curl $@ ${CURL_RAW}"
-}
-
-append_raw_arg() {
- CURL_RAW="$CURL_RAW $@"
-}
-
-has_opt() { # exit 0 if CURL_OPTS has arg, non-zero if doesn't
- if [[ "$CURL_OPTS" == *" $1"* ]];then
- return 0
- else
- return 1
- fi
-}
-
-reexec_without() { # download afterwards without $1 in OPTS
- reexec_args_without="$reexec_args_without $@"
- reexec=1
-}
-
-reexec_only() {
- for arg in $@;do
- CURL_OPTS_REEXEC_ONLY="${CURL_OPTS_REEXEC_ONLY} $arg"
- done
-}
-
-print_url() {
- has_opt -s || printf "%s\n" "$1"
-}
-
-# 46ABDFHIKLNOPQRSTUVXabcdhiklm nH nc nd np nv opqrtvwx
-while getopts ':46ABDFHIKLNO:PQRST:U:VXa:bcdhiklmopqrtvwx' argument "$@";do
- case "$argument" in
- # a lot of these are noop right now because they are wget mirror args
- # which curl doesn't really do, and i am not sure if i should implement them
- 4) append_opt -4 ;;
- 6) append_opt -6 ;;
- A) true ;; # probably can't implement this easily...
- B) true ;;
- D) true ;;
- E) true ;;
- F) true ;; # curl doesn't care what the input is
- H) true ;;
- I) true ;;
- K) true ;;
- L) true ;;
- N) true ;;
- O) append_opt "-o $OPTARG" ;;
- P) true ;;
- Q) true ;;
- R) true ;;
- S) append_opt -I;reexec_without -I -s ;;
- T) append_opt "-m $OPTARG" ;;
- U) append_opt "--user-agent \"$OPTARG\"" ;;
- V) version; curl --version; exit 0 ;;
- X) true ;;
- a) append_raw_arg "2>&1 | tee -a $OPTARG" ;;
- b)
- wget_log="wget-log"
- i=1
- while [[ -f "${wget_log}" ]];do
- # if that exists, increment until we find something that doesn't
- i=$(($i+1))
- wget_log="wget-log.${i}"
- done
- append_raw_arg ">\"$wget_log\" 2>&1 &"
- printf "Continuing in background, pid %s.\nOutput will be written to '$wget_log'.\n" "$$"
- ;;
- c) append_opt "-C -" ;;
- d) append_opt "-v" ;;
- e) true ;;
- h) help ;;
- i)
- [[ ! -f "$OPTARG" ]] && error "$OPTARG does not exist" 3
- for url in $(<"$OPTARG");do
- URLS=( ${URLS[@]} "$url" )
- done
- ;;
- q) append_opt "-s" ;;
- esac
- shift $(($OPTIND-1))
-done
-
-# set wget default equivilants
-append_opt -L # follow redirects
-append_opt -# # progress bar
-
-if [[ -z "${URLS[@]}" ]];then
- URLS=( ${@} )
-fi
-
-for url in ${URLS[@]};do
- url_file=${url##*/}
- if [[ "$url" == "$url_file" ]];then
- # has no remote file name and -o is not in CURL_OPTS... assume index.html
- has_opt -o || append_opt "-o index.html"
- fi
-
- eval "print_url '$url';curl ${CURL_OPTS} -- $url"
- if [[ "$reexec" ]];then
- for reexec_arg in ${reexec_args_without};do
- CURL_OPTS_REEXEC=$(echo "${CURL_OPTS_REEXEC:-$CURL_OPTS}" | sed "s# $reexec_arg##")
- done
- eval "print_url '$url';curl ${CURL_OPTS_REEXEC} ${CURL_OPTS_REEXEC_ONLY} -- $url"
- fi
-done
diff --git a/prebuilt/common/etc/init/bliss-iosched.rc b/prebuilt/common/etc/init/bliss-iosched.rc
deleted file mode 100644
index 263003f..0000000
--- a/prebuilt/common/etc/init/bliss-iosched.rc
+++ /dev/null
@@ -1,70 +0,0 @@
-on init
- # Set up the BFQIO hierarchy
- mkdir /dev/bfqio 0755 root system
- mount cgroup none /dev/bfqio bfqio
- chown root system /dev/bfqio/tasks
- chmod 0664 /dev/bfqio/tasks
- chmod 0220 /dev/bfqio/cgroup.event_control
-
- # Soft realtime class for display service
- mkdir /dev/bfqio/rt-display 0755 root system
- write /dev/bfqio/rt-display/bfqio.ioprio_class 1
- chown system system /dev/bfqio/rt-display/tasks
- chmod 0664 /dev/bfqio/rt-display/tasks
- chmod 0220 /dev/bfqio/rt-display/cgroup.event_control
-
-on boot
- restorecon --recursive /sys/block/mmcblk0/queue
- chown system system /sys/block/mmcblk0/queue/scheduler
- chmod 0664 /sys/block/mmcblk0/queue/scheduler
-
- restorecon --recursive /sys/block/sda/queue
- chown system system /sys/block/sda/queue/scheduler
- chmod 0664 /sys/block/sda/queue/scheduler
-
- restorecon --recursive /sys/block/sde/queue
- chown system system /sys/block/sde/queue/scheduler
- chmod 0664 /sys/block/sde/queue/scheduler
-
- restorecon --recursive /sys/block/dm-0/queue
- chown system system /sys/block/dm-0/queue/scheduler
- chmod 0664 /sys/block/dm-0/queue/scheduler
-
-# Configure IO scheduler
-on property:sys.io.scheduler=*
- write /sys/block/mmcblk0/queue/scheduler ${sys.io.scheduler}
- write /sys/block/mmcblk1/queue/scheduler ${sys.io.scheduler}
- write /sys/block/sda/queue/scheduler ${sys.io.scheduler}
- write /sys/block/sde/queue/scheduler ${sys.io.scheduler}
- write /sys/block/dm-0/queue/scheduler ${sys.io.scheduler}
-
-on property:persist.sys.io.scheduler=*
- setprop sys.io.scheduler ${persist.sys.io.scheduler}
-
-# Set slice_idle to 0 for CFQ
-on property:sys.io.scheduler=cfq
- restorecon --recursive /sys/block/mmcblk0/queue
- restorecon --recursive /sys/block/mmcblk1/queue
- restorecon --recursive /sys/block/sda/queue
- restorecon --recursive /sys/block/sde/queue
- restorecon --recursive /sys/block/dm-0/queue
-
- write /sys/block/mmcblk0/queue/iosched/slice_idle 0
- write /sys/block/mmcblk1/queue/iosched/slice_idle 0
- write /sys/block/sda/queue/iosched/slice_idle 0
- write /sys/block/sde/queue/iosched/slice_idle 0
- write /sys/block/dm-0/queue/iosched/slice_idle 0
-
-# Set slice_idle to 0 for BFQ
-on property:sys.io.scheduler=bfq
- restorecon --recursive /sys/block/mmcblk0/queue
- restorecon --recursive /sys/block/mmcblk1/queue
- restorecon --recursive /sys/block/sda/queue
- restorecon --recursive /sys/block/sde/queue
- restorecon --recursive /sys/block/dm-0/queue
-
- write /sys/block/mmcblk0/queue/iosched/slice_idle 0
- write /sys/block/mmcblk1/queue/iosched/slice_idle 0
- write /sys/block/sda/queue/iosched/slice_idle 0
- write /sys/block/sde/queue/iosched/slice_idle 0
- write /sys/block/dm-0/queue/iosched/slice_idle 0
diff --git a/prebuilt/common/etc/init/bliss-radio.rc b/prebuilt/common/etc/init/bliss-radio.rc
deleted file mode 100644
index 22f1e64..0000000
--- a/prebuilt/common/etc/init/bliss-radio.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-# Disable ril services if noril prop is set
-on property:ro.radio.noril=1
- stop ims_rtp_daemon
- stop imsdatadaemon
- stop imsqmidaemon
- stop imsrcsservice
- stop ril-daemon
- stop qmuxd
- stop netmgrd
-
-on property:persist.radio.noril=1
- setprop ro.radio.noril 1
diff --git a/prebuilt/common/etc/init/bliss-system.rc b/prebuilt/common/etc/init/bliss-system.rc
deleted file mode 100644
index b6b6d87..0000000
--- a/prebuilt/common/etc/init/bliss-system.rc
+++ /dev/null
@@ -1,16 +0,0 @@
-# Bliss core functionality
-on init
- export TERMINFO /system/etc/terminfo
-
-on post-fs-data
- mkdir /cache/recovery 0770 system cache
-
- # Change permissions on fsck log so it can be added to the dropbox
- chown root log /dev/fscklogs/log
- chmod 0640 /dev/fscklogs/log
-
-# bugreport is triggered by holding down volume down, volume up and power
-service bugreport /system/bin/dumpstate -d -p -z
- oneshot
- disabled
- keycodes 114 115 116