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

Commit 10660b95 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'v1-t' into 'v2.0-t' 

Merge v1-t into v2.0-t

See merge request !181
parents f695e69e 2126d447

build/tasks/kernel.mk

+10 −2
Original line number Original line Diff line number Diff line
@@ -286,6 +286,14 @@ define make-external-module-target 
$(PATH_OVERRIDE) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_EXT_MODULE_ROOT)/$(1) M=$(2)/$(1) KERNEL_SRC=$(BUILD_TOP)/$(KERNEL_SRC) OUT_DIR=$(KERNEL_BUILD_OUT_PREFIX)$(KERNEL_OUT) O=$(KERNEL_BUILD_OUT_PREFIX)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(3)

$(PATH_OVERRIDE) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_EXT_MODULE_ROOT)/$(1) M=$(2)/$(1) KERNEL_SRC=$(BUILD_TOP)/$(KERNEL_SRC) OUT_DIR=$(KERNEL_BUILD_OUT_PREFIX)$(KERNEL_OUT) O=$(KERNEL_BUILD_OUT_PREFIX)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(3)

endef

endef





# Make an external module target using kbuild

# $(1): module name

# $(2): module root path relative to kernel source

# $(3): target to build (eg. modules_install)

define make-kbuild-module-target

$(PATH_OVERRIDE) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(BUILD_TOP)/$(KERNEL_SRC) M=$(2)/$(1) O=$(KERNEL_BUILD_OUT_PREFIX)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_CLANG_TRIPLE) $(KERNEL_CC) $(3)

endef



# Generate kernel .config from a given defconfig

# Generate kernel .config from a given defconfig

# $(1): Output path (The value passed to O=)

# $(1): Output path (The value passed to O=)

# $(2): The defconfig to process (just the filename, no need for full path to file)

# $(2): The defconfig to process (just the filename, no need for full path to file)
@@ -454,8 +462,8 @@ $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_CONFIG) $(DEPMOD) $(DTC) 
				rpath=$$(python3 -c 'import os,sys;print(os.path.relpath(*(sys.argv[1:])))' $(TARGET_KERNEL_EXT_MODULE_ROOT) $(KERNEL_SRC)); \

				rpath=$$(python3 -c 'import os,sys;print(os.path.relpath(*(sys.argv[1:])))' $(TARGET_KERNEL_EXT_MODULE_ROOT) $(KERNEL_SRC)); \

				$(foreach p, $(TARGET_KERNEL_EXT_MODULES),\

				$(foreach p, $(TARGET_KERNEL_EXT_MODULES),\

					$$pwd; \

					$$pwd; \

					$(call make-external-module-target,$(p),$$rpath,) || exit "$$?";  \

					$(call $(if $(filter $(word 2,$(subst :, ,$(p))),kbuild),make-kbuild-module-target,make-external-module-target),$(word 1,$(subst :, ,$(p))),$$rpath,) || exit "$$?";  \

					$(call make-external-module-target,$(p),$$rpath,INSTALL_MOD_PATH=$(MODULES_INTERMEDIATES) INSTALL_MOD_STRIP=1 KERNEL_UAPI_HEADERS_DIR=$(KERNEL_OUT) modules_install)) || exit "$$?"; \

					$(call $(if $(filter $(word 2,$(subst :, ,$(p))),kbuild),make-kbuild-module-target,make-external-module-target),$(word 1,$(subst :, ,$(p))),$$rpath,INSTALL_MOD_PATH=$(MODULES_INTERMEDIATES) INSTALL_MOD_STRIP=1 KERNEL_UAPI_HEADERS_DIR=$(KERNEL_OUT) modules_install)) || exit "$$?"; \

			) \

			) \

			kernel_release=$$(cat $(KERNEL_RELEASE)) \

			kernel_release=$$(cat $(KERNEL_RELEASE)) \

			kernel_modules_dir=$(MODULES_INTERMEDIATES)/lib/modules/$$kernel_release \

			kernel_modules_dir=$(MODULES_INTERMEDIATES)/lib/modules/$$kernel_release \

overlay/common/packages/apps/Dialer/java/com/android/voicemail/impl/res/xml/vvm_config.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -22,12 +22,12 @@ 
    </pbundle_as_map>

    </pbundle_as_map>

    <pbundle_as_map>

    <pbundle_as_map>

        <string-array name="mccmnc">

        <string-array name="mccmnc">

            <item value="20826?gid1=NRJ1" />

            <item value="20826" />

        </string-array>

        </string-array>

        <string name="feature_flag_name">vvm_carrier_flag_el_telecom</string>

        <string name="feature_flag_name">vvm_carrier_flag_el_telecom</string>

        <int name="vvm_port_number_int" value="5499" />

        <int name="vvm_port_number_int" value="5499" />

        <string name="vvm_destination_number_string">8860</string>

        <string name="vvm_destination_number_string">8860</string>

        <string name="vvm_type_string">vvm_type_omtp_1_3</string>

        <string name="vvm_type_string">vvm_type_omtp</string>

    </pbundle_as_map>

    </pbundle_as_map>

    <pbundle_as_map>

    <pbundle_as_map>

        <string-array name="mccmnc">

        <string-array name="mccmnc">
@@ -440,7 +440,7 @@ 
        <int name="vvm_port_number_int" value="0" />

        <int name="vvm_port_number_int" value="0" />

        <string name="vvm_destination_number_string">9966</string>

        <string name="vvm_destination_number_string">9966</string>

        <int name="vvm_application_port_number_int" value="5499" />

        <int name="vvm_application_port_number_int" value="5499" />

        <string name="vvm_type_string">vvm_type_omtp_1_2</string>

        <string name="vvm_type_string">vvm_type_omtp</string>

        <boolean name="vvm_cellular_data_required_bool" value="true" />

        <boolean name="vvm_cellular_data_required_bool" value="true" />

        <string-array name="carrier_vvm_package_name_string_array">

        <string-array name="carrier_vvm_package_name_string_array">

            <item value="com.cellcom.cellcomvisualvoicemail" />

            <item value="com.cellcom.cellcomvisualvoicemail" />