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

Commit 997d2276 authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge changes from topic "odm_dlkm" 

* changes:
  Create $OUT/{vendor,odm}/lib before symlink modules
  Add odm_dlkm/etc/build.prop
  Install ODM dlkm to appropriate place and symlink
  Add notice files for odm_dlkm
  Add odm_dlkm partition.
parents 9aa278a1 1e6d2178

core/Makefile

+199 −16

File changed.

Preview size limit exceeded, changes collapsed.

core/board_config.mk

+38 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ _board_strip_readonly_list += \ 
  BOARD_ODMIMAGE_FILE_SYSTEM_TYPE \

  BOARD_VENDOR_DLKMIMAGE_PARTITION_SIZE \

  BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE \

  BOARD_ODM_DLKMIMAGE_PARTITION_SIZE \

  BOARD_ODM_DLKMIMAGE_FILE_SYSTEM_TYPE \



# Logical partitions related variables.

_dynamic_partitions_var_list += \
@@ -81,6 +83,7 @@ _dynamic_partitions_var_list += \ 
  BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_VENDOR_DLKMIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_ODM_DLKMIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_SUPER_PARTITION_SIZE \
@@ -582,6 +585,41 @@ ifdef BOARD_PREBUILT_ODMIMAGE 
endif

.KATI_READONLY := BUILDING_ODM_IMAGE





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

# Now we can substitute with the real value of TARGET_COPY_OUT_ODM_DLKM

ifeq ($(TARGET_COPY_OUT_ODM_DLKM),$(_odm_dlkm_path_placeholder))

  TARGET_COPY_OUT_ODM_DLKM := $(TARGET_COPY_OUT_VENDOR)/odm_dlkm

else ifeq ($(filter odm_dlkm system/vendor/odm_dlkm vendor/odm_dlkm,$(TARGET_COPY_OUT_ODM_DLKM)),)

  $(error TARGET_COPY_OUT_ODM_DLKM must be either 'odm_dlkm', 'system/vendor/odm_dlkm' or 'vendor/odm_dlkm', seeing '$(TARGET_COPY_OUT_ODM_DLKM)'.)

endif

PRODUCT_COPY_FILES := $(subst $(_odm_dlkm_path_placeholder),$(TARGET_COPY_OUT_ODM_DLKM),$(PRODUCT_COPY_FILES))



BOARD_USES_ODM_DLKMIMAGE :=

ifdef BOARD_PREBUILT_ODM_DLKMIMAGE

  BOARD_USES_ODM_DLKMIMAGE := true

endif

ifdef BOARD_ODM_DLKMIMAGE_FILE_SYSTEM_TYPE

  BOARD_USES_ODM_DLKMIMAGE := true

endif

$(call check_image_config,odm_dlkm)



BUILDING_ODM_DLKM_IMAGE :=

ifeq ($(PRODUCT_BUILD_ODM_DLKM_IMAGE),)

  ifdef BOARD_ODM_DLKMIMAGE_FILE_SYSTEM_TYPE

    BUILDING_ODM_DLKM_IMAGE := true

  endif

else ifeq ($(PRODUCT_BUILD_ODM_DLKM_IMAGE),true)

  BUILDING_ODM_DLKM_IMAGE := true

  ifndef BOARD_ODM_DLKMIMAGE_FILE_SYSTEM_TYPE

    $(error PRODUCT_BUILD_ODM_DLKM_IMAGE set to true, but BOARD_ODM_DLKMIMAGE_FILE_SYSTEM_TYPE not defined)

  endif

endif

ifdef BOARD_PREBUILT_ODM_DLKMIMAGE

  BUILDING_ODM_DLKM_IMAGE :=

endif

.KATI_READONLY := BUILDING_ODM_DLKM_IMAGE



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

# Ensure consistency among TARGET_RECOVERY_UPDATER_LIBS, AB_OTA_UPDATER, and PRODUCT_OTA_FORCE_NON_AB_PACKAGE.

TARGET_RECOVERY_UPDATER_LIBS ?=

core/config.mk

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

endif



ifneq ($(BOARD_ODM_DLKMIMAGE_PARTITION_SIZE),)

ifneq ($(BOARD_ODM_DLKMIMAGE_PARTITION_RESERVED_SIZE),)

$(error Should not define BOARD_ODM_DLKMIMAGE_PARTITION_SIZE and \

    BOARD_ODM_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 \
@@ -972,7 +979,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 vendor_dlkm

valid_super_partition_list := system vendor product system_ext odm vendor_dlkm odm_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
@@ -254,6 +254,7 @@ _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||

_odm_dlkm_path_placeholder := ||ODM_DLKM-PATH-PH||

TARGET_COPY_OUT_VENDOR := $(_vendor_path_placeholder)

TARGET_COPY_OUT_VENDOR_RAMDISK := vendor-ramdisk

TARGET_COPY_OUT_PRODUCT := $(_product_path_placeholder)
@@ -263,6 +264,7 @@ 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)

TARGET_COPY_OUT_ODM_DLKM := $(_odm_dlkm_path_placeholder)



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

