commit 14a82dab15b860330d534fb2f6186acd5254d158
author Jihoon Kang <jihoonkang@google.com> Fri Dec 08 09:48:13 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 08 09:48:13 2023 +0000
tree 154bd00d8c29f6575990f3330fc167b7f8ce6529
parent f388a25f97d2b9821a99e8293b2e94d80e1205a6
parent a95f2b230cbf68b5b373c649ce11b8c2f231b97d

Merge "Add new dump format map in aconfig" into main

core/version_util.mk

diff --git a/core/version_util.mk b/core/version_util.mk
index dfa0277..103b64e 100644
--- a/core/version_util.mk
+++ b/core/version_util.mk
@@ -100,7 +100,7 @@
 PLATFORM_VERSION_KNOWN_CODENAMES := \
 Base Base11 Cupcake Donut Eclair Eclair01 EclairMr1 Froyo Gingerbread GingerbreadMr1 \
 Honeycomb HoneycombMr1 HoneycombMr2 IceCreamSandwich IceCreamSandwichMr1 \
-JellyBean JellyBeanMr1 JellyBeanMr2 Kitkat KitkatWatch Lollipop LollipopMr1 M N NMr1 O OMr1 P \
+JellyBean JellyBeanMr1 JellyBeanMr2 Kitkat KitkatWatch L Lollipop LollipopMr1 M N NMr1 O OMr1 P \
 Q R S Sv2 Tiramisu UpsideDownCake VanillaIceCream
 
 # Convert from space separated list to comma separated

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 4226ef6..098ed27 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -126,7 +126,6 @@
     IntentResolver \
     ip \
     iptables \
-    ip-up-vpn \
     javax.obex \
     keystore2 \
     credstore \
@@ -224,7 +223,6 @@
     mkfs.erofs \
     monkey \
     mtectrl \
-    mtpd \
     ndc \
     netd \
     NetworkStack \
@@ -238,13 +236,11 @@
     ping6 \
     platform.xml \
     pm \
-    pppd \
     preinstalled-packages-asl-files.xml \
     preinstalled-packages-platform.xml \
     printflags \
     privapp-permissions-platform.xml \
     prng_seeder \
-    racoon \
     recovery-persist \
     resize2fs \
     rss_hwm_reset \