Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6323e8b8 authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge changes from topic "vendor_dlkm" 

* changes:
  Add vendor_dlkm/etc/build.prop
  Install dlkm to appropriate place and symlink
  Add notice files for vendor_dlkm
  Add vendor_dlkm partition.
parents 5469096f 51a971b1

core/Makefile

+209 −15

File changed.

Preview size limit exceeded, changes collapsed.

core/board_config.mk

+37 −0
Original line number Diff line number Diff line
@@ -72,12 +72,15 @@ _board_strip_readonly_list += \ 
  BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE \

  BOARD_ODMIMAGE_PARTITION_SIZE \

  BOARD_ODMIMAGE_FILE_SYSTEM_TYPE \

  BOARD_VENDOR_DLKMIMAGE_PARTITION_SIZE \

  BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE \



# Logical partitions related variables.

_dynamic_partitions_var_list += \

  BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_VENDOR_DLKMIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_SUPER_PARTITION_SIZE \
@@ -511,6 +514,40 @@ ifdef BOARD_PREBUILT_SYSTEM_EXTIMAGE 
endif

.KATI_READONLY := BUILDING_SYSTEM_EXT_IMAGE



###########################################

# Now we can substitute with the real value of TARGET_COPY_OUT_VENDOR_DLKM

ifeq ($(TARGET_COPY_OUT_VENDOR_DLKM),$(_vendor_dlkm_path_placeholder))

  TARGET_COPY_OUT_VENDOR_DLKM := $(TARGET_COPY_OUT_VENDOR)/vendor_dlkm

else ifeq ($(filter vendor_dlkm system/vendor/vendor_dlkm vendor/vendor_dlkm,$(TARGET_COPY_OUT_VENDOR_DLKM)),)

  $(error TARGET_COPY_OUT_VENDOR_DLKM must be either 'vendor_dlkm', 'system/vendor/vendor_dlkm' or 'vendor/vendor_dlkm', seeing '$(TARGET_COPY_OUT_VENDOR_DLKM)'.)

endif

PRODUCT_COPY_FILES := $(subst $(_vendor_dlkm_path_placeholder),$(TARGET_COPY_OUT_VENDOR_DLKM),$(PRODUCT_COPY_FILES))



BOARD_USES_VENDOR_DLKMIMAGE :=

ifdef BOARD_PREBUILT_VENDOR_DLKMIMAGE

  BOARD_USES_VENDOR_DLKMIMAGE := true

endif

ifdef BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE

  BOARD_USES_VENDOR_DLKMIMAGE := true

endif

$(call check_image_config,vendor_dlkm)



BUILDING_VENDOR_DLKM_IMAGE :=

ifeq ($(PRODUCT_BUILD_VENDOR_DLKM_IMAGE),)

  ifdef BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE

    BUILDING_VENDOR_DLKM_IMAGE := true

  endif

else ifeq ($(PRODUCT_BUILD_VENDOR_DLKM_IMAGE),true)

  BUILDING_VENDOR_DLKM_IMAGE := true

  ifndef BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE

    $(error PRODUCT_BUILD_VENDOR_DLKM_IMAGE set to true, but BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE not defined)

  endif

endif

ifdef BOARD_PREBUILT_VENDOR_DLKMIMAGE

  BUILDING_VENDOR_DLKM_IMAGE :=

endif

.KATI_READONLY := BUILDING_VENDOR_DLKM_IMAGE



###########################################

# Now we can substitute with the real value of TARGET_COPY_OUT_ODM

ifeq ($(TARGET_COPY_OUT_ODM),$(_odm_path_placeholder))

core/config.mk