define get_non_asan_path
@@ -755,6 +757,40 @@ $(KATI_obsolete_var \ 
    $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_VENDOR_DLKM_APPS_PRIVILEGED \

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



TARGET_OUT_ODM_DLKM := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ODM_DLKM)



TARGET_OUT_ODM_DLKM_ETC := $(TARGET_OUT_ODM_DLKM)/etc

.KATI_READONLY := \

  TARGET_OUT_ODM_DLKM_ETC



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

TARGET_OUT_ODM_DLKM_EXECUTABLES :=

TARGET_OUT_ODM_DLKM_OPTIONAL_EXECUTABLES :=

TARGET_OUT_ODM_DLKM_SHARED_LIBRARIES :=

TARGET_OUT_ODM_DLKM_RENDERSCRIPT_BITCODE :=

TARGET_OUT_ODM_DLKM_JAVA_LIBRARIES :=

TARGET_OUT_ODM_DLKM_APPS :=

TARGET_OUT_ODM_DLKM_APPS_PRIVILEGED :=

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_DLKM_EXECUTABLES :=

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_DLKM_SHARED_LIBRARIES :=

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_DLKM_RENDERSCRIPT_BITCODE :=

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_DLKM_APPS :=

$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_DLKM_APPS_PRIVILEGED :=

$(KATI_obsolete_var \

    TARGET_OUT_ODM_DLKM_EXECUTABLES \

    TARGET_OUT_ODM_DLKM_OPTIONAL_EXECUTABLES \

    TARGET_OUT_ODM_DLKM_SHARED_LIBRARIES \

    TARGET_OUT_ODM_DLKM_RENDERSCRIPT_BITCODE \

    TARGET_OUT_ODM_DLKM_JAVA_LIBRARIES \

    TARGET_OUT_ODM_DLKM_APPS \

    TARGET_OUT_ODM_DLKM_APPS_PRIVILEGED \

    $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_DLKM_EXECUTABLES \

    $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_DLKM_SHARED_LIBRARIES \

    $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_DLKM_RENDERSCRIPT_BITCODE \

    $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_DLKM_APPS \

    $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_ODM_DLKM_APPS_PRIVILEGED \

    , odm_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
@@ -1142,7 +1142,8 @@ define resolve-product-relative-paths 
      $(subst $(_system_ext_path_placeholder),$(TARGET_COPY_OUT_SYSTEM_EXT),\

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

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

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

            $(subst $(_odm_dlkm_path_placeholder),$(TARGET_COPY_OUT_ODM_DLKM),\

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

endef



# Returns modules included automatically as a result of certain BoardConfig
@@ -1523,6 +1524,9 @@ odmimage: $(INSTALLED_ODMIMAGE_TARGET) 
.PHONY: vendor_dlkmimage

vendor_dlkmimage: $(INSTALLED_VENDOR_DLKMIMAGE_TARGET)



.PHONY: odm_dlkmimage

odm_dlkmimage: $(INSTALLED_ODM_DLKMIMAGE_TARGET)



.PHONY: systemotherimage

systemotherimage: $(INSTALLED_SYSTEMOTHERIMAGE_TARGET)
@@ -1569,6 +1573,7 @@ droidcore: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \ 
    $(INSTALLED_VENDOR_DEBUG_BOOTIMAGE_TARGET) \

    $(INSTALLED_ODMIMAGE_TARGET) \

    $(INSTALLED_VENDOR_DLKMIMAGE_TARGET) \

    $(INSTALLED_ODM_DLKMIMAGE_TARGET) \

    $(INSTALLED_SUPERIMAGE_EMPTY_TARGET) \

    $(INSTALLED_PRODUCTIMAGE_TARGET) \

    $(INSTALLED_SYSTEMOTHERIMAGE_TARGET) \
@@ -1580,6 +1585,8 @@ droidcore: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \ 
    $(INSTALLED_FILES_JSON_ODM) \

    $(INSTALLED_FILES_FILE_VENDOR_DLKM) \

    $(INSTALLED_FILES_JSON_VENDOR_DLKM) \

    $(INSTALLED_FILES_FILE_ODM_DLKM) \

    $(INSTALLED_FILES_JSON_ODM_DLKM) \

    $(INSTALLED_FILES_FILE_PRODUCT) \

    $(INSTALLED_FILES_JSON_PRODUCT) \

    $(INSTALLED_FILES_FILE_SYSTEM_EXT) \
@@ -1685,6 +1692,8 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED)) 
    $(INSTALLED_FILES_JSON_ODM) \

    $(INSTALLED_FILES_FILE_VENDOR_DLKM) \

    $(INSTALLED_FILES_JSON_VENDOR_DLKM) \

    $(INSTALLED_FILES_FILE_ODM_DLKM) \

    $(INSTALLED_FILES_JSON_ODM_DLKM) \

    $(INSTALLED_FILES_FILE_PRODUCT) \

    $(INSTALLED_FILES_JSON_PRODUCT) \

    $(INSTALLED_FILES_FILE_SYSTEM_EXT) \