diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-17 21:05:29 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-17 21:05:29 +0000 |
| commit | 1c644d4ef97841d0691273f258a5a5dc756a99e3 (patch) | |
| tree | d3cec22ce8ac463f7c4ae0088070f491ff6ab5ee | |
| parent | 7256455d4c27307014bc622893706b8429b78797 (diff) | |
| parent | 7c87090ec47e79c317b1a5d1d2232976d1920ea5 (diff) | |
| download | build-1c644d4ef97841d0691273f258a5a5dc756a99e3.tar.gz | |
Snap for 8604704 from 7c87090ec47e79c317b1a5d1d2232976d1920ea5 to tm-frc-adbd-release
Change-Id: I5ea34db2bdbb5ab3b38f9331d3ef56c977171a83
| -rw-r--r-- | core/version_defaults.mk | 2 | ||||
| -rw-r--r-- | target/product/base_system.mk | 3 | ||||
| -rw-r--r-- | target/product/gsi/33.txt | 2 | ||||
| -rw-r--r-- | target/product/gsi/current.txt | 2 |
4 files changed, 4 insertions, 5 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 83ca2248ae..998327e9a0 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -54,7 +54,6 @@ PRODUCT_PACKAGES += \ com.android.appsearch \ com.android.bluetooth \ com.android.conscrypt \ - com.android.cronet \ com.android.extservices \ com.android.i18n \ com.android.ipsec \ @@ -225,7 +224,7 @@ PRODUCT_PACKAGES += \ mtpd \ ndc \ netd \ - NetworkStackNext \ + NetworkStack \ odsign \ org.apache.http.legacy \ otacerts \ diff --git a/target/product/gsi/33.txt b/target/product/gsi/33.txt index 22a2547ee0..03a143d02c 100644 --- a/target/product/gsi/33.txt +++ b/target/product/gsi/33.txt @@ -62,7 +62,7 @@ VNDK-core: android.hardware.audio.common-V1-ndk.so VNDK-core: android.hardware.audio.common@2.0.so VNDK-core: android.hardware.authsecret-V1-ndk.so VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk.so -VNDK-core: android.hardware.bluetooth.audio-V1-ndk.so +VNDK-core: android.hardware.bluetooth.audio-V2-ndk.so VNDK-core: android.hardware.camera.common-V1-ndk.so VNDK-core: android.hardware.camera.device-V1-ndk.so VNDK-core: android.hardware.camera.metadata-V1-ndk.so diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt index 22a2547ee0..03a143d02c 100644 --- a/target/product/gsi/current.txt +++ b/target/product/gsi/current.txt @@ -62,7 +62,7 @@ VNDK-core: android.hardware.audio.common-V1-ndk.so VNDK-core: android.hardware.audio.common@2.0.so VNDK-core: android.hardware.authsecret-V1-ndk.so VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk.so -VNDK-core: android.hardware.bluetooth.audio-V1-ndk.so +VNDK-core: android.hardware.bluetooth.audio-V2-ndk.so VNDK-core: android.hardware.camera.common-V1-ndk.so VNDK-core: android.hardware.camera.device-V1-ndk.so VNDK-core: android.hardware.camera.metadata-V1-ndk.so |