+8 −1
Original line number Diff line number Diff line
@@ -930,6 +930,13 @@ $(error Should not define BOARD_ODMIMAGE_PARTITION_SIZE and \ 
endif

endif



ifneq ($(BOARD_VENDOR_DLKMIMAGE_PARTITION_SIZE),)

ifneq ($(BOARD_VENDOR_DLKMIMAGE_PARTITION_RESERVED_SIZE),)

$(error Should not define BOARD_VENDOR_DLKMIMAGE_PARTITION_SIZE and \

    BOARD_VENDOR_DLKMIMAGE_PARTITION_RESERVED_SIZE together)

endif

endif



ifneq ($(BOARD_PRODUCTIMAGE_PARTITION_SIZE),)

ifneq ($(BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE),)

$(error Should not define BOARD_PRODUCTIMAGE_PARTITION_SIZE and \
@@ -965,7 +972,7 @@ $(foreach group,$(call to-upper,$(BOARD_SUPER_PARTITION_GROUPS)), \ 
)



# BOARD_*_PARTITION_LIST: a list of the following tokens

valid_super_partition_list := system vendor product system_ext odm

valid_super_partition_list := system vendor product system_ext odm vendor_dlkm

$(foreach group,$(call to-upper,$(BOARD_SUPER_PARTITION_GROUPS)), \

    $(if $(filter-out $(valid_super_partition_list),$(BOARD_$(group)_PARTITION_LIST)), \

        $(error BOARD_$(group)_PARTITION_LIST contains invalid partition name \

core/envsetup.mk

+36 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ _vendor_path_placeholder := ||VENDOR-PATH-PH|| 
_product_path_placeholder := ||PRODUCT-PATH-PH||

_system_ext_path_placeholder := ||SYSTEM_EXT-PATH-PH||

_odm_path_placeholder := ||ODM-PATH-PH||

_vendor_dlkm_path_placeholder := ||VENDOR_DLKM-PATH-PH||

TARGET_COPY_OUT_VENDOR := $(_vendor_path_placeholder)

TARGET_COPY_OUT_VENDOR_RAMDISK := vendor-ramdisk

TARGET_COPY_OUT_PRODUCT := $(_product_path_placeholder)
@@ -261,6 +262,7 @@ TARGET_COPY_OUT_PRODUCT := $(_product_path_placeholder) 
TARGET_COPY_OUT_PRODUCT_SERVICES := $(_product_path_placeholder)

TARGET_COPY_OUT_SYSTEM_EXT := $(_system_ext_path_placeholder)

TARGET_COPY_OUT_ODM := $(_odm_path_placeholder)

TARGET_COPY_OUT_VENDOR_DLKM := $(_vendor_dlkm_path_placeholder)



# Returns the non-sanitized version of the path provided in $1.

define get_non_asan_path
@@ -719,6 +721,40 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_APPS_PRIVILEGED := $(TARGET_OUT_ODM_ 
  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_APPS \

  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_APPS_PRIVILEGED



TARGET_OUT_VENDOR_DLKM := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR_DLKM)



TARGET_OUT_VENDOR_DLKM_ETC := $(TARGET_OUT_VENDOR_DLKM)/etc

.KATI_READONLY := \

  TARGET_OUT_VENDOR_DLKM_ETC



# Unlike other partitions, vendor_dlkm should only contain kernel modules.

TARGET_OUT_VENDOR_DLKM_EXECUTABLES :=

TARGET_OUT_VENDOR_DLKM_OPTIONAL_EXECUTABLES :=

TARGET_OUT_VENDOR_DLKM_SHARED_LIBRARIES :=

TARGET_OUT_VENDOR_DLKM_RENDERSCRIPT_BITCODE :=

TARGET_OUT_VENDOR_DLKM_JAVA_LIBRARIES :=

TARGET_OUT_VENDOR_DLKM_APPS :=

TARGET_OUT_VENDOR_DLKM_APPS_PRIVILEGED :=

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_DLKM_EXECUTABLES :=

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_DLKM_SHARED_LIBRARIES :=

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_DLKM_RENDERSCRIPT_BITCODE :=

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_DLKM_APPS :=

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_DLKM_APPS_PRIVILEGED :=

$(KATI_obsolete_var \

    TARGET_OUT_VENDOR_DLKM_EXECUTABLES \

    TARGET_OUT_VENDOR_DLKM_OPTIONAL_EXECUTABLES \

    TARGET_OUT_VENDOR_DLKM_SHARED_LIBRARIES \

    TARGET_OUT_VENDOR_DLKM_RENDERSCRIPT_BITCODE \

    TARGET_OUT_VENDOR_DLKM_JAVA_LIBRARIES \

    TARGET_OUT_VENDOR_DLKM_APPS \

    TARGET_OUT_VENDOR_DLKM_APPS_PRIVILEGED \

    $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_DLKM_EXECUTABLES \

    $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_DLKM_SHARED_LIBRARIES \

    $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_DLKM_RENDERSCRIPT_BITCODE \

    $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_DLKM_APPS \

    $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_DLKM_APPS_PRIVILEGED \

    , vendor_dlkm should not contain any executables, libraries, or apps)



TARGET_OUT_PRODUCT := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_PRODUCT)

TARGET_OUT_PRODUCT_EXECUTABLES := $(TARGET_OUT_PRODUCT)/bin

.KATI_READONLY := TARGET_OUT_PRODUCT

core/main.mk

+10 −1
Original line number Diff line number Diff line
@@ -1141,7 +1141,8 @@ define resolve-product-relative-paths 
    $(subst $(_product_path_placeholder),$(TARGET_COPY_OUT_PRODUCT),\

      $(subst $(_system_ext_path_placeholder),$(TARGET_COPY_OUT_SYSTEM_EXT),\

        $(subst $(_odm_path_placeholder),$(TARGET_COPY_OUT_ODM),\

          $(foreach p,$(1),$(call append-path,$(PRODUCT_OUT),$(p)$(2)))))))

          $(subst $(_vendor_dlkm_path_placeholder),$(TARGET_COPY_OUT_VENDOR_DLKM),\

            $(foreach p,$(1),$(call append-path,$(PRODUCT_OUT),$(p)$(2))))))))

