diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-06 15:13:34 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-06 15:55:34 +0000 |
| commit | 3fab185d98c73baf9921a274cf8ecaad9b45776b (patch) | |
| tree | 663e7696bac23467719bc125e4a6d640e2a008ce | |
| parent | 1802044bf0b2a8bc04cc34cdab97a8f29b0be866 (diff) | |
| parent | e30a7397580405e509a60c4aa257c3e6731f1e0f (diff) | |
| download | build-3fab185d98c73baf9921a274cf8ecaad9b45776b.tar.gz | |
Make change and version bump to aml_con_341110000 for mainline module file: Noneaml_con_341110000
Snap for 10768428 from e30a7397580405e509a60c4aa257c3e6731f1e0f to mainline-conscrypt-release
Change-Id: Ifaf212e3203cee4e282c3a923041b507e4682900
| -rw-r--r-- | core/Makefile | 8 | ||||
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/core/Makefile b/core/Makefile index 80abd1936b..38dc37b260 100644 --- a/core/Makefile +++ b/core/Makefile @@ -6588,6 +6588,14 @@ $(JACOCO_REPORT_CLASSES_ALL) : ifeq (,$(TARGET_BUILD_UNBUNDLED)) $(JACOCO_REPORT_CLASSES_ALL): $(INTERNAL_ALLIMAGES_FILES) endif + +# This is not ideal, but it is difficult to correctly figure out the actual jacoco report +# jars we need to add here as dependencies, so we add the device-tests as a dependency when +# the env variable is set and this should guarantee thaat all the jacoco report jars are ready +# when we package the final report jar here. +ifeq ($(JACOCO_PACKAGING_INCLUDE_DEVICE_TESTS),true) + $(JACOCO_REPORT_CLASSES_ALL): $(COMPATIBILITY.device-tests.FILES) +endif endif # EMMA_INSTRUMENT=true diff --git a/core/build_id.mk b/core/build_id.mk index 20aa53c03e..e4f167a1a8 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=341010000 +BUILD_ID=341110000 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 5470a471e9..77957d2bd4 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -79,7 +79,7 @@ endif .KATI_READONLY := PLATFORM_SDK_VERSION # This is the sdk extension version of this tree. -PLATFORM_SDK_EXTENSION_VERSION := 9 +PLATFORM_SDK_EXTENSION_VERSION := 10 .KATI_READONLY := PLATFORM_SDK_EXTENSION_VERSION # This is the sdk extension version that PLATFORM_SDK_VERSION ships with. @@ -104,7 +104,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-09-05 + PLATFORM_SECURITY_PATCH := 2023-10-05 endif include $(BUILD_SYSTEM)/version_util.mk |