aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-05-18 18:49:29 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-05-18 18:49:29 +0000
commit1e0cb58c6a5393af91f4f35d8d0e90aa2c297823 (patch)
treed3cec22ce8ac463f7c4ae0088070f491ff6ab5ee
parent3f1e5ab04d205f954f903b70cd42531fc8ba131a (diff)
parent76f9e63c5142c19a86cc700c5fa369eeb89b850c (diff)
downloadbuild-1e0cb58c6a5393af91f4f35d8d0e90aa2c297823.tar.gz
Snap for 8610054 from 76f9e63c5142c19a86cc700c5fa369eeb89b850c to tm-frc-odp-release
Change-Id: Ica29f6f05e8ef3f19935bb92a4dbbfd2e257e1fc
-rw-r--r--core/version_defaults.mk2
-rw-r--r--target/product/base_system.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index fede388be0..cce80b5e64 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -103,7 +103,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 := 2022-06-05
+ PLATFORM_SECURITY_PATCH := 2022-07-05
endif
include $(BUILD_SYSTEM)/version_util.mk
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index f2bb7517a2..998327e9a0 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -224,7 +224,7 @@ PRODUCT_PACKAGES += \
mtpd \
ndc \
netd \
- NetworkStackNext \
+ NetworkStack \
odsign \
org.apache.http.legacy \
otacerts \