Merge "Add defaults target for shared linking" into main (ad85a2a1) · Commits · e / os / android_build

target/product/base_system.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -512,3 +512,4 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/build_variables.mk)
		$(call inherit-product,$(SRC_TARGET_DIR)/product/updatable_apex.mk)

		$(call soong_config_set, bionic, large_system_property_node, $(RELEASE_LARGE_SYSTEM_PROPERTY_NODE))
		$(call soong_config_set, Aconfig, read_from_new_storage, $(RELEASE_READ_FROM_NEW_STORAGE))

+27 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,33 @@ cc_library {
		afdo: true,
		}

		soong_config_module_type {
		name: "aconfig_lib_cc_shared_link_defaults",
		module_type: "cc_defaults",
		config_namespace: "Aconfig",
		bool_variables: [
		"read_from_new_storage",
		],
		properties: [
		"shared_libs",
		],
		}

		soong_config_bool_variable {
		name: "read_from_new_storage",
		}

		aconfig_lib_cc_shared_link_defaults {
		name: "aconfig_lib_cc_shared_link.defaults",
		soong_config_variables: {
		read_from_new_storage: {
		shared_libs: [
		"libaconfig_storage_read_api_cc",
		],
		},
		},
		}

		cc_defaults {
		name: "aconfig_lib_cc_static_link.defaults",
		shared_libs: [