Merge "Vendor: Bliss: Allow custom keys" into o8.1
diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
index 4c5b29d..e40b5ac 100644
--- a/build/soong/android/variable.go
+++ b/build/soong/android/variable.go
@@ -30,11 +30,33 @@
Use_legacy_rescaling struct {
Cflags []string
}
+
+ Uses_generic_camera_parameter_library struct {
+ Srcs []string
+ }
+
+ Target_uses_qsml struct {
+ Cflags []string
+ Shared_libs []string
+ Header_libs []string
+ Required []string
+ }
+
+ Target_uses_eigen struct {
+ Shared_libs []string
+ Required []string
+ }
+
+ Target_shim_libs struct {
+ Cppflags []string
+ }
}
type ProductVariables struct {
Has_legacy_camera_hal1 *bool `json:",omitempty"`
Uses_media_extensions *bool `json:",omitempty"`
+ Uses_generic_camera_parameter_library *bool `json:",omitempty"`
+ Specific_camera_parameter_library *string `json:",omitempty"`
Needs_text_relocations *bool `json:",omitempty"`
Mtk_hardware *bool `json:",omitempty"`
QTIAudioPath *string `json:",omitempty"`
@@ -44,4 +66,7 @@
Qcom_bsp_legacy *bool `json:",omitempty"`
Qti_flac_decoder *bool `json:",omitempty"`
Use_legacy_rescaling *bool `json:",omitempty"`
+ Target_uses_qsml *bool `json:",omitempty"`
+ Target_uses_eigen *bool `json:",omitempty"`
+ Target_shim_libs *string `json:",omitempty"`
}
diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
index d2c7662..8846562 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk
@@ -5,6 +5,8 @@
echo '"bliss": {'; \
echo ' "Has_legacy_camera_hal1": $(if $(filter true,$(TARGET_HAS_LEGACY_CAMERA_HAL1)),true,false),'; \
echo ' "Uses_media_extensions": $(if $(filter true,$(TARGET_USES_MEDIA_EXTENSIONS)),true,false),'; \
+ echo ' "Uses_generic_camera_parameter_library": $(if $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY),false,true),'; \
+ echo ' "Specific_camera_parameter_library": "$(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY)",'; \
echo ' "Needs_text_relocations": $(if $(filter true,$(TARGET_NEEDS_PLATFORM_TEXT_RELOCATIONS)),true,false),'; \
echo ' "Mtk_hardware": $(if $(filter true,$(BOARD_USES_MTK_HARDWARE)),true,false),'; \
echo ' "BoardUsesQTIHardware": $(if $(BOARD_USES_QTI_HARDWARE),true,false),'; \
@@ -15,6 +17,10 @@
echo ' "Cant_reallocate_omx_buffers": $(if $(filter omap4,$(TARGET_BOARD_PLATFORM)),true,false),'; \
echo ' "Qcom_bsp_legacy": $(if $(filter msm7x27a msm7x30 msm8660 msm8960,$(TARGET_BOARD_PLATFORM)),true,false),'; \
echo ' "Qti_flac_decoder": $(if $(strip $(AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER)),true,false),'; \
- echo ' "Use_legacy_rescaling": $(if $(strip $(TARGET_OMX_LEGACY_RESCALING)),true,false)'; \
+ echo ' "Use_legacy_rescaling": $(if $(strip $(TARGET_OMX_LEGACY_RESCALING)),true,false),'; \
+ echo ' "TargetUsesProprietaryLibs": $(if $(strip $(TARGET_USES_PROPRIETARY_LIBS)),true,false),'; \
+ echo ' "Target_uses_qsml": $(if $(strip $(TARGET_USES_QSML)),true,false),'; \
+ echo ' "Target_uses_eigen": $(if $(strip $(TARGET_USES_QSML)),false,true),'; \
+ echo ' "Target_shim_libs": "$(subst $(space),:,$(TARGET_LD_SHIM_LIBS))"'; \
echo '},'; \
echo '') > $(SOONG_VARIABLES_TMP)
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index 16e8429..cc3572d 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -27,13 +27,17 @@
# TARGET_KERNEL_SELINUX_CONFIG = SELinux defconfig, optional
# TARGET_KERNEL_ADDITIONAL_CONFIG = Additional defconfig, optional
# TARGET_KERNEL_ARCH = Kernel Arch
-# TARGET_KERNEL_HEADER_ARCH = Optional Arch for kernel headers if
-# different from TARGET_KERNEL_ARCH
# TARGET_KERNEL_CROSS_COMPILE_PREFIX = Compiler prefix (e.g. arm-eabi-)
# defaults to arm-linux-androidkernel- for arm
# aarch64-linux-androidkernel- for arm64
# x86_64-linux-androidkernel- for x86
#
+# 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
@@ -49,11 +53,21 @@
# KERNEL_TOOLCHAIN = Path to toolchain, if unset, assumes
# TARGET_KERNEL_CROSS_COMPILE_PREFIX
# is in PATH
+#
+# KERNEL_CC = The C Compiler used. This is automatically set based
+# on whether the clang 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
+#
# USE_CCACHE = Enable ccache (global Android flag)
#
# NEED_KERNEL_MODULE_ROOT = Optional, if true, install kernel
# modules in root instead of system
+ifneq ($(TARGET_NO_KERNEL),true)
TARGET_AUTO_KDIR := $(shell echo $(TARGET_DEVICE_DIR) | sed -e 's/^device/kernel/g')
@@ -69,7 +83,6 @@
## Internal variables
KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ
KERNEL_CONFIG := $(KERNEL_OUT)/.config
-KERNEL_OUT_STAMP := $(KERNEL_OUT)/.mkdir_stamp
TARGET_KERNEL_ARCH := $(strip $(TARGET_KERNEL_ARCH))
ifeq ($(TARGET_KERNEL_ARCH),)
@@ -85,18 +98,6 @@
endif
KERNEL_DEFCONFIG_SRC := $(KERNEL_SRC)/arch/$(KERNEL_DEFCONFIG_ARCH)/configs/$(KERNEL_DEFCONFIG)
-TARGET_KERNEL_HEADER_ARCH := $(strip $(TARGET_KERNEL_HEADER_ARCH))
-ifeq ($(TARGET_KERNEL_HEADER_ARCH),)
-KERNEL_HEADER_ARCH := $(KERNEL_ARCH)
-else
-KERNEL_HEADER_ARCH := $(TARGET_KERNEL_HEADER_ARCH)
-endif
-
-KERNEL_HEADER_DEFCONFIG := $(strip $(KERNEL_HEADER_DEFCONFIG))
-ifeq ($(KERNEL_HEADER_DEFCONFIG),)
-KERNEL_HEADER_DEFCONFIG := $(KERNEL_DEFCONFIG)
-endif
-
ifeq ($(BOARD_KERNEL_IMAGE_NAME),)
$(error BOARD_KERNEL_IMAGE_NAME not defined.)
endif
@@ -119,9 +120,6 @@
ifeq ($(KERNEL_ARCH),arm64)
# Avoid "unsupported RELA relocation: 311" errors (R_AARCH64_ADR_GOT_PAGE)
MAKE_FLAGS += CFLAGS_MODULE="-fno-pic"
- ifeq ($(TARGET_ARCH),arm)
- KERNEL_CONFIG_OVERRIDE := CONFIG_ANDROID_BINDER_IPC_32BIT=y
- endif
endif
ifneq ($(TARGET_KERNEL_ADDITIONAL_CONFIG),)
@@ -201,15 +199,19 @@
ifeq ($(FULL_KERNEL_BUILD),true)
-KERNEL_HEADERS_INSTALL := $(KERNEL_OUT)/usr
-KERNEL_HEADERS_INSTALL_STAMP := $(KERNEL_OUT)/.headers_install_stamp
+KERNEL_HEADERS_INSTALL_DIR := $(KERNEL_OUT)/usr
+KERNEL_HEADERS_INSTALL_DEPS := $(KERNEL_OUT)/.headers_install_deps
ifeq ($(NEED_KERNEL_MODULE_ROOT),true)
KERNEL_MODULES_INSTALL := root
KERNEL_MODULES_OUT := $(TARGET_ROOT_OUT)/lib/modules
+KERNEL_DEPMOD_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_recovery)
+KERNEL_MODULE_MOUNTPOINT :=
else
-KERNEL_MODULES_INSTALL := system
-KERNEL_MODULES_OUT := $(TARGET_OUT)/lib/modules
+KERNEL_MODULES_INSTALL := $(TARGET_COPY_OUT_VENDOR)
+KERNEL_MODULES_OUT := $(TARGET_OUT_VENDOR)/lib/modules
+KERNEL_DEPMOD_STAGING_DIR := $(call intermediates-dir-for,PACKAGING,depmod_vendor)
+KERNEL_MODULE_MOUNTPOINT := vendor
endif
TARGET_KERNEL_CROSS_COMPILE_PREFIX := $(strip $(TARGET_KERNEL_CROSS_COMPILE_PREFIX))
@@ -231,6 +233,24 @@
endif
endif
+ifeq ($(TARGET_KERNEL_CLANG_COMPILE),true)
+ ifneq ($(TARGET_KERNEL_CLANG_VERSION),)
+ # Find the clang-* directory containing the specified version
+ KERNEL_CLANG_VERSION := $(shell find $(ANDROID_BUILD_TOP)/prebuilts/clang/host/$(HOST_OS)-x86/ -name AndroidVersion.txt -exec grep -l $(TARGET_KERNEL_CLANG_VERSION) "{}" \; | sed -e 's|/AndroidVersion.txt$$||g;s|^.*/||g')
+ else
+ # Only set the latest version of clang if TARGET_KERNEL_CLANG_VERSION hasn't been set by the device config
+ KERNEL_CLANG_VERSION := $(shell ls -d $(ANDROID_BUILD_TOP)/prebuilts/clang/host/$(HOST_OS)-x86/clang-* | xargs -n 1 basename | tail -1)
+ endif
+ TARGET_KERNEL_CLANG_PATH ?= $(ANDROID_BUILD_TOP)/prebuilts/clang/host/$(HOST_OS)-x86/$(KERNEL_CLANG_VERSION)/bin
+ 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
+endif
+
ifneq ($(USE_CCACHE),)
# Detect if the system already has ccache installed to use instead of the prebuilt
ccache := $(shell which ccache)
@@ -242,135 +262,174 @@
endif
endif
-KERNEL_CROSS_COMPILE := CROSS_COMPILE="$(ccache) $(KERNEL_TOOLCHAIN_PATH)"
+ifeq ($(TARGET_KERNEL_CLANG_COMPILE),true)
+ KERNEL_CROSS_COMPILE := CROSS_COMPILE="$(KERNEL_TOOLCHAIN_PATH)"
+ ifeq ($(KERNEL_CC),)
+ KERNEL_CC := CC="$(ccache) $(TARGET_KERNEL_CLANG_PATH)/clang"
+ endif
+else
+ KERNEL_CROSS_COMPILE := CROSS_COMPILE="$(ccache) $(KERNEL_TOOLCHAIN_PATH)"
+endif
ccache =
-define mv-modules
- mdpath=`find $(KERNEL_MODULES_OUT) -type f -name modules.order`;\
- if [ "$$mdpath" != "" ];then\
- mpath=`dirname $$mdpath`;\
- ko=`find $$mpath/kernel -type f -name *.ko`;\
- for i in $$ko; do $(KERNEL_TOOLCHAIN_PATH)strip --strip-unneeded $$i;\
- mv $$i $(KERNEL_MODULES_OUT)/; done;\
- fi
-endef
-
-define clean-module-folder
- mdpath=`find $(KERNEL_MODULES_OUT) -type f -name modules.order`;\
- if [ "$$mdpath" != "" ];then\
- mpath=`dirname $$mdpath`; rm -rf $$mpath;\
- fi
-endef
-
ifeq ($(HOST_OS),darwin)
MAKE_FLAGS += C_INCLUDE_PATH=$(ANDROID_BUILD_TOP)/external/elfutils/libelf:/usr/local/opt/openssl/include
MAKE_FLAGS += LIBRARY_PATH=/usr/local/opt/openssl/lib
endif
ifeq ($(TARGET_KERNEL_MODULES),)
- TARGET_KERNEL_MODULES := no-external-modules
+ TARGET_KERNEL_MODULES := INSTALLED_KERNEL_MODULES
endif
-$(KERNEL_OUT_STAMP):
- $(hide) mkdir -p $(KERNEL_OUT)
- $(hide) rm -rf $(KERNEL_MODULES_OUT)
- $(hide) mkdir -p $(KERNEL_MODULES_OUT)
- $(hide) touch $@
-
KERNEL_ADDITIONAL_CONFIG_OUT := $(KERNEL_OUT)/.additional_config
.PHONY: force_additional_config
$(KERNEL_ADDITIONAL_CONFIG_OUT): force_additional_config
$(hide) cmp -s $(KERNEL_ADDITIONAL_CONFIG_SRC) $@ || cp $(KERNEL_ADDITIONAL_CONFIG_SRC) $@;
-$(KERNEL_CONFIG): $(KERNEL_OUT_STAMP) $(KERNEL_DEFCONFIG_SRC) $(KERNEL_ADDITIONAL_CONFIG_OUT)
+$(KERNEL_CONFIG): $(KERNEL_DEFCONFIG_SRC) $(KERNEL_ADDITIONAL_CONFIG_OUT)
@echo "Building Kernel Config"
- $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG)
+ $(hide) mkdir -p $(KERNEL_OUT)
+ $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) 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; \
- $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) oldconfig; fi
+ $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) oldconfig; fi
# Create defconfig build artifact
- $(hide) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) savedefconfig
+ $(hide) $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) 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); \
- $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) KCONFIG_ALLCONFIG=$(KERNEL_OUT)/.config alldefconfig; fi
+ $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) KCONFIG_ALLCONFIG=$(KERNEL_OUT)/.config alldefconfig; fi
-TARGET_KERNEL_BINARIES: $(KERNEL_OUT_STAMP) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL_STAMP)
+.PHONY: TARGET_KERNEL_BINARIES
+TARGET_KERNEL_BINARIES: $(KERNEL_CONFIG)
@echo "Building Kernel"
- $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(BOARD_KERNEL_IMAGE_NAME)
- $(hide) if grep -q 'CONFIG_OF=y' $(KERNEL_CONFIG) ; \
- then \
- echo "Building DTBs" ; \
- $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) dtbs ; \
- else \
- echo "DTBs not enabled" ; \
- fi ;
- $(hide) if grep -q 'CONFIG_MODULES=y' $(KERNEL_CONFIG) ; \
- then \
- echo "Building Kernel Modules" ; \
- $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) modules && \
- $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) modules_install && \
- $(mv-modules) && \
- $(clean-module-folder) ; \
- else \
- echo "Kernel Modules not enabled" ; \
- fi ;
+ $(hide) rm -rf $(KERNEL_MODULES_OUT)
+ $(hide) mkdir -p $(KERNEL_MODULES_OUT)
+ $(hide) rm -rf $(KERNEL_DEPMOD_STAGING_DIR)
+ $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(BOARD_KERNEL_IMAGE_NAME)
+ $(hide) if grep -q '^CONFIG_OF=y' $(KERNEL_CONFIG); then \
+ echo "Building DTBs"; \
+ $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) dtbs; \
+ fi
+ $(hide) if grep -q '^CONFIG_MODULES=y' $(KERNEL_CONFIG); then \
+ echo "Building Kernel Modules"; \
+ $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) modules; \
+ fi
+.PHONY: INSTALLED_KERNEL_MODULES
+INSTALLED_KERNEL_MODULES: depmod-host
+ $(hide) if grep -q '^CONFIG_MODULES=y' $(KERNEL_CONFIG); then \
+ echo "Installing Kernel Modules"; \
+ $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) modules_install && \
+ mofile=$$(find $(KERNEL_MODULES_OUT) -type f -name modules.order) && \
+ mpath=$$(dirname $$mofile) && \
+ for f in $$(find $$mpath/kernel -type f -name '*.ko'); do \
+ $(KERNEL_TOOLCHAIN_PATH)strip --strip-unneeded $$f; \
+ mv $$f $(KERNEL_MODULES_OUT); \
+ done && \
+ rm -rf $$mpath && \
+ mkdir -p $(KERNEL_DEPMOD_STAGING_DIR)/lib/modules/0.0/$(KERNEL_MODULE_MOUNTPOINT)/lib/modules && \
+ find $(KERNEL_MODULES_OUT) -name *.ko -exec cp {} $(KERNEL_DEPMOD_STAGING_DIR)/lib/modules/0.0/$(KERNEL_MODULE_MOUNTPOINT)/lib/modules \; && \
+ $(DEPMOD) -b $(KERNEL_DEPMOD_STAGING_DIR) 0.0 && \
+ sed -e 's/\(.*modules.*\):/\/\1:/g' -e 's/ \([^ ]*modules[^ ]*\)/ \/\1/g' $(KERNEL_DEPMOD_STAGING_DIR)/lib/modules/0.0/modules.dep > $(KERNEL_MODULES_OUT)/modules.dep; \
+ fi
$(TARGET_KERNEL_MODULES): TARGET_KERNEL_BINARIES
$(TARGET_PREBUILT_INT_KERNEL): $(TARGET_KERNEL_MODULES)
-$(KERNEL_HEADERS_INSTALL_STAMP): $(KERNEL_OUT_STAMP) $(KERNEL_CONFIG)
+# Install kernel (uapi) headers.
+#
+# The dependency file serves two purposes:
+# - It is a stamp indicating when the headers were last installed.
+# - It contains a rule to regenerate itself when any kernel header
+# files change. This rule is identical to the rule emitted by
+# GCC using the M/MM flags.
+#
+# Note that the location of installed kernel headers changed when the
+# kernel uapi system was introduced in 3.7. Unfortunately, it is not
+# sufficient to test whether the uapi directories exist because some
+# kernels backport patches that contain uapi headers. So we look for
+# the string "version_h" in the kernel makefile which was introduced
+# as a part of the uapi system (commit d183e6f570f3).
+-include $(KERNEL_HEADERS_INSTALL_DEPS)
+$(KERNEL_HEADERS_INSTALL_DEPS):
@echo "Building Kernel Headers"
- $(hide) if [ ! -z "$(KERNEL_HEADER_DEFCONFIG)" ]; then \
- rm -f ../$(KERNEL_CONFIG); \
- $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) $(KERNEL_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_HEADER_DEFCONFIG); \
- $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) $(KERNEL_CROSS_COMPILE) headers_install; fi
- $(hide) if [ "$(KERNEL_HEADER_DEFCONFIG)" != "$(KERNEL_DEFCONFIG)" ]; then \
- echo "Used a different defconfig for header generation"; \
- rm -f ../$(KERNEL_CONFIG); \
- $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG); fi
- $(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
- echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \
- echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \
- $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) oldconfig; fi
- $(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); \
- $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) KCONFIG_ALLCONFIG=$(KERNEL_OUT)/.config alldefconfig; fi
- $(hide) touch $@
+ $(hide) mkdir -p $(KERNEL_OUT)
+ $(hide) rm -f $@
+ $(hide) $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) headers_install
+ $(hide) echo "$@: \\" > $@
+ $(hide) ( cd $(KERNEL_SRC); \
+ if grep -q '^version_h' 'Makefile'; then \
+ depdirs="arch/$(KERNEL_ARCH)/include/uapi include/uapi"; \
+ else \
+ depdirs="arch/$(KERNEL_ARCH)/include/asm include"; \
+ fi; \
+ deps="Makefile $$(find $$depdirs -type f -name '*.h')"; \
+ for f in $$deps; do \
+ echo " $(KERNEL_SRC)/$$f \\" >> $@; \
+ done ; \
+ echo "" >> $@ ; \
+ for f in $$deps; do \
+ echo "$(KERNEL_SRC)/$$f:" >> $@; \
+ echo "" >> $@; \
+ done \
+ )
-# provide this rule because there are dependencies on this throughout the repo
-$(KERNEL_HEADERS_INSTALL): $(KERNEL_HEADERS_INSTALL_STAMP)
+.PHONY: INSTALLED_KERNEL_HEADERS
+INSTALLED_KERNEL_HEADERS: $(KERNEL_HEADERS_INSTALL_DEPS)
-kerneltags: $(KERNEL_OUT_STAMP) $(KERNEL_CONFIG)
- $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) tags
+# Dependencies on $(KERNEL_OUT)/usr are deprecated
+$(KERNEL_HEADERS_INSTALL_DIR): $(KERNEL_HEADERS_INSTALL_DEPS)
+ @echo "Depending on $(KERNEL_HEADERS_INSTALL_DIR) is deprecated." 1>&2
+ @echo "Use INSTALLED_KERNEL_HEADERS instead." 1>&2
+ @exit 1
+
+.PHONY: kerneltags
+kerneltags: $(KERNEL_CONFIG)
+ $(hide) mkdir -p $(KERNEL_OUT)
+ $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) tags
+
+.PHONY: kernelconfig kernelxconfig kernelsavedefconfig alldefconfig
kernelconfig: KERNELCONFIG_MODE := menuconfig
kernelxconfig: KERNELCONFIG_MODE := xconfig
-kernelxconfig kernelconfig: $(KERNEL_OUT_STAMP)
- $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG)
+kernelxconfig kernelconfig:
+ $(hide) mkdir -p $(KERNEL_OUT)
+ $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(KERNEL_DEFCONFIG)
env KCONFIG_NOTIMESTAMP=true \
- $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNELCONFIG_MODE)
+ $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(KERNELCONFIG_MODE)
env KCONFIG_NOTIMESTAMP=true \
- $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) savedefconfig
+ $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) savedefconfig
cp $(KERNEL_OUT)/defconfig $(KERNEL_DEFCONFIG_SRC)
-kernelsavedefconfig: $(KERNEL_OUT_STAMP)
- $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG)
+kernelsavedefconfig:
+ $(hide) mkdir -p $(KERNEL_OUT)
+ $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(KERNEL_DEFCONFIG)
env KCONFIG_NOTIMESTAMP=true \
- $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) savedefconfig
+ $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) savedefconfig
cp $(KERNEL_OUT)/defconfig $(KERNEL_DEFCONFIG_SRC)
-alldefconfig: $(KERNEL_OUT_STAMP)
+alldefconfig:
+ $(hide) mkdir -p $(KERNEL_OUT)
env KCONFIG_NOTIMESTAMP=true \
- $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) alldefconfig
+ $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) alldefconfig
endif # FULL_KERNEL_BUILD
+TARGET_PREBUILT_DTBO = $(PRODUCT_OUT)/dtbo/arch/$(KERNEL_ARCH)/boot/dtbo.img
+$(TARGET_PREBUILT_DTBO): $(AVBTOOL)
+ echo -e ${CL_GRN}"Building DTBO.img"${CL_RST}
+ $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(PRODUCT_OUT)/dtbo ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(KERNEL_DEFCONFIG)
+ $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(PRODUCT_OUT)/dtbo ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) dtbo.img
+ $(AVBTOOL) add_hash_footer \
+ --image $@ \
+ --partition_size $(BOARD_DTBOIMG_PARTITION_SIZE) \
+ --partition_name dtbo $(INTERNAL_AVB_DTBO_SIGNING_ARGS) \
+ $(BOARD_AVB_DTBO_ADD_HASH_FOOTER_ARGS)
+
## Install it
ifeq ($(NEEDS_KERNEL_COPY),true)
@@ -382,5 +441,19 @@
ALL_PREBUILT += $(INSTALLED_KERNEL_TARGET)
endif
+ifeq ($(TARGET_NEEDS_DTBOIMAGE),true)
+file := $(INSTALLED_DTBOIMAGE_TARGET)
+ALL_PREBUILT += $(file)
+$(file) : $(TARGET_PREBUILT_DTBO) | $(ACP)
+ $(transform-prebuilt-to-target)
+
+ALL_PREBUILT += $(INSTALLED_DTBOIMAGE_TARGET)
+endif
+
.PHONY: kernel
kernel: $(INSTALLED_KERNEL_TARGET)
+
+.PHONY: dtbo
+dtbo: $(INSTALLED_DTBOIMAGE_TARGET)
+
+endif # TARGET_NO_KERNEL
diff --git a/config/versions.mk b/config/versions.mk
index eb35bcd..0602dbd 100644
--- a/config/versions.mk
+++ b/config/versions.mk
@@ -2,7 +2,7 @@
# Bliss RELEASE VERSION
BLISS_VERSION_MAJOR = 10
BLISS_VERSION_MINOR = 0
-BLISS_VERSION_MAINTENANCE = Beta
+BLISS_VERSION_MAINTENANCE = Stable
VERSION := $(BLISS_VERSION_MAJOR).$(BLISS_VERSION_MINOR)-$(BLISS_VERSION_MAINTENANCE)
diff --git a/libbfqio/Android.bp b/libbfqio/Android.bp
new file mode 100644
index 0000000..dd81629
--- /dev/null
+++ b/libbfqio/Android.bp
@@ -0,0 +1,55 @@
+//
+// 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.
+//
+
+cc_library_headers {
+ name: "libbfqio_headers",
+ vendor_available: true,
+ export_include_dirs: ["include"],
+}
+
+cc_defaults {
+ name: "libbfqio_defaults",
+ srcs: [
+ "bfqio.c",
+ ],
+
+ shared_libs: [
+ "libcutils",
+ "liblog",
+ ],
+ header_libs: [
+ "libbfqio_headers",
+ ],
+ export_header_lib_headers: ["libbfqio_headers"],
+
+ cflags: [
+ "-Werror",
+ "-Wall",
+ "-Wextra",
+ ],
+}
+
+cc_library {
+ name: "libbfqio",
+ vendor_available: true,
+ defaults: ["libbfqio_defaults"],
+}
+
+cc_library {
+ name: "libbfqio_vendor",
+ vendor: true,
+ defaults: ["libbfqio_defaults"],
+}
diff --git a/libbfqio/bfqio.c b/libbfqio/bfqio.c
new file mode 100644
index 0000000..cabd579
--- /dev/null
+++ b/libbfqio/bfqio.c
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+#define LOG_TAG "bfqio"
+
+#include <fcntl.h>
+#include <cutils/iosched_policy.h>
+#include <cutils/log.h>
+#include <pthread.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+static int __rtio_cgroup_supported = -1;
+static pthread_once_t __rtio_init_once = PTHREAD_ONCE_INIT;
+
+static void __initialize_rtio(void) {
+ if (!access("/dev/bfqio/tasks", W_OK) || !access("/dev/bfqio/rt-display/tasks", W_OK)) {
+ __rtio_cgroup_supported = 1;
+ } else {
+ __rtio_cgroup_supported = 0;
+ }
+}
+
+int android_set_rt_ioprio(int tid, int rt) {
+ int fd = -1, rc = -1;
+
+ pthread_once(&__rtio_init_once, __initialize_rtio);
+ if (__rtio_cgroup_supported != 1) {
+ return -1;
+ }
+
+ if (rt) {
+ fd = open("/dev/bfqio/rt-display/tasks", O_WRONLY | O_CLOEXEC);
+ } else {
+ fd = open("/dev/bfqio/tasks", O_WRONLY | O_CLOEXEC);
+ }
+
+ if (fd < 0) {
+ return -1;
+ }
+
+#ifdef HAVE_GETTID
+ if (tid == 0) {
+ tid = gettid();
+ }
+#endif
+
+ // specialized itoa -- works for tid > 0
+ char text[22];
+ char *end = text + sizeof(text) - 1;
+ char *ptr = end;
+ *ptr = '\0';
+ while (tid > 0) {
+ *--ptr = '0' + (tid % 10);
+ tid = tid / 10;
+ }
+
+ rc = write(fd, ptr, end - ptr);
+ if (rc < 0) {
+ /*
+ * If the thread is in the process of exiting,
+ * don't flag an error
+ */
+ if (errno == ESRCH) {
+ rc = 0;
+ } else {
+ SLOGV("android_set_rt_ioprio failed to write '%s' (%s); fd=%d\n",
+ ptr, strerror(errno), fd);
+ }
+ }
+
+ close(fd);
+ return rc;
+}
diff --git a/libbfqio/include/bfqio/bfqio.h b/libbfqio/include/bfqio/bfqio.h
new file mode 100644
index 0000000..14392d9
--- /dev/null
+++ b/libbfqio/include/bfqio/bfqio.h
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int android_set_rt_ioprio(int pid, int rt);
+
+#ifdef __cplusplus
+}
+#endif