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

Commit 688de9e5 authored by Xin Li's avatar Xin Li
Browse files

Merge 10952656 

Merged-In: I9d5b022abee730aa5f07a8cfa87bcae59572d653
Change-Id: I04447977fa3a0f621f3e9ea9b36e6b84c8646787
parents 6972c5f0 fe5fbedb

core/android_soong_config_vars.mk

+2 −2
Original line number Diff line number Diff line
@@ -71,9 +71,9 @@ endif 


ifneq (,$(MODULE_BUILD_FROM_SOURCE))

  # Keep an explicit setting.

else ifeq (,$(filter docs sdk win_sdk sdk_addon,$(MAKECMDGOALS))$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES)))

else ifeq (,$(filter docs sdk win_sdk sdk_addon,$(MAKECMDGOALS))$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES))$(findstring com.google.android.go.conscrypt,$(PRODUCT_PACKAGES)))

  # Prebuilt module SDKs require prebuilt modules to work, and currently

  # prebuilt modules are only provided for com.google.android.xxx. If we can't

  # prebuilt modules are only provided for com.google.android(.go)?.xxx. If we can't

  # find one of them in PRODUCT_PACKAGES then assume com.android.xxx are in use,

  # and disable prebuilt SDKs. In particular this applies to AOSP builds.

  #

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ ifndef PLATFORM_SECURITY_PATCH 
    #  It must be of the form "YYYY-MM-DD" on production devices.

    #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.

    #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.

    PLATFORM_SECURITY_PATCH := 2023-10-05

    PLATFORM_SECURITY_PATCH := 2023-12-05

endif



include $(BUILD_SYSTEM)/version_util.mk

target/product/aosp_product.mk

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

    PhotoTable \

    preinstalled-packages-platform-aosp-product.xml \

    ThemePicker \

    WallpaperPicker \



# Telephony:

target/product/handheld_system.mk

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

    CertInstaller \

    CredentialManager \

    DeviceAsWebcam \

    DocumentsUI \

    DownloadProviderUi \

    EasterEgg \