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

Commit 8b3a0e9e authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 QPR1 

Merged-In: I3810ff367d86e26e3a29210caa248867cca31cf0
Bug: 315507370
Change-Id: Ie16a18d43d04b55670bab2c9a0979a2696ed201a
parents 60eeb857 c64fa2e2

core/android_soong_config_vars.mk

+2 −2
Original line number Diff line number Diff line
@@ -72,9 +72,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.

  #

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
@@ -44,6 +44,7 @@ PRODUCT_PACKAGES += \ 
    CaptivePortalLogin \

    CertInstaller \

    CredentialManager \

    DeviceAsWebcam \

    DocumentsUI \

    DownloadProviderUi \

    EasterEgg \