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

Commit 63d3835f authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge changes Ib2a4a208,Ic8235912 

* changes:
  Set allow list for generic ramdisk
  Add a "relaxed" mode for require-artifacts-in-path
parents 2bbb6c9e e51c7e8a

core/artifact_path_requirements.mk

+3 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,9 @@ $(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\ 
    $(makefile) produces files outside its artifact path requirement. \

    $(makefile) produces files outside its artifact path requirement. \

    Allowed paths are $(subst $(space),$(comma)$(space),$(addsuffix *,$(requirements)))) \

    Allowed paths are $(subst $(space),$(comma)$(space),$(addsuffix *,$(requirements)))) \

  $(eval unused_allowed := $(filter-out $(files),$(allowed_patterns))) \

  $(eval unused_allowed := $(filter-out $(files),$(allowed_patterns))) \

  $(if $(PRODUCTS.$(makefile).ARTIFACT_PATH_REQUIREMENT_IS_RELAXED),, \

    $(call maybe-print-list-and-error,$(unused_allowed),$(makefile) includes redundant allowed entries in its artifact path requirement.) \

    $(call maybe-print-list-and-error,$(unused_allowed),$(makefile) includes redundant allowed entries in its artifact path requirement.) \

  ) \

  $(eval ### Optionally verify that nothing else produces files inside this artifact path requirement.) \

  $(eval ### Optionally verify that nothing else produces files inside this artifact path requirement.) \

  $(eval extra_files := $(filter-out $(files) $(HOST_OUT)/%,$(product_target_FILES))) \

  $(eval extra_files := $(filter-out $(files) $(HOST_OUT)/%,$(product_target_FILES))) \

  $(eval files_in_requirement := $(filter $(path_patterns),$(extra_files))) \

  $(eval files_in_requirement := $(filter $(path_patterns),$(extra_files))) \

core/product.mk

+7 −0
Original line number Original line Diff line number Diff line
@@ -463,6 +463,13 @@ define require-artifacts-in-path 
    $(sort $(ARTIFACT_PATH_REQUIREMENT_PRODUCTS) $(current_mk)))

    $(sort $(ARTIFACT_PATH_REQUIREMENT_PRODUCTS) $(current_mk)))

endef

endef





# Like require-artifacts-in-path, but does not require all allow-list entries to

# have an effect.

define require-artifacts-in-path-relaxed

  $(require-artifacts-in-path) \

  $(eval PRODUCTS.$(current_mk).ARTIFACT_PATH_REQUIREMENT_IS_RELAXED := true)

endef



# Makes including non-existent modules in PRODUCT_PACKAGES an error.

# Makes including non-existent modules in PRODUCT_PACKAGES an error.

# $(1): list of non-existent modules to allow.

# $(1): list of non-existent modules to allow.

define enforce-product-packages-exist

define enforce-product-packages-exist

target/board/generic_arm64/device.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -32,3 +32,5 @@ endif 




PRODUCT_BUILD_VENDOR_BOOT_IMAGE := false

PRODUCT_BUILD_VENDOR_BOOT_IMAGE := false

PRODUCT_BUILD_RECOVERY_IMAGE := false

PRODUCT_BUILD_RECOVERY_IMAGE := false



$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)

target/product/generic_ramdisk.mk

0 → 100644
+42 −0
Original line number Original line Diff line number Diff line 
#

# Copyright (C) 2020 The Android Open Source 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 makefile installs contents of the generic ramdisk.

# Inherit from this makefile to declare that this product uses generic ramdisk.

# This makefile checks that other makefiles must not install things to the

# ramdisk.



PRODUCT_NAME := generic_ramdisk

PRODUCT_BRAND := generic



# Ramdisk

PRODUCT_PACKAGES += \

    init_first_stage \



# Debug ramdisk

PRODUCT_PACKAGES += \

    userdebug_plat_sepolicy.cil \



_my_paths := \

    $(TARGET_COPY_OUT_RAMDISK) \

    $(TARGET_COPY_OUT_DEBUG_RAMDISK) \

    system/usr/share/zoneinfo/tz_version \

    system/usr/share/zoneinfo/tzdata \



# We use the "relaxed" version here because tzdata / tz_version is only produced

# by this makefile on a subset of devices.

# TODO: remove this

$(call require-artifacts-in-path-relaxed, $(_my_paths), )