StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge Android 14 QPR1" into main

Browse Source
This commit is contained in:
Xin Li
2023-12-09 00:11:53 +00:00
committed by Gerrit Code Review
parent 60eeb8578b 8b3a0e9ec4
commit 4e1043bfde
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/android_soong_config_vars.mk
View File

@@ -72,9 +72,9 @@ endif
ifneq (,$(MODULE_BUILD_FROM_SOURCE)) ifneq (,$(MODULE_BUILD_FROM_SOURCE))
# Keep an explicit setting. # 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 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, # 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. # and disable prebuilt SDKs. In particular this applies to AOSP builds.
# #

1
target/product/aosp_product.mk
View File

@@ -33,6 +33,7 @@ PRODUCT_PACKAGES += \
messaging \ messaging \
PhotoTable \ PhotoTable \
preinstalled-packages-platform-aosp-product.xml \ preinstalled-packages-platform-aosp-product.xml \
ThemePicker \
WallpaperPicker \ WallpaperPicker \
# Telephony: # Telephony:

1
target/product/handheld_system.mk
View File

@@ -44,6 +44,7 @@ PRODUCT_PACKAGES += \
CaptivePortalLogin \ CaptivePortalLogin \
CertInstaller \ CertInstaller \
CredentialManager \ CredentialManager \
DeviceAsWebcam \
DocumentsUI \ DocumentsUI \
DownloadProviderUi \ DownloadProviderUi \
EasterEgg \ EasterEgg \