endef



# Returns modules included automatically as a result of certain BoardConfig
@@ -1519,6 +1520,9 @@ systemextimage: $(INSTALLED_SYSTEM_EXTIMAGE_TARGET) 
.PHONY: odmimage

odmimage: $(INSTALLED_ODMIMAGE_TARGET)



.PHONY: vendor_dlkmimage

vendor_dlkmimage: $(INSTALLED_VENDOR_DLKMIMAGE_TARGET)



.PHONY: systemotherimage

systemotherimage: $(INSTALLED_SYSTEMOTHERIMAGE_TARGET)
@@ -1556,6 +1560,7 @@ droidcore: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \ 
    $(INSTALLED_VENDOR_DEBUG_RAMDISK_TARGET) \

    $(INSTALLED_VENDOR_DEBUG_BOOTIMAGE_TARGET) \

    $(INSTALLED_ODMIMAGE_TARGET) \

    $(INSTALLED_VENDOR_DLKMIMAGE_TARGET) \

    $(INSTALLED_SUPERIMAGE_EMPTY_TARGET) \

    $(INSTALLED_PRODUCTIMAGE_TARGET) \

    $(INSTALLED_SYSTEMOTHERIMAGE_TARGET) \
@@ -1565,6 +1570,8 @@ droidcore: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \ 
    $(INSTALLED_FILES_JSON_VENDOR) \

    $(INSTALLED_FILES_FILE_ODM) \

    $(INSTALLED_FILES_JSON_ODM) \

    $(INSTALLED_FILES_FILE_VENDOR_DLKM) \

    $(INSTALLED_FILES_JSON_VENDOR_DLKM) \

    $(INSTALLED_FILES_FILE_PRODUCT) \

    $(INSTALLED_FILES_JSON_PRODUCT) \

    $(INSTALLED_FILES_FILE_SYSTEM_EXT) \
@@ -1660,6 +1667,8 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED)) 
    $(INSTALLED_FILES_JSON_VENDOR) \

    $(INSTALLED_FILES_FILE_ODM) \

    $(INSTALLED_FILES_JSON_ODM) \

    $(INSTALLED_FILES_FILE_VENDOR_DLKM) \

    $(INSTALLED_FILES_JSON_VENDOR_DLKM) \

    $(INSTALLED_FILES_FILE_PRODUCT) \

    $(INSTALLED_FILES_JSON_PRODUCT) \

    $(INSTALLED_FILES_FILE_SYSTEM_EXT) \