diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-25 23:00:30 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-25 23:45:59 +0000 |
| commit | b4b6802b97aee8fac90b9617a0a68b51a80714d9 (patch) | |
| tree | 59a51813abf6fb29ed6b5cf110aa05c3eb47fe66 | |
| parent | 16087ac9c78acc778f33f62606d53fbac9e43560 (diff) | |
| parent | 605819e16897a543e2b8b089e27cc021f845ab91 (diff) | |
| download | build-b4b6802b97aee8fac90b9617a0a68b51a80714d9.tar.gz | |
Make change and version bump to UD1A.230726.001
Snap for 10559240 from 605819e16897a543e2b8b089e27cc021f845ab91 to udc-d1-release
Change-Id: I12687c93a51b964865012113303e31f40acf19d4
| -rw-r--r-- | core/android_soong_config_vars.mk | 4 | ||||
| -rw-r--r-- | core/build_id.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 140acf0f16..6bac52b5ee 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -87,9 +87,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. # diff --git a/core/build_id.mk b/core/build_id.mk index 75d7006849..f042c11bf5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=UD1A.230725.001 +BUILD_ID=UD1A.230726.001 |