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

Commit 04837c61 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Build build_flags.json in soong" into main

parents 27d977e4 0949453d

core/packaging/flags.mk

+0 −44
Original line number Diff line number Diff line
@@ -21,50 +21,6 @@ 
_FLAG_PARTITIONS := product system system_ext vendor





# -----------------------------------------------------------------

# Release Config Flags



# Create a summary file of build flags for each partition

# $(1): built build flags json file

# $(2): installed build flags json file

# $(3): flag names

define generate-partition-build-flag-file

$(eval $(strip $(1)): PRIVATE_OUT := $(strip $(1)))

$(eval $(strip $(1)): PRIVATE_FLAG_NAMES := $(strip $(3)))

$(strip $(1)):

	mkdir -p $$(dir $$(PRIVATE_OUT))

	echo '{' > $$(PRIVATE_OUT)

	echo '"flags": [' >> $$(PRIVATE_OUT)

	$$(foreach flag, $$(PRIVATE_FLAG_NAMES), \

		( \

			printf '  { "name": "%s", "value": "%s", ' \

					'$$(flag)' \

					'$$(_ALL_RELEASE_FLAGS.$$(flag).VALUE)' \

					; \

			printf '"set": "%s", "default": "%s", "declared": "%s" }' \

					'$$(_ALL_RELEASE_FLAGS.$$(flag).SET_IN)' \

					'$$(_ALL_RELEASE_FLAGS.$$(flag).DEFAULT)' \

					'$$(_ALL_RELEASE_FLAGS.$$(flag).DECLARED_IN)' \

					; \

			printf '$$(if $$(filter $$(lastword $$(PRIVATE_FLAG_NAMES)),$$(flag)),,$$(comma))\n' ; \

		) >> $$(PRIVATE_OUT) ; \

	)

	echo "]" >> $$(PRIVATE_OUT)

	echo "}" >> $$(PRIVATE_OUT)

$(call copy-one-file, $(1), $(2))

endef



$(foreach partition, $(_FLAG_PARTITIONS), \

	$(eval build_flag_summaries.$(partition) := $(PRODUCT_OUT)/$(partition)/etc/build_flags.json) \

	$(eval $(call generate-partition-build-flag-file, \

				$(TARGET_OUT_FLAGS)/$(partition)/build_flags.json, \

				$(build_flag_summaries.$(partition)), \

				$(_ALL_RELEASE_FLAGS.PARTITIONS.$(partition)) \

			) \

	) \

)





# -----------------------------------------------------------------

# Aconfig Flags

target/product/base_product.mk

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


# Base modules and settings for the product partition.

PRODUCT_PACKAGES += \

    build_flag_product \

    fs_config_dirs_product \

    fs_config_files_product \

    group_product \

target/product/base_system.mk

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ PRODUCT_PACKAGES += \ 
    bu \

    bugreport \

    bugreportz \

    build_flag_system \

    cgroups.json \

    charger \

    cmd \

target/product/base_system_ext.mk

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


# Base modules and settings for the system_ext partition.

PRODUCT_PACKAGES += \

    build_flag_system_ext \

    fs_config_dirs_system_ext \

    fs_config_files_system_ext \

    group_system_ext \

target/product/base_vendor.mk

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
PRODUCT_PACKAGES += \

    adbd.recovery \

    android.hardware.health@2.0-impl-default.recovery \

    build_flag_vendor \

    cgroups.recovery.json \

    charger.recovery \

    init_second_stage.recovery \