From e39307810e5d0ca381bcc159669ecd60867eaf1c Mon Sep 17 00:00:00 2001
From: Hyundo Moon <hdmoon@google.com>
Date: Fri, 18 Dec 2020 20:56:46 +0900
Subject: [PATCH 001/425] Add "service-media-s" into
 PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS

Bug: 175511943
Test: MediaCommunicationService can run.
      'adb shell service list' shows the service.
Change-Id: I16f0f5adab0c0d5d656cadc5dff7d6808c02649c
---
 target/product/media_system.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index 4573412b28..3c69c63400 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -58,6 +58,7 @@ PRODUCT_SYSTEM_SERVER_JARS := \
 # The values should be of the format <apex name>:<jar name>
 PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
     com.android.appsearch:service-appsearch \
+    com.android.media:service-media-s \
     com.android.permission:service-permission \
     com.android.ipsec:android.net.ipsec.ike \
     com.android.geotz:geotz \

From bc016b474f5db48c6bfb64c14052ebe84a32a52a Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 29 Jan 2021 21:55:55 +0000
Subject: [PATCH 002/425] Version bump to TP1A.210129.002 [core/build_id.mk]

Change-Id: Ie56aae4b7f70036d38f692381d0c69d51605a36a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 32bb7a3b8f..d088c58204 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=TP1A.210129.001
+BUILD_ID=TP1A.210129.002

From eca4890c5ae2f897710e0b029df1da98e8d97cbb Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 2 Feb 2021 04:53:26 +0000
Subject: [PATCH 003/425] Version bump to TP1A.210202.002 [core/build_id.mk]

Change-Id: Ied3e128380a788250b765d50b5648f2266d55ded
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index bc3cd452df..68d9c8feec 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=TP1A.210202.001
+BUILD_ID=TP1A.210202.002

From de7bccd0041ed13a3730d0b271081bb3a17b7bf0 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 2 Feb 2021 19:09:19 +0000
Subject: [PATCH 004/425] Version bump to TP1A.210202.003 [core/build_id.mk]

Change-Id: I129d8c09ab20fae3179c608628e529fbe54c6dbe
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 68d9c8feec..a9cf478bee 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=TP1A.210202.002
+BUILD_ID=TP1A.210202.003

From 3885fe56c4fa03917a63f43864c8fdb3d55b0d0a Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 3 Feb 2021 18:33:16 +0000
Subject: [PATCH 005/425] Version bump to TP1A.210203.002 [core/build_id.mk]

Change-Id: I4bda19aedf102448a5b8e8d9e41c7af89e7778a7
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 380d001810..ac5c26fd0f 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=TP1A.210203.001
+BUILD_ID=TP1A.210203.002

From b5594e6040e2411ec8fc676226500bcd5ae9e815 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 5 Feb 2021 01:25:22 +0000
Subject: [PATCH 006/425] Version bump to TP1A.210204.002 [core/build_id.mk]

Change-Id: Ifa2bd18e63fa4a0fbc2d79f8fb102c618006ae17
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 3d74e2a954..9bdeff1709 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=TP1A.210204.001
+BUILD_ID=TP1A.210204.002

From bd2b92dafd5ca08790ab895097e174ec9ae24b3c Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 5 Feb 2021 23:19:09 +0000
Subject: [PATCH 007/425] Version bump to TP1A.210205.002 [core/build_id.mk]

Change-Id: I00d6ce1363e7f1d8de10c9c04f6e6cab2ef486ff
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index f443a2a3a6..ca3d8c312a 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=TP1A.210205.001
+BUILD_ID=TP1A.210205.002

From efce530e681ec368b82d0ee94621f398b6c94bc7 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Mon, 8 Feb 2021 23:31:33 +0000
Subject: [PATCH 008/425] Version bump to TP1A.210208.002 [core/build_id.mk]

Change-Id: I3a786b913728a6606ef43a4405fbcfdd83deba48
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 4fe128e374..88ab266426 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=TP1A.210208.001
+BUILD_ID=TP1A.210208.002

From 4ad89f51fe258cf0364db3d8c7efc0a931ebfea8 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 12 Feb 2021 06:29:32 +0000
Subject: [PATCH 009/425] Version bump to TP1A.210212.002 [core/build_id.mk]

Change-Id: I64cbad71d1d1df59d0fdfa121540e8493ea17e8d
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 0a307ce195..f01f5d5fe2 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=TP1A.210212.001
+BUILD_ID=TP1A.210212.002

From 5647552616145815a9412fb797c50a5503fad284 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 18 Feb 2021 20:47:30 +0000
Subject: [PATCH 010/425] Version bump to TP1A.210218.002 [core/build_id.mk]

Change-Id: I4ad027e31407788040c285233ad3635b6a83ac1b
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index d7e1c71d59..3c4d3728e4 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=TP1A.210218.001
+BUILD_ID=TP1A.210218.002

From 1b2afa3674a502ed2bede28363b0b661839a1c0f Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 19 Feb 2021 05:41:34 +0000
Subject: [PATCH 011/425] Version bump to TP1A.210219.002 [core/build_id.mk]

Change-Id: Ib28ac70b634722e70b782c94e536d0c3494a8d7a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index e893a3afa8..7dce69af1d 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=TP1A.210219.001
+BUILD_ID=TP1A.210219.002

From 20ac25130e424f01b388916959fdef8b1b90e968 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 19 Feb 2021 20:47:07 +0000
Subject: [PATCH 012/425] Version bump to TP1A.210219.003 [core/build_id.mk]

Change-Id: I6997ca8c54da2c21b0959370c96a99d208684f74
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 7dce69af1d..757a99ce72 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=TP1A.210219.002
+BUILD_ID=TP1A.210219.003

From 7b85fb23ae411fd94a0f554f806bfa5e86edd7f5 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 23 Feb 2021 17:59:01 +0000
Subject: [PATCH 013/425] Version bump to TP1A.210223.002 [core/build_id.mk]

Change-Id: I2dc0ebc69dbfe4dc4404b1110fcc1a2d38f8f00c
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 7cdecc081e..4c790bb1fb 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=TP1A.210223.001
+BUILD_ID=TP1A.210223.002

From 2d02678da4c6369df6fc752fedbc984962515134 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 24 Feb 2021 18:30:07 +0000
Subject: [PATCH 014/425] Version bump to TP1A.210224.002 [core/build_id.mk]

Change-Id: I6b85acd7f1d26f2d675e35b14126203a800eb887
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index f9b7cb4477..ab29b897c5 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=TP1A.210224.001
+BUILD_ID=TP1A.210224.002

From b66820310d4692eef110c6717cfdf59e4f2f018a Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Sat, 27 Feb 2021 00:15:04 +0000
Subject: [PATCH 015/425] Version bump to TP1A.210226.002 [core/build_id.mk]

Change-Id: I72b72418f745fbcf02a5787759d8e0a6a5acf4b1
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 97fcbea3f3..5b139bd13a 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=TP1A.210226.001
+BUILD_ID=TP1A.210226.002

From a371a5a51985f7d1eb044a71177e2099eddb981a Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 9 Mar 2021 23:51:20 +0000
Subject: [PATCH 016/425] Version bump to TP1A.210309.002 [core/build_id.mk]

Change-Id: I10e5b26ced24c097e5811ae0bea4b38a229d630a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 87bbb5ba05..3ca2f1c42e 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=TP1A.210309.001
+BUILD_ID=TP1A.210309.002

From 1db2bdb2d1419fe63b37f8b1769dd165ff8a6635 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Mon, 15 Mar 2021 20:41:30 +0000
Subject: [PATCH 017/425] Version bump to TP1A.210315.002 [core/build_id.mk]

Change-Id: Ic2bcb0e70256f64e80ceca386229444fa9776cf2
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 11b5de6e5c..844eb94d19 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=TP1A.210315.001
+BUILD_ID=TP1A.210315.002

From 328eca9f76dff2b9c35f90776a9ed531b15dc309 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 16 Mar 2021 04:43:14 +0000
Subject: [PATCH 018/425] Version bump to TP1A.210316.002 [core/build_id.mk]

Change-Id: I820882a027a802123c2ded0df6cf1f1c98c43861
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 10679fe39b..5114a23c9e 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=TP1A.210316.001
+BUILD_ID=TP1A.210316.002

From 921646a8ff4506aeab0f5a20efab1a68e7ede144 Mon Sep 17 00:00:00 2001
From: Artur Satayev <satayev@google.com>
Date: Thu, 11 Mar 2021 16:47:19 +0000
Subject: [PATCH 019/425] Move allowed_deps.txt to packages/modules/common.

Bug: 179234385
Test: run update-apex-allowed-deps.sh locally
Change-Id: I6866e7a80bce03f991f5b99fb5182c91351cc311
---
 core/main.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/main.mk b/core/main.mk
index b865819344..39c219226c 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1865,7 +1865,7 @@ tidy_only:
 ndk: $(SOONG_OUT_DIR)/ndk.timestamp
 .PHONY: ndk
 
-# Checks that build/soong/apex/allowed_deps.txt remains up to date
+# Checks that allowed_deps.txt remains up to date
 ifneq ($(UNSAFE_DISABLE_APEX_ALLOWED_DEPS_CHECK),true)
   droidcore: ${APEX_ALLOWED_DEPS_CHECK}
 endif

From 8b5a355eacc5018d093acd483e04398e1b912574 Mon Sep 17 00:00:00 2001
From: Artur Satayev <satayev@google.com>
Date: Thu, 11 Mar 2021 16:47:19 +0000
Subject: [PATCH 020/425] Move allowed_deps.txt to packages/modules/common.

Bug: 179234385
Test: run update-apex-allowed-deps.sh locally
Change-Id: I6866e7a80bce03f991f5b99fb5182c91351cc311
Merged-In: I6866e7a80bce03f991f5b99fb5182c91351cc311
(cherry picked from commit 921646a8ff4506aeab0f5a20efab1a68e7ede144)
(cherry picked from commit 046e713abd8b6437b50adafc36f3170935bb8b48)
---
 core/main.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/main.mk b/core/main.mk
index b865819344..39c219226c 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1865,7 +1865,7 @@ tidy_only:
 ndk: $(SOONG_OUT_DIR)/ndk.timestamp
 .PHONY: ndk
 
-# Checks that build/soong/apex/allowed_deps.txt remains up to date
+# Checks that allowed_deps.txt remains up to date
 ifneq ($(UNSAFE_DISABLE_APEX_ALLOWED_DEPS_CHECK),true)
   droidcore: ${APEX_ALLOWED_DEPS_CHECK}
 endif

From 8dd4908d62f5e29d11dff33bd84a0f8766d80ddf Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 17 Mar 2021 17:25:37 +0000
Subject: [PATCH 021/425] Version bump to TP1A.210317.002 [core/build_id.mk]

Change-Id: Ib2e2014b39fec46434f19903239359197d48e5cd
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index c31dfb7c8c..50d497e898 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=TP1A.210317.001
+BUILD_ID=TP1A.210317.002

From ed9ed558ca6dbf3cd98b2197b3c010c2e66c6923 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 18 Mar 2021 22:57:14 +0000
Subject: [PATCH 022/425] Version bump to TP1A.210318.003 [core/build_id.mk]

Change-Id: I23638419ac4ac7d39e7ef9d92e615d71a12f67c7
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index c44da1f949..b16a29daaf 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=TP1A.210318.002
+BUILD_ID=TP1A.210318.003

From f4b888b496fc6c1cd33b8d84b9fe41197dd86a1e Mon Sep 17 00:00:00 2001
From: Chris Wailes <chriswailes@google.com>
Date: Thu, 18 Feb 2021 13:41:57 -0800
Subject: [PATCH 023/425] Add the service-art JAR to the System Server
 classpath.

Bug: 177273468
Test: m
Change-Id: Iddf07fb98a86d626c993b7b175a25413f42b833c
---
 target/product/media_system.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index 15a6b598f9..8160df2957 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -58,6 +58,7 @@ PRODUCT_SYSTEM_SERVER_JARS := \
 # The values should be of the format <apex name>:<jar name>
 PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
     com.android.appsearch:service-appsearch \
+    com.android.art:service-art \
     com.android.media:service-media-s \
     com.android.permission:service-permission \
     com.android.geotz:geotz \

From 751b78c7606ab3c7abc3b1bc45587501ff93bb22 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Mon, 22 Mar 2021 19:13:51 +0000
Subject: [PATCH 024/425] Version bump to TP1A.210322.002 [core/build_id.mk]

Change-Id: I4ccf77210d515de8cac8ce78e7d5c28daad6114a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 48dd1808fb..a6cc284693 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=TP1A.210322.001
+BUILD_ID=TP1A.210322.002

From 74bb0aa0b8d659940f2950910cef7ca3203d2d32 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Mon, 22 Mar 2021 20:23:15 +0000
Subject: [PATCH 025/425] Version bump to TP1A.210322.003 [core/build_id.mk]

Change-Id: Id554df881b53112497a6afb5653105ec531c0a3a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index a6cc284693..70d85701f1 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=TP1A.210322.002
+BUILD_ID=TP1A.210322.003

From 3b61f5e56f66f97bcebfaeee09a1e7dc7e88e88c Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Mon, 22 Mar 2021 22:55:33 +0000
Subject: [PATCH 026/425] Version bump to TP1A.210322.004 [core/build_id.mk]

Change-Id: I049dc065a5881d7e04e74d88284e2f9a5ee866db
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 70d85701f1..0651677f73 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=TP1A.210322.003
+BUILD_ID=TP1A.210322.004

From 40d62dd3c80c7ff3f32e8f8766b65dcf9a05dfe6 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 24 Mar 2021 04:57:57 +0000
Subject: [PATCH 027/425] Version bump to TP1A.210324.002 [core/build_id.mk]

Change-Id: I81ed9d2db59146a2fb944db8065da3483939b72a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index ee51e36fe0..ba09bcb573 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=TP1A.210324.001
+BUILD_ID=TP1A.210324.002

From bbb4ff49ef552686fc93ef05e9bddc309d5d56e1 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 25 Mar 2021 00:23:11 +0000
Subject: [PATCH 028/425] Version bump to TP1A.210324.003 [core/build_id.mk]

Change-Id: If0aa27fa0b5ecf17b6eccbc1ce41f817f7c893f5
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index ba09bcb573..7490c59c6d 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=TP1A.210324.002
+BUILD_ID=TP1A.210324.003

From 9c25c29131f9cc2118b0aa470e8be447eed2360c Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 25 Mar 2021 21:23:39 +0000
Subject: [PATCH 029/425] Version bump to TP1A.210325.002 [core/build_id.mk]

Change-Id: Ie9a43883ab33af1539cbeed466f800523a8fa34e
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index af7c664ffe..1e5cce4eb6 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=TP1A.210325.001
+BUILD_ID=TP1A.210325.002

From f520b888d9bfdd534e6a0e794fbfc14dc90199d2 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 30 Mar 2021 04:23:23 +0000
Subject: [PATCH 030/425] Version bump to TP1A.210330.002 [core/build_id.mk]

Change-Id: I45c276f0ff940c512ccace258f940f960a29f6cd
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 007a831bd1..6e85de99da 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=TP1A.210330.001
+BUILD_ID=TP1A.210330.002

From 881c3144b7e75955682b57f96548b09caf5ae79d Mon Sep 17 00:00:00 2001
From: Ytai Ben-Tsvi <ytai@google.com>
Date: Wed, 10 Mar 2021 14:11:50 -0800
Subject: [PATCH 031/425] Add new soundtrigger/audio VNDK interfaces

Test: m
Change-Id: Ie283af34ed73248c94bd72e0041ca0a42e4b684d
---
 target/product/gsi/current.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index cb9dfe046a..faf3b6b3c1 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -92,6 +92,8 @@ VNDK-core: android.hardware.vibrator-V1-ndk_platform.so
 VNDK-core: android.hardware.weaver-V1-ndk_platform.so
 VNDK-core: android.hidl.token@1.0-utils.so
 VNDK-core: android.hidl.token@1.0.so
+VNDK-core: android.media.audio.common.types-V1-ndk_platform.so
+VNDK-core: android.media.soundtrigger.types-V1-ndk_platform.so
 VNDK-core: android.system.keystore2-V1-ndk_platform.so
 VNDK-core: android.system.suspend@1.0.so
 VNDK-core: libaudioroute.so

From 1af3df261b570dae8f62774a8e64c380d8cbaf63 Mon Sep 17 00:00:00 2001
From: Ytai Ben-Tsvi <ytai@google.com>
Date: Thu, 11 Mar 2021 11:06:02 -0800
Subject: [PATCH 032/425] Add soundtrigger AIDL HAL VNDK interfaces

Test: m
Change-Id: I34c3bbc99aded0bd0cd21522a9ca7b90750e17ff
---
 target/product/gsi/current.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index faf3b6b3c1..5edebc5fa4 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -86,6 +86,7 @@ VNDK-core: android.hardware.rebootescrow-V1-ndk_platform.so
 VNDK-core: android.hardware.security.keymint-V1-ndk_platform.so
 VNDK-core: android.hardware.security.secureclock-V1-ndk_platform.so
 VNDK-core: android.hardware.security.sharedsecret-V1-ndk_platform.so
+VNDK-core: android.hardware.soundtrigger3-V1-ndk_platform.so
 VNDK-core: android.hardware.soundtrigger@2.0-core.so
 VNDK-core: android.hardware.soundtrigger@2.0.so
 VNDK-core: android.hardware.vibrator-V1-ndk_platform.so

From cab97c89c9a552c392a87052e87773b315479bee Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 1 Apr 2021 03:59:10 +0000
Subject: [PATCH 033/425] Version bump to TP1A.210401.002 [core/build_id.mk]

Change-Id: I36760f467829aea24b1d3ede6142dcaa10b05907
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index efb009a5d2..903fb2ef1c 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=TP1A.210401.001
+BUILD_ID=TP1A.210401.002

From 8b5c64621a54c94020eba66fde1a5ddf5119b02d Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 6 Apr 2021 01:53:16 +0000
Subject: [PATCH 034/425] Version bump to TP1A.210405.002 [core/build_id.mk]

Change-Id: Ia6cb706d4c49ae38274778dce05eb0c5b78aeb0b
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index f5379622ae..2829dc14b2 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=TP1A.210405.001
+BUILD_ID=TP1A.210405.002

From 38654774a7394dd6506395f88434af1f06722328 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 6 Apr 2021 17:39:02 +0000
Subject: [PATCH 035/425] Version bump to TP1A.210406.002 [core/build_id.mk]

Change-Id: I89eca2a91146c6680666caaaa8db18a7397f6b7a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index d796485a76..aa0621d013 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=TP1A.210406.001
+BUILD_ID=TP1A.210406.002

From c57770d8cfdabdcb73887dfc82e452bff1a0cc29 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 7 Apr 2021 03:51:09 +0000
Subject: [PATCH 036/425] Version bump to TP1A.210407.002 [core/build_id.mk]

Change-Id: Ifa902adf13a0bb84f5fdbd288059c79b8806fa9b
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index e144adb7dd..276d377a27 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=TP1A.210407.001
+BUILD_ID=TP1A.210407.002

From 943a00a04ab15fdb4782c6b9af0c2738455a6199 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 8 Apr 2021 00:23:28 +0000
Subject: [PATCH 037/425] Version bump to TP1A.210407.003 [core/build_id.mk]

Change-Id: I073d62447cf97c1ca8cf715b0f1c9f8e4463f70b
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 276d377a27..155454d941 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=TP1A.210407.002
+BUILD_ID=TP1A.210407.003

From 64ba5fe572dc3feea43e74cb77f4fd638cb28f24 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 8 Apr 2021 03:49:17 +0000
Subject: [PATCH 038/425] Version bump to TP1A.210408.002 [core/build_id.mk]

Change-Id: Ic3823616ade993db7969d91d5bacca063e799cae
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 2fafa51398..e2a4fa25e6 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=TP1A.210408.001
+BUILD_ID=TP1A.210408.002

From 80fd7a92c8ce1ec78b1ff9d247656971f6d92d04 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 8 Apr 2021 16:19:52 +0000
Subject: [PATCH 039/425] Version bump to TP1A.210408.003 [core/build_id.mk]

Change-Id: I28e112a41f96e90a0025da65b3226c00a9791b48
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index e2a4fa25e6..746cd8bdbf 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=TP1A.210408.002
+BUILD_ID=TP1A.210408.003

From 0e459986790cf382151d67a0c9a08803a9d15ef6 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 9 Apr 2021 03:58:32 +0000
Subject: [PATCH 040/425] Version bump to TP1A.210409.002 [core/build_id.mk]

Change-Id: I1e4feedd6a24cc53db796a744278a0d19b736074
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 33d10656b3..43351bdd3a 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=TP1A.210409.001
+BUILD_ID=TP1A.210409.002

From 123c069f49243f4b2ed824ef4170292db1ec1b7c Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 9 Apr 2021 17:51:29 +0000
Subject: [PATCH 041/425] Version bump to TP1A.210409.003 [core/build_id.mk]

Change-Id: Ib2281e80de1bc2419b4290fdd579e79b318ebcd4
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 43351bdd3a..87bcf8dc2f 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=TP1A.210409.002
+BUILD_ID=TP1A.210409.003

From ef8db99ebd4ca19abe210c86622516ee1380b42f Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Mon, 12 Apr 2021 21:45:19 +0000
Subject: [PATCH 042/425] Version bump to TP1A.210412.002 [core/build_id.mk]

Change-Id: I2461a916f91491b035b2a4b43acc80976cc6c8c6
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 59ddbca95d..d05aa4a67c 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=TP1A.210412.001
+BUILD_ID=TP1A.210412.002

From f4bca0c7ba470460a97b483c7c92cb672b454267 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 14 Apr 2021 22:31:30 +0000
Subject: [PATCH 043/425] Version bump to TP1A.210414.002 [core/build_id.mk]

Change-Id: I307904bc86c45686569784b13ed57fa9109c2e80
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 605d5c76b9..28a8fe49ba 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=TP1A.210414.001
+BUILD_ID=TP1A.210414.002

From 3d3d0532023511f457380e85aa1f02fde6f5d8a6 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 15 Apr 2021 03:42:59 +0000
Subject: [PATCH 044/425] Version bump to TP1A.210415.002 [core/build_id.mk]

Change-Id: I6b748ebacf3b8fdef67bf3b6847a1f2ae4574b2f
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 7fe2b304b5..a239b85712 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=TP1A.210415.001
+BUILD_ID=TP1A.210415.002

From 2f1e35e0bb44d217e43642a879daf91cfc0c48a4 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 15 Apr 2021 18:03:13 +0000
Subject: [PATCH 045/425] Version bump to TP1A.210415.003 [core/build_id.mk]

Change-Id: If022f6a286c88026bae85006221508bb762126b1
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index a239b85712..bd501c17e5 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=TP1A.210415.002
+BUILD_ID=TP1A.210415.003

From c0fc2da3d12b6855b7548e5fc40b99aa47ddb3d7 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 16 Apr 2021 04:49:08 +0000
Subject: [PATCH 046/425] Version bump to TP1A.210416.002 [core/build_id.mk]

Change-Id: I2a503731e95f525af4ce7d50d33de8ea7e7ab278
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 3436a4e5e9..7a19d42a7e 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=TP1A.210416.001
+BUILD_ID=TP1A.210416.002

From 078f6612e866dca1c622278950735d0178ce3e22 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Mon, 19 Apr 2021 19:19:06 +0000
Subject: [PATCH 047/425] Version bump to TP1A.210419.002 [core/build_id.mk]

Change-Id: Ie1594384cafb766fb2ab72a7cfe492e4b8d6940b
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index fa8a07dbbc..c8357d2f6d 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=TP1A.210419.001
+BUILD_ID=TP1A.210419.002

From 50c2d344d15da1e781d232444e4304d045554cc5 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 20 Apr 2021 22:34:28 +0000
Subject: [PATCH 048/425] Version bump to TP1A.210420.002 [core/build_id.mk]

Change-Id: Ie202ec563792e75df8cbcb313ddaf5fbe00f8c61
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index c53f05c451..a741eae913 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=TP1A.210420.001
+BUILD_ID=TP1A.210420.002

From 95efab1e46d614b2c78033cbb358de5121a3620c Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 22 Apr 2021 18:09:48 +0000
Subject: [PATCH 049/425] Version bump to TP1A.210422.002 [core/build_id.mk]

Change-Id: I76db871fc3b46ef74ab37d26b03800d266202e0b
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index c1722b4dd2..c28e5ff6d9 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=TP1A.210422.001
+BUILD_ID=TP1A.210422.002

From fcf35b1cfd2bc55bf0b3d4b827e0ee81e8fffa0b Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Mon, 26 Apr 2021 21:35:18 +0000
Subject: [PATCH 050/425] Version bump to TP1A.210426.002 [core/build_id.mk]

Change-Id: Iebb6b47288ea603e9d7feaf73cf6bd3d43f44ae9
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 8d44397544..d2a7268344 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=TP1A.210426.001
+BUILD_ID=TP1A.210426.002

From 19dc7ee03362daf6a92fed347fcbd65f89f002c1 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 28 Apr 2021 23:47:26 +0000
Subject: [PATCH 051/425] Version bump to TP1A.210428.002 [core/build_id.mk]

Change-Id: I15459006727c2e0c9ab13c110f869f55965b6a53
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index bcb91d8658..cf68e23ec2 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=TP1A.210428.001
+BUILD_ID=TP1A.210428.002

From c7b9df98c7fe87e2e259dd72d6a8267f620d3cfb Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 29 Apr 2021 04:27:24 +0000
Subject: [PATCH 052/425] Version bump to TP1A.210429.002 [core/build_id.mk]

Change-Id: Iec95fb7c18bb441b7049ffd37f1ca2e1231006ea
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 1371e40a3b..20cb4dcf55 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=TP1A.210429.001
+BUILD_ID=TP1A.210429.002

From 47cf90c7265a1a95fe6b86ea33d1dba9e77ae41f Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 29 Apr 2021 23:51:25 +0000
Subject: [PATCH 053/425] Version bump to TP1A.210429.003 [core/build_id.mk]

Change-Id: I4257d0c7c4332ce4dc4d103d00ed02a8caba46b9
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 20cb4dcf55..188b752305 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=TP1A.210429.002
+BUILD_ID=TP1A.210429.003

From 150d2e28595172fdf4b18d58b8cb21f75bfa1a5e Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Mon, 3 May 2021 22:50:01 +0000
Subject: [PATCH 054/425] Version bump to TP1A.210503.002 [core/build_id.mk]

Change-Id: I3de47e7902232ca4822f6b322506972eedf45a27
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 83fd84715b..97e66af0ab 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=TP1A.210503.001
+BUILD_ID=TP1A.210503.002

From ea52988d19460b16a03977b786e67ac12392b994 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 4 May 2021 04:47:35 +0000
Subject: [PATCH 055/425] Version bump to TP1A.210504.002 [core/build_id.mk]

Change-Id: Ic855211ab9deddc5247740477f2beb22659c0a4e
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 856f0e2b6b..3d1e9a2102 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=TP1A.210504.001
+BUILD_ID=TP1A.210504.002

From 8a9f6e07f8638d44e39679ea4424d20ff49ba6f4 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 5 May 2021 17:51:02 +0000
Subject: [PATCH 056/425] Version bump to TP1A.210505.002 [core/build_id.mk]

Change-Id: If30d5eaba8509c6b1d5d907a280b9b098ece910f
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 290a5c4178..593e57f7e5 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=TP1A.210505.001
+BUILD_ID=TP1A.210505.002

From 2e90bfa8390e4e62a234ff445ac2803fb51fc5f0 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 5 May 2021 20:11:19 +0000
Subject: [PATCH 057/425] Version bump to TP1A.210505.003 [core/build_id.mk]

Change-Id: I846689dee03f14e77945957e756fa6b33aadcf75
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 593e57f7e5..7dbab83bd0 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=TP1A.210505.002
+BUILD_ID=TP1A.210505.003

From fd4909eb83e121e78b0dfdbf5852d4334e90425d Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 5 May 2021 21:33:05 +0000
Subject: [PATCH 058/425] Version bump to TP1A.210505.004 [core/build_id.mk]

Change-Id: I7b199eb644a2c15823f8602fdf7de1afc4250ce6
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 7dbab83bd0..72895597e5 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=TP1A.210505.003
+BUILD_ID=TP1A.210505.004

From bbe110e7ed26ba1b4dcef017faa42aa35dc0c3db Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 6 May 2021 15:25:13 +0000
Subject: [PATCH 059/425] Version bump to TP1A.210506.002 [core/build_id.mk]

Change-Id: If978caa525562338954fb4fe2e8cf84d15e457a8
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index b06a11c994..b7f77869c0 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=TP1A.210506.001
+BUILD_ID=TP1A.210506.002

From e8bb6bea1ffa56a211564f421d574b0a8fd3ae17 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 6 May 2021 19:15:15 +0000
Subject: [PATCH 060/425] Version bump to TP1A.210506.003 [core/build_id.mk]

Change-Id: I1456f77c1b32611d2b4df88b385588081a50f340
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index b7f77869c0..4bb0ada8f2 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=TP1A.210506.002
+BUILD_ID=TP1A.210506.003

From ef667707497f64f8cd706e70ed7d4586751d1baf Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 11 May 2021 21:27:03 +0000
Subject: [PATCH 061/425] Version bump to TP1A.210511.002 [core/build_id.mk]

Change-Id: Iaadf80cb2152fb5a31276775bc246e6cef131602
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index f521c5a179..52852311a4 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=TP1A.210511.001
+BUILD_ID=TP1A.210511.002

From 41dacd187000578dac3c1c12effabd7967e3b546 Mon Sep 17 00:00:00 2001
From: Kousik Kumar <kousikk@google.com>
Date: Tue, 11 May 2021 18:38:38 -0400
Subject: [PATCH 062/425] Add a warning to lunch command for metrics collection

When metrics collection is enabled but
there's no gcert, print a warning and ask the user to run gcert so that
metrics collection can work.

Bug: b/184040091
Change-Id: Ib79c61e89a42dc7da9ef452b7101dac955859a7d
---
 envsetup.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/envsetup.sh b/envsetup.sh
index 8a995c7fdc..368f73db59 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -719,6 +719,10 @@ function lunch()
     set_stuff_for_environment
     [[ -n "${ANDROID_QUIET_BUILD:-}" ]] || printconfig
     destroy_build_var_cache
+
+    if [[ -n "${CHECK_MU_CONFIG:-}" ]]; then
+      check_mu_config
+    fi
 }
 
 unset COMMON_LUNCH_CHOICES_CACHE

From 67c541871941cba8fd80d14490114dd8b80b71b8 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 12 May 2021 22:45:28 +0000
Subject: [PATCH 063/425] Version bump to TP1A.210512.002 [core/build_id.mk]

Change-Id: I85e58b8be01591b2e8ecc042a51b81bf845a807a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 44c89298dd..397ede637a 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=TP1A.210512.001
+BUILD_ID=TP1A.210512.002

From 3e48c5b40862183484d6dd1aea6df759acbdeada Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 13 May 2021 00:25:08 +0000
Subject: [PATCH 064/425] Version bump to TP1A.210512.003 [core/build_id.mk]

Change-Id: I868520fbe2cab2877306630b9ecf1feeb78571fc
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 397ede637a..876e6a6da6 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=TP1A.210512.002
+BUILD_ID=TP1A.210512.003

From 4a0be1d8fa6f308dcaaa3f930d0d58b34ef6fa8d Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 13 May 2021 03:57:33 +0000
Subject: [PATCH 065/425] Version bump to TP1A.210513.002 [core/build_id.mk]

Change-Id: I2f29dd924fdbe4eed766557997de8f5a40247a5f
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 73156e2f00..b172506040 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=TP1A.210513.001
+BUILD_ID=TP1A.210513.002

From 55fed192f8c764bff446baa7f0c154e006e4a292 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 20 May 2021 20:20:49 +0000
Subject: [PATCH 066/425] Version bump to TP1A.210520.002 [core/build_id.mk]

Change-Id: I5ebb5264bcd735863441543300698b769ca6f9d6
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index c4e6f57b85..bd866934a3 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=TP1A.210520.001
+BUILD_ID=TP1A.210520.002

From 4bc60b09c396835abd2a1f4068456c67f76d210c Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 21 May 2021 21:21:12 +0000
Subject: [PATCH 067/425] Version bump to TP1A.210521.002 [core/build_id.mk]

Change-Id: I94e7e9e3ff5f9077d7f8be37eb454538e7a366d7
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index c4b35afa2d..377d911c3d 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=TP1A.210521.001
+BUILD_ID=TP1A.210521.002

From ca1f9b37bf0d34726b6201870aefe92066b905f7 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 27 May 2021 21:15:26 +0000
Subject: [PATCH 068/425] Version bump to TP1A.210527.002 [core/build_id.mk]

Change-Id: I619ada0cec787726f512c579c039be90e77d1318
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index d526b93175..d1022058a4 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=TP1A.210527.001
+BUILD_ID=TP1A.210527.002

From 85319d17135850ae4d704ec170b94a58ac7b1bde Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 1 Jun 2021 23:15:30 +0000
Subject: [PATCH 069/425] Version bump to TP1A.210601.002 [core/build_id.mk]

Change-Id: I43f5cc7f3b00822b77d47496663a3eda610b7717
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 446a5b5854..dd572b1823 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=TP1A.210601.001
+BUILD_ID=TP1A.210601.002

From 5bb19fb8a3ff9bec6983e676c6bc97c544c9243c Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Thu, 3 Jun 2021 22:19:25 +0000
Subject: [PATCH 070/425] Version bump to TP1A.210603.002 [core/build_id.mk]

Change-Id: I0847e0527894a420468dbd784c5753c45541d2a0
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index bf2c51f58f..1ba4956e1f 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=TP1A.210603.001
+BUILD_ID=TP1A.210603.002

From 53999326403fc07860c587a5b85838b624dfa4ee Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 4 Jun 2021 21:37:19 +0000
Subject: [PATCH 071/425] Version bump to TP1A.210604.002 [core/build_id.mk]

Change-Id: I493a6f17032ff7b6909ec6027f0d5b009c7560a6
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index fea1b8763a..f072cd8d4d 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=TP1A.210604.001
+BUILD_ID=TP1A.210604.002

From 18569fe0432169fe4d80149ae710aa56a514c271 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Mon, 7 Jun 2021 20:17:10 +0000
Subject: [PATCH 072/425] Version bump to TP1A.210607.002 [core/build_id.mk]

Change-Id: I120ee49af17a0c291dcd3b1f4e99af30410b4f18
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 6cdb32b89d..6ed1393093 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=TP1A.210607.001
+BUILD_ID=TP1A.210607.002

From af56f2eadc1da0a1cd847aa32c82e88bfaabeef0 Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Tue, 8 Jun 2021 16:02:05 +0100
Subject: [PATCH 073/425] Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to
 default_art_config.mk.

The list of updatable system server jars must be known in
module_common.mk which is used to build mainline modules that contain
said system server jars.

module_common.mk inherit from default_art_config.mk.

Note that we could also move the defition into a separate make file,
if current change causes problems. However, places like clockwork
overwrite values of PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS instead
of appending to them, so it should not be a source of issues.

Bug: 180105615
Bug: 190407034
Test: TARGET_BUILD_VARIANT=user vendor/google/build/build_mainline_modules.sh -j64 and inspecting build artifacts
Change-Id: I771895bf0a974a4c6aa4f7374159c22536f03891
---
 target/product/default_art_config.mk | 10 +++++++++-
 target/product/media_system.mk       |  9 ---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 1754f87dff..2ae64609a4 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -49,7 +49,7 @@ PRODUCT_BOOT_JARS += \
 PRODUCT_BOOT_JARS += \
     com.android.i18n:core-icu4j
 
-# Updatable APEX jars. Keep the list sorted by module names and then library names.
+# Updatable APEX boot jars. Keep the list sorted by module names and then library names.
 PRODUCT_UPDATABLE_BOOT_JARS := \
     com.android.appsearch:framework-appsearch \
     com.android.conscrypt:conscrypt \
@@ -65,6 +65,14 @@ PRODUCT_UPDATABLE_BOOT_JARS := \
     com.android.tethering:framework-tethering \
     com.android.wifi:framework-wifi
 
+# Updatable APEX system server jars. Keep the list sorted by module names and then library names.
+PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
+    com.android.appsearch:service-appsearch \
+    com.android.art:service-art \
+    com.android.media:service-media-s \
+    com.android.permission:service-permission \
+    com.android.geotz:geotz \
+
 # Minimal configuration for running dex2oat (default argument values).
 # PRODUCT_USES_DEFAULT_ART_CONFIG must be true to enable boot image compilation.
 PRODUCT_USES_DEFAULT_ART_CONFIG := true
diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index 8160df2957..30a8621b15 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -54,15 +54,6 @@ PRODUCT_SYSTEM_SERVER_JARS := \
     services \
     ethernet-service
 
-# system server jars which are updated via apex modules.
-# The values should be of the format <apex name>:<jar name>
-PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
-    com.android.appsearch:service-appsearch \
-    com.android.art:service-art \
-    com.android.media:service-media-s \
-    com.android.permission:service-permission \
-    com.android.geotz:geotz \
-
 PRODUCT_COPY_FILES += \
     system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt
 

From f5c836a6a4c981d714f67c4fe94bef954de4c306 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 8 Jun 2021 17:22:58 +0000
Subject: [PATCH 074/425] Version bump to TP1A.210608.002 [core/build_id.mk]

Change-Id: I773b95e82c2b8e4862850c755d22f0c076341546
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 20a16d7eeb..7fdecde772 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=TP1A.210608.001
+BUILD_ID=TP1A.210608.002

From 9674c0e75b0359e8756683bf7db1ee8aa343db85 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 13 May 2021 16:31:13 -0700
Subject: [PATCH 075/425] Master is T

Bug: 186121492
Test: treehugger
Change-Id: Ie5ee4479ba98b9f4525b36e38493879a15661905
---
 core/version_defaults.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 54d3951ce3..829dea6046 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -39,9 +39,9 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE
   include $(INTERNAL_BUILD_ID_MAKEFILE)
 endif
 
-DEFAULT_PLATFORM_VERSION := SP1A
-MIN_PLATFORM_VERSION := SP1A
-MAX_PLATFORM_VERSION := SP1A
+DEFAULT_PLATFORM_VERSION := TP1A
+MIN_PLATFORM_VERSION := TP1A
+MAX_PLATFORM_VERSION := TP1A
 
 ALLOWED_VERSIONS := $(call allowed-platform-versions,\
   $(MIN_PLATFORM_VERSION),\
@@ -93,7 +93,7 @@ PLATFORM_VERSION_LAST_STABLE := 12
 
 # These are the current development codenames, if the build is not a final
 # release build.  If this is a final release build, it is simply "REL".
-PLATFORM_VERSION_CODENAME.SP1A := S
+PLATFORM_VERSION_CODENAME.TP1A := T
 
 ifndef PLATFORM_VERSION_CODENAME
   PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION))

From ff763abaa9df7b556e6a02781f569686e9655128 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Wed, 16 Jun 2021 18:59:14 +0000
Subject: [PATCH 076/425] Version bump to TP1A.210616.003 [core/build_id.mk]

Change-Id: Ib31f42a4714b87ed3805c3191aa2c7b5718d6a19
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 7435563f37..6403f281df 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=TP1A.210616.002
+BUILD_ID=TP1A.210616.003

From 346c00a70e7ad431b12306d86ad2b8251f07486e Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 18 Jun 2021 00:33:12 +0000
Subject: [PATCH 077/425] Version bump to TP1A.210617.002 [core/build_id.mk]

Change-Id: Ic9e0bf5131367e7d5e4ecef4ce52841197c59ef3
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 156ac842fd..c64975b534 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=TP1A.210617.001
+BUILD_ID=TP1A.210617.002

From 0feb4ddfaa8a55dd71fc63a1fa1e8542feeb45a7 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Fri, 18 Jun 2021 22:23:11 +0000
Subject: [PATCH 078/425] Version bump to TP1A.210618.002 [core/build_id.mk]

Change-Id: Iff35135b19be126ba9df4efc71f0ad37755bdee6
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index ad984c3549..6425902c40 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=TP1A.210618.001
+BUILD_ID=TP1A.210618.002

From 6a8084f7c4b330b5ceace9509031fbdc3842ea0d Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Mon, 21 Jun 2021 21:53:08 +0000
Subject: [PATCH 079/425] Version bump to TP1A.210621.002 [core/build_id.mk]

Change-Id: Ia210a50954d45654a7f798b876f4bcd1458bb750
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 2073f86683..76652d96b8 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=TP1A.210621.001
+BUILD_ID=TP1A.210621.002

From 71681cd8e033ccae3f2ef619782b08328718e763 Mon Sep 17 00:00:00 2001
From: android-build-team Robot <android-build-team-robot@google.com>
Date: Tue, 22 Jun 2021 15:59:18 +0000
Subject: [PATCH 080/425] Version bump to TP1A.210622.002 [core/build_id.mk]

Change-Id: Id55165f5f6401cb1b34022727f8a4cae7dbecfe3
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 4bcc8e3163..b4ff1fcc67 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=TP1A.210622.001
+BUILD_ID=TP1A.210622.002

From 93fa60bcba38acfd35387f758aed6da8677f3285 Mon Sep 17 00:00:00 2001
From: Wei Wang <weiwa@google.com>
Date: Thu, 17 Jun 2021 11:22:53 -0700
Subject: [PATCH 081/425] Add nearby framework jar to art and system config.

Nearby mailine module is mandatory on T.

Bug: 189355156
Test: flashed a device and verified nearby jar file was present in BOOTCLASSPATH.

Change-Id: I86f7d8e5699bf59651f1809a8b79a4cbaae930a6
---
 target/product/base_system.mk        | 1 +
 target/product/default_art_config.mk | 1 +
 2 files changed, 2 insertions(+)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index f6a61043e3..8e255b429e 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -61,6 +61,7 @@ PRODUCT_PACKAGES += \
     com.android.media \
     com.android.media.swcodec \
     com.android.mediaprovider \
+    com.android.nearby \
     com.android.os.statsd \
     com.android.permission \
     com.android.resolv \
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 2ae64609a4..2759e597fe 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -56,6 +56,7 @@ PRODUCT_UPDATABLE_BOOT_JARS := \
     com.android.ipsec:android.net.ipsec.ike \
     com.android.media:updatable-media \
     com.android.mediaprovider:framework-mediaprovider \
+    com.android.nearby:framework-nearby \
     com.android.os.statsd:framework-statsd \
     com.android.permission:framework-permission \
     com.android.permission:framework-permission-s \

From cc424a1df380085acdf4690607bc6f78f3cdbdbd Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 23 Jun 2021 06:09:15 +0000
Subject: [PATCH 082/425] Version bump to TP1A.210623.002 [core/build_id.mk]

Change-Id: Ia77befad7f1b89fb6a787151a190249ba24fa678
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 538362c57a..81d08031e4 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=TP1A.210623.001
+BUILD_ID=TP1A.210623.002

From d04a6c011076c49e42de5e0fd8acb398a0aa3735 Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Mon, 28 Jun 2021 14:59:39 +0100
Subject: [PATCH 083/425] Remove a trailing \

Remove a trailing \ from a line. The character is not strictly necessary
and it currently differs between sc-dev and master, which makes the
removal of the line in sc-dev conflict in the automerger. It's easiest
to fix the line to be the same in master than it is to cherry-pick /
land the topic in master.

Bug: 178169250
Test: treehugger only
Change-Id: I9b5c743d8744c6e9382bcecacfed76f050539eda
---
 target/product/default_art_config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 2ae64609a4..b95b1a9107 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -71,7 +71,7 @@ PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
     com.android.art:service-art \
     com.android.media:service-media-s \
     com.android.permission:service-permission \
-    com.android.geotz:geotz \
+    com.android.geotz:geotz
 
 # Minimal configuration for running dex2oat (default argument values).
 # PRODUCT_USES_DEFAULT_ART_CONFIG must be true to enable boot image compilation.

From 2fa4dd2b9945c97fa8237bb0b79985f299ad27b8 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 28 Jun 2021 19:15:21 +0000
Subject: [PATCH 084/425] Version bump to TP1A.210628.002 [core/build_id.mk]

Change-Id: I36e1db3b4f3c01c2abd71e51f8724d13b782fb91
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index f8ce240cfe..7f7a9b0079 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=TP1A.210628.001
+BUILD_ID=TP1A.210628.002

From 8843b561aed3c8203c24faff13b63c91f0f17f14 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 29 Jun 2021 20:57:03 +0000
Subject: [PATCH 085/425] Version bump to TP1A.210629.002 [core/build_id.mk]

Change-Id: Ie9ebbd27f2f28a1aa9d2490be0b54da2d86f9e0c
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index ec2782a054..68c34789e8 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=TP1A.210629.001
+BUILD_ID=TP1A.210629.002

From ef6418d785c137635c567c2308706ddcaa00bb2f Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 30 Jun 2021 18:28:59 +0000
Subject: [PATCH 086/425] Version bump to TP1A.210630.002 [core/build_id.mk]

Change-Id: Iafad95027e2e98d405525dab41fca0d46e197d3f
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 16f610b9d0..6dd8125a09 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=TP1A.210630.001
+BUILD_ID=TP1A.210630.002

From e121706785f97ece2fc1f6ea15f2d64899f3e366 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 30 Jun 2021 23:17:11 +0000
Subject: [PATCH 087/425] Version bump to TP1A.210630.003 [core/build_id.mk]

Change-Id: Id3fcbf44664b913001cf2b12f19db380045d360d
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 6dd8125a09..27d8353441 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=TP1A.210630.002
+BUILD_ID=TP1A.210630.003

From 88cf4d5d58935c38801865626419f915940720c7 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 1 Jul 2021 17:45:19 +0000
Subject: [PATCH 088/425] Version bump to TP1A.210701.002 [core/build_id.mk]

Change-Id: Ie319170176b59ee7b98df6536e2572542713cfe7
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index b7778d2321..f7b3ac0cd8 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=TP1A.210701.001
+BUILD_ID=TP1A.210701.002

From c03f6619f91b67bb80197d107c39a67d8a60c0cf Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 8 Jul 2021 21:23:02 +0000
Subject: [PATCH 089/425] Version bump to TP1A.210708.002 [core/build_id.mk]

Change-Id: I31bb3da4950627243a15ed5beeea2cdb636850ab
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index cd3cbcd365..722217b997 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=TP1A.210708.001
+BUILD_ID=TP1A.210708.002

From fd4dd7078ff7c1c89f2e68c388fcb0dab1e51aa8 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 9 Jul 2021 04:04:58 +0000
Subject: [PATCH 090/425] Version bump to TP1A.210709.002 [core/build_id.mk]

Change-Id: I1c2b136050ffb9221864a46cf66f565d521f9aa9
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 8b46a104f5..9d84491843 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=TP1A.210709.001
+BUILD_ID=TP1A.210709.002

From 876eca1e5d439588f0295df20c4a3892b3983492 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 12 Jul 2021 23:05:15 +0000
Subject: [PATCH 091/425] Version bump to TP1A.210712.002 [core/build_id.mk]

Change-Id: I17f0518e83b8282805b7d72a04606c2b9a71bc09
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index f533bce01e..572aa6181c 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=TP1A.210712.001
+BUILD_ID=TP1A.210712.002

From 84d18e2cf3702de2615c737c9ba23e170bb4288a Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 13 Jul 2021 14:43:21 +0000
Subject: [PATCH 092/425] Version bump to TP1A.210713.002 [core/build_id.mk]

Change-Id: I2369adf3e98c977501ba6d76812419d382c19b54
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index be074a8487..ff7338377d 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=TP1A.210713.001
+BUILD_ID=TP1A.210713.002

From c8dbfb795fb2012183941f458ca17164f15ee94c Mon Sep 17 00:00:00 2001
From: Brett Chabot <brettchabot@google.com>
Date: Wed, 14 Jul 2021 22:30:02 +0000
Subject: [PATCH 093/425] Port sdk_slim_x86_64 from rvc-emu-dev.

This 'slim' target produces a system image optimized for
headless automated testing on the emulator.

Bug: 193713572
Test: lunch sdk_slim_x86_64, m -j, atest CtsUtilTestCases
Change-Id: I599bfab49b574bef63e5bb90a2aa19c86d566293
---
 target/product/AndroidProducts.mk |  1 +
 target/product/sdk_slim_x86_64.mk | 78 +++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 target/product/sdk_slim_x86_64.mk

diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk
index 7d9d90e92a..d490e15528 100644
--- a/target/product/AndroidProducts.mk
+++ b/target/product/AndroidProducts.mk
@@ -67,6 +67,7 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/sdk_phone_armv7.mk \
     $(LOCAL_DIR)/sdk_phone_x86_64.mk \
     $(LOCAL_DIR)/sdk_phone_x86.mk \
+    $(LOCAL_DIR)/sdk_slim_x86_64.mk \
     $(LOCAL_DIR)/sdk_x86_64.mk \
     $(LOCAL_DIR)/sdk_x86.mk \
 
diff --git a/target/product/sdk_slim_x86_64.mk b/target/product/sdk_slim_x86_64.mk
new file mode 100644
index 0000000000..f9568593a8
--- /dev/null
+++ b/target/product/sdk_slim_x86_64.mk
@@ -0,0 +1,78 @@
+#
+# Copyright (C) 2021 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+QEMU_USE_SYSTEM_EXT_PARTITIONS := true
+PRODUCT_USE_DYNAMIC_PARTITIONS := true
+
+# This is a build configuration for the 'slim' image targeted
+# for headless automated testing. Compared to the full AOSP 'sdk_phone'
+# image it removes/replaces most product apps, and turns off rendering
+# by default.
+
+#
+# All components inherited here go to system image
+#
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
+
+# Enable mainline checking for exact this product name
+ifeq (sdk_slim_x86_64,$(TARGET_PRODUCT))
+PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
+endif
+
+#
+# All components inherited here go to system_ext image
+#
+# don't include full handheld_system_Ext which includes SystemUi, Settings etc
+$(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
+
+#
+# All components inherited here go to product image
+#
+# Just include webview, do not include most other apps
+$(call inherit-product, $(SRC_TARGET_DIR)/product/media_product.mk)
+
+# Include FakeSystemApp which replaces core system apps like Settings,
+# Launcher
+PRODUCT_PACKAGES += \
+    FakeSystemApp \
+
+#
+# All components inherited here go to vendor image
+#
+# this must go first - overwrites the goldfish handheld_core_hardware.xml
+$(call inherit-product, device/generic/goldfish/slim/vendor.mk)
+
+$(call inherit-product-if-exists, device/generic/goldfish/x86_64-vendor.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_x86_64/device.mk)
+
+# include the overlay that overrides systemui definitions with fakesystemapp
+DEVICE_PACKAGE_OVERLAYS := device/generic/goldfish/slim/overlay
+
+# Define the host tools and libs that are parts of the SDK.
+$(call inherit-product-if-exists, sdk/build/product_sdk.mk)
+$(call inherit-product-if-exists, development/build/product_sdk.mk)
+
+# Overrides
+PRODUCT_BRAND := Android
+PRODUCT_NAME := sdk_slim_x86_64
+PRODUCT_DEVICE := emulator_x86_64
+PRODUCT_MODEL := Android SDK built for x86_64
+# Disable <uses-library> checks for SDK product. It lacks some libraries (e.g.
+# RadioConfigLib), which makes it impossible to translate their module names to
+# library name, so the check fails.
+PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true

From 559c53dc1ce7b5ce1cfc000dd423e878b33e6d2d Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Fri, 16 Jul 2021 22:32:34 +0900
Subject: [PATCH 094/425] *-ndk.so libraries are added to the VNDK set.

We will replace the ndk_platform backend with the ndk backend. The
former hasn't been deleted yet because there already are references to
it. When the existing references are all replaced with the ndk backend,
we will remove the ndk_platform backend and the corresponding libraries
will be removed from this list.

Bug: 161456198
Test: m

Change-Id: Ia32d82d6e32c367bdf1f92151c7da7408e8bcbfa
---
 target/product/gsi/current.txt | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 3e43ed40bd..7ce465837d 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -18,8 +18,11 @@ LLNDK: libselinux.so
 LLNDK: libsync.so
 LLNDK: libvndksupport.so
 LLNDK: libvulkan.so
+VNDK-SP: android.hardware.common-V2-ndk.so
 VNDK-SP: android.hardware.common-V2-ndk_platform.so
+VNDK-SP: android.hardware.common.fmq-V1-ndk.so
 VNDK-SP: android.hardware.common.fmq-V1-ndk_platform.so
+VNDK-SP: android.hardware.graphics.common-V2-ndk.so
 VNDK-SP: android.hardware.graphics.common-V2-ndk_platform.so
 VNDK-SP: android.hardware.graphics.common@1.0.so
 VNDK-SP: android.hardware.graphics.common@1.1.so
@@ -57,43 +60,64 @@ VNDK-SP: libutils.so
 VNDK-SP: libutilscallstack.so
 VNDK-SP: libz.so
 VNDK-core: android.hardware.audio.common@2.0.so
+VNDK-core: android.hardware.authsecret-V1-ndk.so
 VNDK-core: android.hardware.authsecret-V1-ndk_platform.so
+VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk.so
 VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk_platform.so
 VNDK-core: android.hardware.configstore-utils.so
 VNDK-core: android.hardware.configstore@1.0.so
 VNDK-core: android.hardware.configstore@1.1.so
 VNDK-core: android.hardware.confirmationui-support-lib.so
+VNDK-core: android.hardware.gnss-V1-ndk.so
 VNDK-core: android.hardware.gnss-V1-ndk_platform.so
 VNDK-core: android.hardware.graphics.allocator@2.0.so
 VNDK-core: android.hardware.graphics.allocator@3.0.so
 VNDK-core: android.hardware.graphics.allocator@4.0.so
 VNDK-core: android.hardware.graphics.bufferqueue@1.0.so
 VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
+VNDK-core: android.hardware.health.storage-V1-ndk.so
 VNDK-core: android.hardware.health.storage-V1-ndk_platform.so
+VNDK-core: android.hardware.identity-V3-ndk.so
 VNDK-core: android.hardware.identity-V3-ndk_platform.so
+VNDK-core: android.hardware.keymaster-V3-ndk.so
 VNDK-core: android.hardware.keymaster-V3-ndk_platform.so
+VNDK-core: android.hardware.light-V1-ndk.so
 VNDK-core: android.hardware.light-V1-ndk_platform.so
 VNDK-core: android.hardware.media.bufferpool@2.0.so
 VNDK-core: android.hardware.media.omx@1.0.so
 VNDK-core: android.hardware.media@1.0.so
+VNDK-core: android.hardware.memtrack-V1-ndk.so
 VNDK-core: android.hardware.memtrack-V1-ndk_platform.so
 VNDK-core: android.hardware.memtrack@1.0.so
+VNDK-core: android.hardware.oemlock-V1-ndk.so
 VNDK-core: android.hardware.oemlock-V1-ndk_platform.so
+VNDK-core: android.hardware.power-V2-ndk.so
 VNDK-core: android.hardware.power-V2-ndk_platform.so
+VNDK-core: android.hardware.power.stats-V1-ndk.so
 VNDK-core: android.hardware.power.stats-V1-ndk_platform.so
+VNDK-core: android.hardware.rebootescrow-V1-ndk.so
 VNDK-core: android.hardware.rebootescrow-V1-ndk_platform.so
+VNDK-core: android.hardware.security.keymint-V1-ndk.so
 VNDK-core: android.hardware.security.keymint-V1-ndk_platform.so
+VNDK-core: android.hardware.security.secureclock-V1-ndk.so
 VNDK-core: android.hardware.security.secureclock-V1-ndk_platform.so
+VNDK-core: android.hardware.security.sharedsecret-V1-ndk.so
 VNDK-core: android.hardware.security.sharedsecret-V1-ndk_platform.so
+VNDK-core: android.hardware.soundtrigger3-V1-ndk.so
 VNDK-core: android.hardware.soundtrigger3-V1-ndk_platform.so
 VNDK-core: android.hardware.soundtrigger@2.0-core.so
 VNDK-core: android.hardware.soundtrigger@2.0.so
+VNDK-core: android.hardware.vibrator-V2-ndk.so
 VNDK-core: android.hardware.vibrator-V2-ndk_platform.so
+VNDK-core: android.hardware.weaver-V1-ndk.so
 VNDK-core: android.hardware.weaver-V1-ndk_platform.so
 VNDK-core: android.hidl.token@1.0-utils.so
 VNDK-core: android.hidl.token@1.0.so
+VNDK-core: android.media.audio.common.types-V1-ndk.so
 VNDK-core: android.media.audio.common.types-V1-ndk_platform.so
+VNDK-core: android.media.soundtrigger.types-V1-ndk.so
 VNDK-core: android.media.soundtrigger.types-V1-ndk_platform.so
+VNDK-core: android.system.keystore2-V1-ndk.so
 VNDK-core: android.system.keystore2-V1-ndk_platform.so
 VNDK-core: android.system.suspend@1.0.so
 VNDK-core: libaudioroute.so

From 0ee4b09e2039c7f05f89ac599a0139ff3e2a76d1 Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Mon, 19 Jul 2021 08:08:53 +0000
Subject: [PATCH 095/425] Revert "*-ndk.so libraries are added to the VNDK
 set."

Revert "Add more target-specific properties"

Revert submission 15310714-remove_ndk_platform

Reason for revert: b/193935495
Reverted Changes:
Ia87b2881e:NDK backends supports both apps and platform
Ia32d82d6e:*-ndk.so libraries are added to the VNDK set.
Ie54b512a6:Add more target-specific properties

Change-Id: I16f1894d7c37fff1c89c9cc168f84fd6054ace31
---
 target/product/gsi/current.txt | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 7ce465837d..3e43ed40bd 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -18,11 +18,8 @@ LLNDK: libselinux.so
 LLNDK: libsync.so
 LLNDK: libvndksupport.so
 LLNDK: libvulkan.so
-VNDK-SP: android.hardware.common-V2-ndk.so
 VNDK-SP: android.hardware.common-V2-ndk_platform.so
-VNDK-SP: android.hardware.common.fmq-V1-ndk.so
 VNDK-SP: android.hardware.common.fmq-V1-ndk_platform.so
-VNDK-SP: android.hardware.graphics.common-V2-ndk.so
 VNDK-SP: android.hardware.graphics.common-V2-ndk_platform.so
 VNDK-SP: android.hardware.graphics.common@1.0.so
 VNDK-SP: android.hardware.graphics.common@1.1.so
@@ -60,64 +57,43 @@ VNDK-SP: libutils.so
 VNDK-SP: libutilscallstack.so
 VNDK-SP: libz.so
 VNDK-core: android.hardware.audio.common@2.0.so
-VNDK-core: android.hardware.authsecret-V1-ndk.so
 VNDK-core: android.hardware.authsecret-V1-ndk_platform.so
-VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk.so
 VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk_platform.so
 VNDK-core: android.hardware.configstore-utils.so
 VNDK-core: android.hardware.configstore@1.0.so
 VNDK-core: android.hardware.configstore@1.1.so
 VNDK-core: android.hardware.confirmationui-support-lib.so
-VNDK-core: android.hardware.gnss-V1-ndk.so
 VNDK-core: android.hardware.gnss-V1-ndk_platform.so
 VNDK-core: android.hardware.graphics.allocator@2.0.so
 VNDK-core: android.hardware.graphics.allocator@3.0.so
 VNDK-core: android.hardware.graphics.allocator@4.0.so
 VNDK-core: android.hardware.graphics.bufferqueue@1.0.so
 VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
-VNDK-core: android.hardware.health.storage-V1-ndk.so
 VNDK-core: android.hardware.health.storage-V1-ndk_platform.so
-VNDK-core: android.hardware.identity-V3-ndk.so
 VNDK-core: android.hardware.identity-V3-ndk_platform.so
-VNDK-core: android.hardware.keymaster-V3-ndk.so
 VNDK-core: android.hardware.keymaster-V3-ndk_platform.so
-VNDK-core: android.hardware.light-V1-ndk.so
 VNDK-core: android.hardware.light-V1-ndk_platform.so
 VNDK-core: android.hardware.media.bufferpool@2.0.so
 VNDK-core: android.hardware.media.omx@1.0.so
 VNDK-core: android.hardware.media@1.0.so
-VNDK-core: android.hardware.memtrack-V1-ndk.so
 VNDK-core: android.hardware.memtrack-V1-ndk_platform.so
 VNDK-core: android.hardware.memtrack@1.0.so
-VNDK-core: android.hardware.oemlock-V1-ndk.so
 VNDK-core: android.hardware.oemlock-V1-ndk_platform.so
-VNDK-core: android.hardware.power-V2-ndk.so
 VNDK-core: android.hardware.power-V2-ndk_platform.so
-VNDK-core: android.hardware.power.stats-V1-ndk.so
 VNDK-core: android.hardware.power.stats-V1-ndk_platform.so
-VNDK-core: android.hardware.rebootescrow-V1-ndk.so
 VNDK-core: android.hardware.rebootescrow-V1-ndk_platform.so
-VNDK-core: android.hardware.security.keymint-V1-ndk.so
 VNDK-core: android.hardware.security.keymint-V1-ndk_platform.so
-VNDK-core: android.hardware.security.secureclock-V1-ndk.so
 VNDK-core: android.hardware.security.secureclock-V1-ndk_platform.so
-VNDK-core: android.hardware.security.sharedsecret-V1-ndk.so
 VNDK-core: android.hardware.security.sharedsecret-V1-ndk_platform.so
-VNDK-core: android.hardware.soundtrigger3-V1-ndk.so
 VNDK-core: android.hardware.soundtrigger3-V1-ndk_platform.so
 VNDK-core: android.hardware.soundtrigger@2.0-core.so
 VNDK-core: android.hardware.soundtrigger@2.0.so
-VNDK-core: android.hardware.vibrator-V2-ndk.so
 VNDK-core: android.hardware.vibrator-V2-ndk_platform.so
-VNDK-core: android.hardware.weaver-V1-ndk.so
 VNDK-core: android.hardware.weaver-V1-ndk_platform.so
 VNDK-core: android.hidl.token@1.0-utils.so
 VNDK-core: android.hidl.token@1.0.so
-VNDK-core: android.media.audio.common.types-V1-ndk.so
 VNDK-core: android.media.audio.common.types-V1-ndk_platform.so
-VNDK-core: android.media.soundtrigger.types-V1-ndk.so
 VNDK-core: android.media.soundtrigger.types-V1-ndk_platform.so
-VNDK-core: android.system.keystore2-V1-ndk.so
 VNDK-core: android.system.keystore2-V1-ndk_platform.so
 VNDK-core: android.system.suspend@1.0.so
 VNDK-core: libaudioroute.so

From 0ddf03e244f21072dad01235369d394104190b34 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 20 Jul 2021 14:11:20 -0700
Subject: [PATCH 096/425] Rename T to Tiramisu

PLATFORM_VERSION_CODENAME is being updated from T to Tiramisu.

Bug: 186121492
Bug: 194055070
Test: m checkbuild
Change-Id: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index cd3d999d48..973b3b88ed 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -93,7 +93,7 @@ PLATFORM_VERSION_LAST_STABLE := 12
 
 # These are the current development codenames, if the build is not a final
 # release build.  If this is a final release build, it is simply "REL".
-PLATFORM_VERSION_CODENAME.TP1A := T
+PLATFORM_VERSION_CODENAME.TP1A := Tiramisu
 
 ifndef PLATFORM_VERSION_CODENAME
   PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION))

From ebe0e060557b8ab3a72d0ac0353641acc93d52e8 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Fri, 16 Jul 2021 22:32:34 +0900
Subject: [PATCH 097/425] Reland: *-ndk.so libraries are added to the VNDK set.

We will replace the ndk_platform backend with the ndk backend. The
former hasn't been deleted yet because there already are references to
it. When the existing references are all replaced with the ndk backend,
we will remove the ndk_platform backend and the corresponding libraries
will be removed from this list.

Bug: 161456198
Test: m
Change-Id: I4c45fdfd64159370813c40c8fa5554744b630746
---
 target/product/gsi/current.txt | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 3e43ed40bd..7ce465837d 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -18,8 +18,11 @@ LLNDK: libselinux.so
 LLNDK: libsync.so
 LLNDK: libvndksupport.so
 LLNDK: libvulkan.so
+VNDK-SP: android.hardware.common-V2-ndk.so
 VNDK-SP: android.hardware.common-V2-ndk_platform.so
+VNDK-SP: android.hardware.common.fmq-V1-ndk.so
 VNDK-SP: android.hardware.common.fmq-V1-ndk_platform.so
+VNDK-SP: android.hardware.graphics.common-V2-ndk.so
 VNDK-SP: android.hardware.graphics.common-V2-ndk_platform.so
 VNDK-SP: android.hardware.graphics.common@1.0.so
 VNDK-SP: android.hardware.graphics.common@1.1.so
@@ -57,43 +60,64 @@ VNDK-SP: libutils.so
 VNDK-SP: libutilscallstack.so
 VNDK-SP: libz.so
 VNDK-core: android.hardware.audio.common@2.0.so
+VNDK-core: android.hardware.authsecret-V1-ndk.so
 VNDK-core: android.hardware.authsecret-V1-ndk_platform.so
+VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk.so
 VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk_platform.so
 VNDK-core: android.hardware.configstore-utils.so
 VNDK-core: android.hardware.configstore@1.0.so
 VNDK-core: android.hardware.configstore@1.1.so
 VNDK-core: android.hardware.confirmationui-support-lib.so
+VNDK-core: android.hardware.gnss-V1-ndk.so
 VNDK-core: android.hardware.gnss-V1-ndk_platform.so
 VNDK-core: android.hardware.graphics.allocator@2.0.so
 VNDK-core: android.hardware.graphics.allocator@3.0.so
 VNDK-core: android.hardware.graphics.allocator@4.0.so
 VNDK-core: android.hardware.graphics.bufferqueue@1.0.so
 VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
+VNDK-core: android.hardware.health.storage-V1-ndk.so
 VNDK-core: android.hardware.health.storage-V1-ndk_platform.so
+VNDK-core: android.hardware.identity-V3-ndk.so
 VNDK-core: android.hardware.identity-V3-ndk_platform.so
+VNDK-core: android.hardware.keymaster-V3-ndk.so
 VNDK-core: android.hardware.keymaster-V3-ndk_platform.so
+VNDK-core: android.hardware.light-V1-ndk.so
 VNDK-core: android.hardware.light-V1-ndk_platform.so
 VNDK-core: android.hardware.media.bufferpool@2.0.so
 VNDK-core: android.hardware.media.omx@1.0.so
 VNDK-core: android.hardware.media@1.0.so
+VNDK-core: android.hardware.memtrack-V1-ndk.so
 VNDK-core: android.hardware.memtrack-V1-ndk_platform.so
 VNDK-core: android.hardware.memtrack@1.0.so
+VNDK-core: android.hardware.oemlock-V1-ndk.so
 VNDK-core: android.hardware.oemlock-V1-ndk_platform.so
+VNDK-core: android.hardware.power-V2-ndk.so
 VNDK-core: android.hardware.power-V2-ndk_platform.so
+VNDK-core: android.hardware.power.stats-V1-ndk.so
 VNDK-core: android.hardware.power.stats-V1-ndk_platform.so
+VNDK-core: android.hardware.rebootescrow-V1-ndk.so
 VNDK-core: android.hardware.rebootescrow-V1-ndk_platform.so
+VNDK-core: android.hardware.security.keymint-V1-ndk.so
 VNDK-core: android.hardware.security.keymint-V1-ndk_platform.so
+VNDK-core: android.hardware.security.secureclock-V1-ndk.so
 VNDK-core: android.hardware.security.secureclock-V1-ndk_platform.so
+VNDK-core: android.hardware.security.sharedsecret-V1-ndk.so
 VNDK-core: android.hardware.security.sharedsecret-V1-ndk_platform.so
+VNDK-core: android.hardware.soundtrigger3-V1-ndk.so
 VNDK-core: android.hardware.soundtrigger3-V1-ndk_platform.so
 VNDK-core: android.hardware.soundtrigger@2.0-core.so
 VNDK-core: android.hardware.soundtrigger@2.0.so
+VNDK-core: android.hardware.vibrator-V2-ndk.so
 VNDK-core: android.hardware.vibrator-V2-ndk_platform.so
+VNDK-core: android.hardware.weaver-V1-ndk.so
 VNDK-core: android.hardware.weaver-V1-ndk_platform.so
 VNDK-core: android.hidl.token@1.0-utils.so
 VNDK-core: android.hidl.token@1.0.so
+VNDK-core: android.media.audio.common.types-V1-ndk.so
 VNDK-core: android.media.audio.common.types-V1-ndk_platform.so
+VNDK-core: android.media.soundtrigger.types-V1-ndk.so
 VNDK-core: android.media.soundtrigger.types-V1-ndk_platform.so
+VNDK-core: android.system.keystore2-V1-ndk.so
 VNDK-core: android.system.keystore2-V1-ndk_platform.so
 VNDK-core: android.system.suspend@1.0.so
 VNDK-core: libaudioroute.so

From 40fe95d1c131a71f95d5b470de7c98f169e382d5 Mon Sep 17 00:00:00 2001
From: Kalesh Singh <kaleshsingh@google.com>
Date: Tue, 20 Jul 2021 23:30:58 +0000
Subject: [PATCH 098/425] vndk-list: Add
 android.system.suspend-V1-ndk_platform.so

Bug: 170260236
Test: m
Change-Id: Ibebad08a196504da32d733213226de78a30f0cd1
(cherry picked from commit 43014449a5b7e5672451565376119e48004825c8)
---
 target/product/gsi/current.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 7ce465837d..2eaf4d7041 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -119,6 +119,7 @@ VNDK-core: android.media.soundtrigger.types-V1-ndk.so
 VNDK-core: android.media.soundtrigger.types-V1-ndk_platform.so
 VNDK-core: android.system.keystore2-V1-ndk.so
 VNDK-core: android.system.keystore2-V1-ndk_platform.so
+VNDK-core: android.system.suspend-V1-ndk_platform.so
 VNDK-core: android.system.suspend@1.0.so
 VNDK-core: libaudioroute.so
 VNDK-core: libaudioutils.so

From 980089dab423d3aa99f0833147e51955c4990e44 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 23 Jul 2021 14:56:59 -0700
Subject: [PATCH 099/425] Fix build

Test: m out/target/product/bramble/obj/PACKAGING/vndk_intermediates/check-list-timestamp
Change-Id: I5745e9deb6eb6786fe4084a5b8e92925b70a8551
---
 target/product/gsi/current.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 2eaf4d7041..6896801e43 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -119,6 +119,7 @@ VNDK-core: android.media.soundtrigger.types-V1-ndk.so
 VNDK-core: android.media.soundtrigger.types-V1-ndk_platform.so
 VNDK-core: android.system.keystore2-V1-ndk.so
 VNDK-core: android.system.keystore2-V1-ndk_platform.so
+VNDK-core: android.system.suspend-V1-ndk.so
 VNDK-core: android.system.suspend-V1-ndk_platform.so
 VNDK-core: android.system.suspend@1.0.so
 VNDK-core: libaudioroute.so

From 009a105ba0c4c7dd1656f12d5a6e78636acd03dc Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Tue, 27 Jul 2021 12:32:40 +0100
Subject: [PATCH 100/425] Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to
 PRODUCT_APEX_SYSTEM_SERVER_JARS.

Regardless of an "updatable" property, list all apex jars in the same
variable. This is less confusing for devs and matches the pattern with
PRODUCT_APEX_BOOT_JARS.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I3b12f26237636f4271cb000480928b3ce1c2e62f
---
 core/dex_preopt_config.mk            | 2 +-
 core/dex_preopt_odex_install.mk      | 2 +-
 core/product.mk                      | 2 +-
 target/product/default_art_config.mk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index 63b32e710a..a75b220a7e 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -108,7 +108,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
   $(call add_json_list, ArtApexJars,                             $(filter $(PRODUCT_BOOT_JARS),$(ART_APEX_JARS)))
   $(call add_json_list, SystemServerJars,                        $(PRODUCT_SYSTEM_SERVER_JARS))
   $(call add_json_list, SystemServerApps,                        $(PRODUCT_SYSTEM_SERVER_APPS))
-  $(call add_json_list, UpdatableSystemServerJars,               $(PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS))
+  $(call add_json_list, UpdatableSystemServerJars,               $(PRODUCT_APEX_SYSTEM_SERVER_JARS))
   $(call add_json_bool, BrokenSuboptimalOrderOfSystemServerJars, $(PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_JARS))
   $(call add_json_list, SpeedApps,                               $(PRODUCT_DEXPREOPT_SPEED_APPS))
   $(call add_json_list, PreoptFlags,                             $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS))
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index fcdfa8283e..1d16eab5df 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -61,7 +61,7 @@ ifeq (,$(strip $(built_dex)$(my_prebuilt_src_file)$(LOCAL_SOONG_DEX_JAR)))
 endif
 
 # Don't preopt system server jars that are updatable.
-ifneq (,$(filter %:$(LOCAL_MODULE), $(PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS)))
+ifneq (,$(filter %:$(LOCAL_MODULE), $(PRODUCT_APEX_SYSTEM_SERVER_JARS)))
   LOCAL_DEX_PREOPT :=
 endif
 
diff --git a/core/product.mk b/core/product.mk
index a87e287e12..f6347e829b 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -234,7 +234,7 @@ _product_single_value_vars += PRODUCT_SUPPORTS_VERITY_FEC
 _product_list_vars += PRODUCT_SYSTEM_SERVER_APPS
 _product_list_vars += PRODUCT_SYSTEM_SERVER_JARS
 # List of system_server jars delivered via apex. Format = <apex name>:<jar name>.
-_product_list_vars += PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
+_product_list_vars += PRODUCT_APEX_SYSTEM_SERVER_JARS
 # If true, then suboptimal order of system server jars does not cause an error.
 _product_single_value_vars += PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_JARS
 
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 07f5438bb2..e291f592d6 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -64,7 +64,7 @@ PRODUCT_APEX_BOOT_JARS := \
     com.android.wifi:framework-wifi
 
 # APEX system server jars. Keep the list sorted by module names and then library names.
-PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
+PRODUCT_APEX_SYSTEM_SERVER_JARS := \
     com.android.appsearch:service-appsearch \
     com.android.art:service-art \
     com.android.media:service-media-s \

From 4a3d2a054165f094b2f16fad56f53b8a554fbb15 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 29 Jul 2021 17:18:57 +0000
Subject: [PATCH 101/425] Version bump to TP1A.210729.002 [core/build_id.mk]

Change-Id: If26d02f8f985f49acedfdff2d51c272a9baaeeef
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 826d1ce4aa..9e3675de6f 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=TP1A.210729.001
+BUILD_ID=TP1A.210729.002

From 8b49c341f4465f1f96cc5b5f42b5d2ba02804559 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 3 Aug 2021 14:41:02 +0000
Subject: [PATCH 102/425] Version bump to TP1A.210803.002 [core/build_id.mk]

Change-Id: I6f3b352bd27642e2819ea9964f21221e45b7cb61
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 91b36295dc..8fe3bcc4ed 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=TP1A.210803.001
+BUILD_ID=TP1A.210803.002

From 2ed505c2545ee377521dc37660898aeffd4b8348 Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Tue, 15 Jun 2021 11:35:40 +0100
Subject: [PATCH 103/425] Move core-icu4j to PRODUCT_UPDATABLE_BOOT_JARS.

... but not really: move it back to PRODUCT_BOOT_JARS before the list is
passed to soong. This ensures that core-icu4j remains on the boot image
for system health reasons and maintains the status quo.

core-icu4j is the only APEX jar (aside from ART jars) that is ever meant
to be part of the boot image. This is an implementation detail that most
devs don't and shouldn't care about. Instead, most devs assume that
PRODUCT_UPDATABLE_BOOT_JARS is where all apex jars are meant to go. In
the follow ups, PRODUCT_UPDATABLE_BOOT_JARS would be renamed to
PRODUCT_APEX_BOOT_JARS, regardless of the updatable property.

This also solves the problem where vendors add /system and /system_ext
boot jars to PRODUCT_BOOT_JARS outside of default_art_config.mk and
essentially violate the ordering requirement: all /apex jars come after
/system and /system_ext.

Bug: 191127295
Test: atest CtsClasspathsTestCases derive_classpath_test
Change-Id: Ifdfdd02519a0f5baea45619523f0c1eb8be186bc
Merged-In: Ifdfdd02519a0f5baea45619523f0c1eb8be186bc
---
 core/product_config.mk               |  9 +++++++++
 target/product/default_art_config.mk | 10 ++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/core/product_config.mk b/core/product_config.mk
index 5c85fb85f1..53bc9dd48a 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -249,6 +249,15 @@ PRODUCT_BOOT_JARS += $(PRODUCT_BOOT_JARS_EXTRA)
 
 PRODUCT_BOOT_JARS := $(call qualify-platform-jars,$(PRODUCT_BOOT_JARS))
 
+# b/191127295: force core-icu4j onto boot image. It comes from a non-updatable APEX jar, but has
+# historically been part of the boot image; even though APEX jars are not meant to be part of the
+# boot image.
+# TODO(b/191686720): remove PRODUCT_UPDATABLE_BOOT_JARS to avoid a special handling of core-icu4j
+# in make rules.
+PRODUCT_UPDATABLE_BOOT_JARS := $(filter-out com.android.i18n:core-icu4j,$(PRODUCT_UPDATABLE_BOOT_JARS))
+# All APEX jars come after /system and /system_ext jars, so adding core-icu4j at the end of the list
+PRODUCT_BOOT_JARS += com.android.i18n:core-icu4j
+
 # Replaces references to overridden boot jar modules in a boot jars variable.
 # $(1): Name of a boot jars variable with <apex>:<jar> pairs.
 define replace-boot-jar-module-overrides
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 0fa9058f0b..7eb8c68f2c 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -45,14 +45,12 @@ PRODUCT_BOOT_JARS += \
     voip-common \
     ims-common
 
-# Non-updatable APEX jars. Keep the list sorted.
-PRODUCT_BOOT_JARS += \
-    com.android.i18n:core-icu4j
-
-# Updatable APEX boot jars. Keep the list sorted by module names and then library names.
+# APEX boot jars. Keep the list sorted by module names and then library names.
+# Note: core-icu4j is moved back to PRODUCT_BOOT_JARS in product_config.mk at a later stage.
 PRODUCT_UPDATABLE_BOOT_JARS := \
     com.android.appsearch:framework-appsearch \
     com.android.conscrypt:conscrypt \
+    com.android.i18n:core-icu4j \
     com.android.ipsec:android.net.ipsec.ike \
     com.android.media:updatable-media \
     com.android.mediaprovider:framework-mediaprovider \
@@ -65,7 +63,7 @@ PRODUCT_UPDATABLE_BOOT_JARS := \
     com.android.tethering:framework-tethering \
     com.android.wifi:framework-wifi
 
-# Updatable APEX system server jars. Keep the list sorted by module names and then library names.
+# APEX system server jars. Keep the list sorted by module names and then library names.
 PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
     com.android.appsearch:service-appsearch \
     com.android.media:service-media-s \

From 258a8c54d8db49eb30b7da998061d94a0eef8ee7 Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Thu, 15 Jul 2021 18:19:56 +0100
Subject: [PATCH 104/425] Rename PRODUCT_UPDATABLE_BOOT_JARS to
 PRODUCT_APEX_BOOT_JARS.

Regardless of an "updatable" property of individual, list all apex boot
jars in the same variable. This is less confusing for devs, especially
since they shouldn't care about things like boot images.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I0a559db462d1e1f67003ac54d1e27a89110d802a
Merged-In: I0a559db462d1e1f67003ac54d1e27a89110d802a
---
 core/dex_preopt_config.mk            |  2 +-
 core/product.mk                      |  7 ++++---
 core/product_config.mk               | 10 +++++-----
 core/soong_config.mk                 |  2 +-
 target/product/default_art_config.mk |  4 ++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index 51238a36ca..e8bcdb82c1 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -104,7 +104,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
   $(call add_json_bool, DisableGenerateProfile,                  $(filter false,$(WITH_DEX_PREOPT_GENERATE_PROFILE)))
   $(call add_json_str,  ProfileDir,                              $(PRODUCT_DEX_PREOPT_PROFILE_DIR))
   $(call add_json_list, BootJars,                                $(PRODUCT_BOOT_JARS))
-  $(call add_json_list, UpdatableBootJars,                       $(PRODUCT_UPDATABLE_BOOT_JARS))
+  $(call add_json_list, UpdatableBootJars,                       $(PRODUCT_APEX_BOOT_JARS))
   $(call add_json_list, ArtApexJars,                             $(filter $(PRODUCT_BOOT_JARS),$(ART_APEX_JARS)))
   $(call add_json_list, SystemServerJars,                        $(PRODUCT_SYSTEM_SERVER_JARS))
   $(call add_json_list, SystemServerApps,                        $(PRODUCT_SYSTEM_SERVER_APPS))
diff --git a/core/product.mk b/core/product.mk
index 015fe44ba9..2a7084be44 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -368,7 +368,7 @@ _product_list_vars += PRODUCT_CERTIFICATE_OVERRIDES
 
 # A list of <overridden-apex>:<override-apex> pairs that specifies APEX module
 # overrides to be applied to the APEX names in the boot jar variables
-# (PRODUCT_BOOT_JARS, PRODUCT_UPDATABLE_BOOT_JARS etc).
+# (PRODUCT_BOOT_JARS, PRODUCT_APEX_BOOT_JARS etc).
 _product_list_vars += PRODUCT_BOOT_JAR_MODULE_OVERRIDES
 
 # Controls for whether different partitions are built for the current product.
@@ -389,8 +389,9 @@ _product_single_value_vars += PRODUCT_BUILD_VENDOR_BOOT_IMAGE
 _product_single_value_vars += PRODUCT_BUILD_VBMETA_IMAGE
 _product_single_value_vars += PRODUCT_BUILD_SUPER_EMPTY_IMAGE
 
-# List of boot jars delivered via apex
-_product_list_vars += PRODUCT_UPDATABLE_BOOT_JARS
+# List of boot jars delivered via updatable APEXes, following the same format as
+# PRODUCT_BOOT_JARS.
+_product_list_vars += PRODUCT_APEX_BOOT_JARS
 
 # If set, device uses virtual A/B.
 _product_single_value_vars += PRODUCT_VIRTUAL_AB_OTA
diff --git a/core/product_config.mk b/core/product_config.mk
index 53bc9dd48a..a9f3d34efb 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -252,9 +252,9 @@ PRODUCT_BOOT_JARS := $(call qualify-platform-jars,$(PRODUCT_BOOT_JARS))
 # b/191127295: force core-icu4j onto boot image. It comes from a non-updatable APEX jar, but has
 # historically been part of the boot image; even though APEX jars are not meant to be part of the
 # boot image.
-# TODO(b/191686720): remove PRODUCT_UPDATABLE_BOOT_JARS to avoid a special handling of core-icu4j
+# TODO(b/191686720): remove PRODUCT_APEX_BOOT_JARS to avoid a special handling of core-icu4j
 # in make rules.
-PRODUCT_UPDATABLE_BOOT_JARS := $(filter-out com.android.i18n:core-icu4j,$(PRODUCT_UPDATABLE_BOOT_JARS))
+PRODUCT_APEX_BOOT_JARS := $(filter-out com.android.i18n:core-icu4j,$(PRODUCT_APEX_BOOT_JARS))
 # All APEX jars come after /system and /system_ext jars, so adding core-icu4j at the end of the list
 PRODUCT_BOOT_JARS += com.android.i18n:core-icu4j
 
@@ -268,7 +268,7 @@ define replace-boot-jar-module-overrides
 endef
 
 $(call replace-boot-jar-module-overrides,PRODUCT_BOOT_JARS)
-$(call replace-boot-jar-module-overrides,PRODUCT_UPDATABLE_BOOT_JARS)
+$(call replace-boot-jar-module-overrides,PRODUCT_APEX_BOOT_JARS)
 $(call replace-boot-jar-module-overrides,ART_APEX_JARS)
 
 # The extra system server jars must be appended at the end after common system server jars.
@@ -312,10 +312,10 @@ ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE
   endif
 endif
 
-$(foreach pair,$(PRODUCT_UPDATABLE_BOOT_JARS), \
+$(foreach pair,$(PRODUCT_APEX_BOOT_JARS), \
   $(eval jar := $(call word-colon,2,$(pair))) \
   $(if $(findstring $(jar), $(PRODUCT_BOOT_JARS)), \
-    $(error A jar in PRODUCT_UPDATABLE_BOOT_JARS must not be in PRODUCT_BOOT_JARS, but $(jar) is)))
+    $(error A jar in PRODUCT_APEX_BOOT_JARS must not be in PRODUCT_BOOT_JARS, but $(jar) is)))
 
 ENFORCE_SYSTEM_CERTIFICATE := $(PRODUCT_ENFORCE_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT)
 ENFORCE_SYSTEM_CERTIFICATE_ALLOW_LIST := $(PRODUCT_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT_ALLOW_LIST)
diff --git a/core/soong_config.mk b/core/soong_config.mk
index ec67560aa0..bfa038913f 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -141,7 +141,7 @@ $(call add_json_bool, UncompressPrivAppDex,              $(call invert_bool,$(fi
 $(call add_json_list, ModulesLoadedByPrivilegedModules,  $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))
 
 $(call add_json_list, BootJars,                          $(PRODUCT_BOOT_JARS))
-$(call add_json_list, UpdatableBootJars,                 $(PRODUCT_UPDATABLE_BOOT_JARS))
+$(call add_json_list, UpdatableBootJars,                 $(PRODUCT_APEX_BOOT_JARS))
 
 $(call add_json_bool, VndkUseCoreVariant,                $(TARGET_VNDK_USE_CORE_VARIANT))
 $(call add_json_bool, VndkSnapshotBuildArtifacts,        $(VNDK_SNAPSHOT_BUILD_ARTIFACTS))
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 7eb8c68f2c..e0dafb6ee5 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -27,7 +27,7 @@ endif
 #
 # ART APEX jars (1) are defined in ART_APEX_JARS. System, system_ext, and non updatable boot jars
 # are defined below in PRODUCT_BOOT_JARS. All updatable APEX boot jars are part of
-# PRODUCT_UPDATABLE_BOOT_JARS.
+# PRODUCT_APEX_BOOT_JARS.
 #
 # The actual runtime ordering matching above is determined by derive_classpath service at runtime.
 # See packages/modules/SdkExtensions/README.md for more details.
@@ -47,7 +47,7 @@ PRODUCT_BOOT_JARS += \
 
 # APEX boot jars. Keep the list sorted by module names and then library names.
 # Note: core-icu4j is moved back to PRODUCT_BOOT_JARS in product_config.mk at a later stage.
-PRODUCT_UPDATABLE_BOOT_JARS := \
+PRODUCT_APEX_BOOT_JARS := \
     com.android.appsearch:framework-appsearch \
     com.android.conscrypt:conscrypt \
     com.android.i18n:core-icu4j \

From ff3051aeb214bb35025c04dd566ed87a2fa7c876 Mon Sep 17 00:00:00 2001
From: Hajime Morrita <morrita@google.com>
Date: Thu, 5 Aug 2021 13:07:58 -0700
Subject: [PATCH 105/425] Remove iorap_large_memory_config.mk

Test: Presubmit
Bug: 195415601
Change-Id: I374a2743cbc7dc128becb9c8d59eb007c910070a
---
 target/product/iorap_large_memory_config.mk | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 target/product/iorap_large_memory_config.mk

diff --git a/target/product/iorap_large_memory_config.mk b/target/product/iorap_large_memory_config.mk
deleted file mode 100644
index 0c6c89af93..0000000000
--- a/target/product/iorap_large_memory_config.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2020 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#

From 4a0b3682ecce5cab4d4f5d57e831ff9b2c0d0c19 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 6 Aug 2021 15:29:15 +0000
Subject: [PATCH 106/425] Version bump to TP1A.210806.002 [core/build_id.mk]

Change-Id: I010fc66e7b49742fc575fcd24b7bbbc877f5d558
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 8df81c2e4a..15147aeda8 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=TP1A.210806.001
+BUILD_ID=TP1A.210806.002

From 88920a431f4446cb971fceec67adf98a6245652f Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Mon, 9 Aug 2021 21:59:06 -0700
Subject: [PATCH 107/425] Add uwb HAL ndk to gsi

Bug: 195308730
Test: Compiles
Change-Id: I43911c9a8e37dde278fe4616fbb5142ab2218b2a
---
 target/product/gsi/current.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 6896801e43..c0b5387d4a 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -107,6 +107,8 @@ VNDK-core: android.hardware.soundtrigger3-V1-ndk.so
 VNDK-core: android.hardware.soundtrigger3-V1-ndk_platform.so
 VNDK-core: android.hardware.soundtrigger@2.0-core.so
 VNDK-core: android.hardware.soundtrigger@2.0.so
+VNDK-core: android.hardware.uwb-V1-ndk.so
+VNDK-core: android.hardware.uwb-V1-ndk_platform.so
 VNDK-core: android.hardware.vibrator-V2-ndk.so
 VNDK-core: android.hardware.vibrator-V2-ndk_platform.so
 VNDK-core: android.hardware.weaver-V1-ndk.so

From 522c8b10bf702423a64b59f266e71023da9493a1 Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Wed, 21 Jul 2021 14:14:44 +0100
Subject: [PATCH 108/425] Rename UpdatableBootJars to ApexBootJars.

Note that ART apex boot jars and core-icu4j are exceptions here as they
are not part of ApexBootJars. ART apex boot jars are defined in their
own variable, while core-icu4j is treated as a regular non-updatable
boot jar.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I5f5feb7344941d0154f384e3c06279d49b490768
Merged-In: I5f5feb7344941d0154f384e3c06279d49b490768
---
 core/dex_preopt_config.mk | 2 +-
 core/soong_config.mk      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index e8bcdb82c1..63b32e710a 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -104,7 +104,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
   $(call add_json_bool, DisableGenerateProfile,                  $(filter false,$(WITH_DEX_PREOPT_GENERATE_PROFILE)))
   $(call add_json_str,  ProfileDir,                              $(PRODUCT_DEX_PREOPT_PROFILE_DIR))
   $(call add_json_list, BootJars,                                $(PRODUCT_BOOT_JARS))
-  $(call add_json_list, UpdatableBootJars,                       $(PRODUCT_APEX_BOOT_JARS))
+  $(call add_json_list, ApexBootJars,                            $(PRODUCT_APEX_BOOT_JARS))
   $(call add_json_list, ArtApexJars,                             $(filter $(PRODUCT_BOOT_JARS),$(ART_APEX_JARS)))
   $(call add_json_list, SystemServerJars,                        $(PRODUCT_SYSTEM_SERVER_JARS))
   $(call add_json_list, SystemServerApps,                        $(PRODUCT_SYSTEM_SERVER_APPS))
diff --git a/core/soong_config.mk b/core/soong_config.mk
index bfa038913f..66cd47edfc 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -141,7 +141,7 @@ $(call add_json_bool, UncompressPrivAppDex,              $(call invert_bool,$(fi
 $(call add_json_list, ModulesLoadedByPrivilegedModules,  $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))
 
 $(call add_json_list, BootJars,                          $(PRODUCT_BOOT_JARS))
-$(call add_json_list, UpdatableBootJars,                 $(PRODUCT_APEX_BOOT_JARS))
+$(call add_json_list, ApexBootJars,                      $(PRODUCT_APEX_BOOT_JARS))
 
 $(call add_json_bool, VndkUseCoreVariant,                $(TARGET_VNDK_USE_CORE_VARIANT))
 $(call add_json_bool, VndkSnapshotBuildArtifacts,        $(VNDK_SNAPSHOT_BUILD_ARTIFACTS))

From 7a21f07339d9fe7aabe391c464cf048cc4589ec6 Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Tue, 27 Jul 2021 12:32:40 +0100
Subject: [PATCH 109/425] Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to
 PRODUCT_APEX_SYSTEM_SERVER_JARS.

Regardless of an "updatable" property, list all apex jars in the same
variable. This is less confusing for devs and matches the pattern with
PRODUCT_APEX_BOOT_JARS.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I3b12f26237636f4271cb000480928b3ce1c2e62f
Merged-In: I3b12f26237636f4271cb000480928b3ce1c2e62f
---
 core/dex_preopt_config.mk            | 2 +-
 core/dex_preopt_odex_install.mk      | 2 +-
 core/product.mk                      | 2 +-
 target/product/default_art_config.mk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index 63b32e710a..a75b220a7e 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -108,7 +108,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
   $(call add_json_list, ArtApexJars,                             $(filter $(PRODUCT_BOOT_JARS),$(ART_APEX_JARS)))
   $(call add_json_list, SystemServerJars,                        $(PRODUCT_SYSTEM_SERVER_JARS))
   $(call add_json_list, SystemServerApps,                        $(PRODUCT_SYSTEM_SERVER_APPS))
-  $(call add_json_list, UpdatableSystemServerJars,               $(PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS))
+  $(call add_json_list, UpdatableSystemServerJars,               $(PRODUCT_APEX_SYSTEM_SERVER_JARS))
   $(call add_json_bool, BrokenSuboptimalOrderOfSystemServerJars, $(PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_JARS))
   $(call add_json_list, SpeedApps,                               $(PRODUCT_DEXPREOPT_SPEED_APPS))
   $(call add_json_list, PreoptFlags,                             $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS))
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index a2837f3504..1983022b5b 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -61,7 +61,7 @@ ifeq (,$(strip $(built_dex)$(my_prebuilt_src_file)$(LOCAL_SOONG_DEX_JAR)))
 endif
 
 # Don't preopt system server jars that are updatable.
-ifneq (,$(filter %:$(LOCAL_MODULE), $(PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS)))
+ifneq (,$(filter %:$(LOCAL_MODULE), $(PRODUCT_APEX_SYSTEM_SERVER_JARS)))
   LOCAL_DEX_PREOPT :=
 endif
 
diff --git a/core/product.mk b/core/product.mk
index 2a7084be44..eb99a9be46 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -228,7 +228,7 @@ _product_single_value_vars += PRODUCT_SUPPORTS_VERITY_FEC
 _product_list_vars += PRODUCT_SYSTEM_SERVER_APPS
 _product_list_vars += PRODUCT_SYSTEM_SERVER_JARS
 # List of system_server jars delivered via apex. Format = <apex name>:<jar name>.
-_product_list_vars += PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
+_product_list_vars += PRODUCT_APEX_SYSTEM_SERVER_JARS
 # If true, then suboptimal order of system server jars does not cause an error.
 _product_single_value_vars += PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_JARS
 
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index e0dafb6ee5..1a32fd9258 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -64,7 +64,7 @@ PRODUCT_APEX_BOOT_JARS := \
     com.android.wifi:framework-wifi
 
 # APEX system server jars. Keep the list sorted by module names and then library names.
-PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
+PRODUCT_APEX_SYSTEM_SERVER_JARS := \
     com.android.appsearch:service-appsearch \
     com.android.media:service-media-s \
     com.android.permission:service-permission \

From 8c14a5e254df514bb606c8d0f9f053daca65e8b1 Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Wed, 28 Jul 2021 14:03:57 +0100
Subject: [PATCH 110/425] Rename UpdatableSystemServerJars to
 ApexSystemServerJars.

This is consistent with naming for boot jars, e.g. ApexBootJars.

Bug: 191127295
Test: presubmit
Change-Id: I1d4378e0d2dc73af2ffd8c4cc66ab8c0e2981d2f
Merged-In: I1d4378e0d2dc73af2ffd8c4cc66ab8c0e2981d2f
---
 core/dex_preopt_config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index a75b220a7e..0c806c1852 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -108,7 +108,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
   $(call add_json_list, ArtApexJars,                             $(filter $(PRODUCT_BOOT_JARS),$(ART_APEX_JARS)))
   $(call add_json_list, SystemServerJars,                        $(PRODUCT_SYSTEM_SERVER_JARS))
   $(call add_json_list, SystemServerApps,                        $(PRODUCT_SYSTEM_SERVER_APPS))
-  $(call add_json_list, UpdatableSystemServerJars,               $(PRODUCT_APEX_SYSTEM_SERVER_JARS))
+  $(call add_json_list, ApexSystemServerJars,                    $(PRODUCT_APEX_SYSTEM_SERVER_JARS))
   $(call add_json_bool, BrokenSuboptimalOrderOfSystemServerJars, $(PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_JARS))
   $(call add_json_list, SpeedApps,                               $(PRODUCT_DEXPREOPT_SPEED_APPS))
   $(call add_json_list, PreoptFlags,                             $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS))

From 4ae4381fcc62913627a5394bc4569be7bcc4a323 Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Thu, 29 Jul 2021 21:34:53 -0700
Subject: [PATCH 111/425] Add uwb apex/jars to top level makefiles

Bug: 194906542
Test: Compiles
Change-Id: I214f9487fd8cb5da4df24b32d3378fb083b79281
---
 target/product/base_system.mk        | 1 +
 target/product/default_art_config.mk | 1 +
 2 files changed, 2 insertions(+)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index b5739b775c..6132bf772b 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -69,6 +69,7 @@ PRODUCT_PACKAGES += \
     com.android.sdkext \
     com.android.tethering \
     com.android.tzdata \
+    com.android.uwb \
     com.android.wifi \
     ContactsProvider \
     content \
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index e291f592d6..049c1365ec 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -61,6 +61,7 @@ PRODUCT_APEX_BOOT_JARS := \
     com.android.sdkext:framework-sdkextensions \
     com.android.tethering:framework-connectivity \
     com.android.tethering:framework-tethering \
+    com.android.uwb:framework-uwb \
     com.android.wifi:framework-wifi
 
 # APEX system server jars. Keep the list sorted by module names and then library names.

From ef24da16ec55e74eccb69b0194dc33e1e8c8f636 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 12 Aug 2021 20:26:58 +0000
Subject: [PATCH 112/425] Version bump to TP1A.210812.002 [core/build_id.mk]

Change-Id: I35951ef4eb1ee3bfbccd0430b4227b3c580e5dc1
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index abfe0cc43a..b8e4b9016b 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=TP1A.210812.001
+BUILD_ID=TP1A.210812.002

From bd16ada6a50092a4ceb4fedb01bbcc13e7a06eb6 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 26 Aug 2021 17:04:01 +0100
Subject: [PATCH 113/425] Add new make variables for extension SDK version

- PLATFORM_SDK_EXTENSION_VERSION is the sdk extension version of the
  tree
- PLATFORM_BASE_SDK_EXTENSION_VERSION is the sdk extension version that
  PLATFORM_SDK_VERSION ships with.

Also propagate PLATFORM_SDK_EXTENSION_VERSION to soong to that it can be
used in genrules.

Bug: 195281582
Test: via development/ CL in this topic
Change-Id: Ib078a922e9bd9bc6ae82ab74feaeb743703a64b8
Merged-In: Ib078a922e9bd9bc6ae82ab74feaeb743703a64b8
(cherry picked from commit ee524aa4f7bae2cc4d32eec3689aecf3e766dec4)
---
 core/soong_config.mk     | 1 +
 core/version_defaults.mk | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 66cd47edfc..e0fd9becc3 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -27,6 +27,7 @@ $(call add_json_str,  Platform_version_name,             $(PLATFORM_VERSION))
 $(call add_json_val,  Platform_sdk_version,              $(PLATFORM_SDK_VERSION))
 $(call add_json_str,  Platform_sdk_codename,             $(PLATFORM_VERSION_CODENAME))
 $(call add_json_bool, Platform_sdk_final,                $(filter REL,$(PLATFORM_VERSION_CODENAME)))
+$(call add_json_val,  Platform_sdk_extension_version,    $(PLATFORM_SDK_EXTENSION_VERSION))
 $(call add_json_csv,  Platform_version_active_codenames, $(PLATFORM_VERSION_ALL_CODENAMES))
 $(call add_json_str,  Platform_security_patch,           $(PLATFORM_SECURITY_PATCH))
 $(call add_json_str,  Platform_preview_sdk_version,      $(PLATFORM_PREVIEW_SDK_VERSION))
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 85f63c906c..b4329f7ebe 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -155,6 +155,12 @@ ifndef PLATFORM_SDK_VERSION
 endif
 .KATI_READONLY := PLATFORM_SDK_VERSION
 
+# This is the sdk extension version of this tree.
+PLATFORM_SDK_EXTENSION_VERSION :=$= 1
+
+# This is the sdk extension version that PLATFORM_SDK_VERSION ships with.
+PLATFORM_BASE_SDK_EXTENSION_VERSION :=$= 0
+
 ifeq (REL,$(PLATFORM_VERSION_CODENAME))
   PLATFORM_PREVIEW_SDK_VERSION := 0
 else

From 2e5ff38e62a527207fc992266c575e63d98001d6 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 1 Sep 2021 23:15:12 +0000
Subject: [PATCH 114/425] Version bump to TP1A.210901.002 [core/build_id.mk]

Change-Id: I66b4dee7aa94b9d7c829ff00cb15f0a0e6de6d1b
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 5ddb749d7f..be091767ef 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=TP1A.210901.001
+BUILD_ID=TP1A.210901.002

From 37f0cebe6dfc9ac34b9542bd471aa5a5268e2fe6 Mon Sep 17 00:00:00 2001
From: Sarah Chin <sarahchin@google.com>
Date: Wed, 16 Jun 2021 15:58:35 -0700
Subject: [PATCH 115/425] Add Radio AIDL to VNDK

Test: build
Bug: 198331182
Change-Id: I95d089fb23c4a3baa7f7a6c1435099f34a1af5a3
---
 target/product/gsi/current.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index c0b5387d4a..c7ca178e11 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -95,6 +95,8 @@ VNDK-core: android.hardware.power-V2-ndk.so
 VNDK-core: android.hardware.power-V2-ndk_platform.so
 VNDK-core: android.hardware.power.stats-V1-ndk.so
 VNDK-core: android.hardware.power.stats-V1-ndk_platform.so
+VNDK-core: android.hardware.radio-V1-ndk.so
+VNDK-core: android.hardware.radio-V1-ndk_platform.so
 VNDK-core: android.hardware.rebootescrow-V1-ndk.so
 VNDK-core: android.hardware.rebootescrow-V1-ndk_platform.so
 VNDK-core: android.hardware.security.keymint-V1-ndk.so

From e2ee9bc7fac7ecb84e8b8494350edf3740aab2ca Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@google.com>
Date: Wed, 18 Aug 2021 22:29:57 +0100
Subject: [PATCH 116/425] Allow overriding SOONG_CONFIG_art_module_source_build
 to false.

Useful for local testing etc.

Test: env SOONG_CONFIG_art_module_source_build=false \
          MODULE_BUILD_FROM_SOURCE=true \
        build/soong/soong_ui.bash \
          --dumpvar-mode SOONG_CONFIG_art_module_source_build
  return false
Bug: 172480615
Change-Id: I50187408a01e0c6f5ecea12fe3a423e1c5d93612
---
 core/android_soong_config_vars.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 6fb14cd93c..6a0deaeb32 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -44,7 +44,9 @@ ifeq (,$(filter art_module,$(SOONG_CONFIG_NAMESPACES)))
   $(call add_soong_config_namespace,art_module)
   SOONG_CONFIG_art_module += source_build
 endif
-ifneq (,$(findstring .android.art,$(TARGET_BUILD_APPS)))
+ifneq (,$(SOONG_CONFIG_art_module_source_build))
+  # Keep an explicit setting.
+else ifneq (,$(findstring .android.art,$(TARGET_BUILD_APPS)))
   # Build ART modules from source if they are listed in TARGET_BUILD_APPS.
   SOONG_CONFIG_art_module_source_build := true
 else ifeq (,$(filter-out modules_% mainline_modules_%,$(TARGET_PRODUCT)))

From 0447622dc3b1507365b2dd7e5ce32a6067651bc5 Mon Sep 17 00:00:00 2001
From: Sasha Smundak <asmundak@google.com>
Date: Sun, 5 Sep 2021 19:06:18 -0700
Subject: [PATCH 117/425] Move the stable code from version_defaults.mk to
 version_util.mk.

With version_defaults.mk containing only simple assignments, it can be
automatically converted to Starlark.

Bug: 198995713
Test: treehugger
Change-Id: I4798fb69c639e6d52d275a5b793fa0c8ba876202
---
 core/version_defaults.mk | 237 ++-----------------------------------
 core/version_util.mk     | 245 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 252 insertions(+), 230 deletions(-)
 create mode 100644 core/version_util.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index d7fcb288fc..3b4c851480 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -40,51 +40,10 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE
 endif
 
 DEFAULT_PLATFORM_VERSION := TP1A
+.KATI_READONLY := DEFAULT_PLATFORM_VERSION
 MIN_PLATFORM_VERSION := TP1A
 MAX_PLATFORM_VERSION := TP1A
 
-ALLOWED_VERSIONS := $(call allowed-platform-versions,\
-  $(MIN_PLATFORM_VERSION),\
-  $(MAX_PLATFORM_VERSION),\
-  $(DEFAULT_PLATFORM_VERSION))
-
-ifndef TARGET_PLATFORM_VERSION
-  TARGET_PLATFORM_VERSION := $(DEFAULT_PLATFORM_VERSION)
-endif
-
-ifeq (,$(filter $(ALLOWED_VERSIONS), $(TARGET_PLATFORM_VERSION)))
-  $(warning Invalid TARGET_PLATFORM_VERSION '$(TARGET_PLATFORM_VERSION)', must be one of)
-  $(error $(ALLOWED_VERSIONS))
-endif
-ALLOWED_VERSIONS :=
-MIN_PLATFORM_VERSION :=
-MAX_PLATFORM_VERSION :=
-
-.KATI_READONLY := \
-  DEFAULT_PLATFORM_VERSION \
-  TARGET_PLATFORM_VERSION
-
-# Default versions for each TARGET_PLATFORM_VERSION
-# TODO: PLATFORM_VERSION, PLATFORM_SDK_VERSION, etc. should be conditional
-# on this
-
-# This is the canonical definition of the platform version,
-# which is the version that we reveal to the end user.
-# Update this value when the platform version changes (rather
-# than overriding it somewhere else).  Can be an arbitrary string.
-
-# When you change PLATFORM_VERSION for a given PLATFORM_SDK_VERSION
-# please add that PLATFORM_VERSION as well as clean up obsolete PLATFORM_VERSION's
-# in the following text file:
-# cts/tests/tests/os/assets/platform_versions.txt
-
-# Note that there should be one PLATFORM_VERSION and PLATFORM_VERSION_CODENAME
-# entry for each unreleased API level, regardless of
-# MIN_PLATFORM_VERSION/MAX_PLATFORM_VERSION. PLATFORM_VERSION is used to
-# generate the range of allowed SDK versions, so it must have an entry for every
-# unreleased API level targetable by this branch, not just those that are valid
-# lunch targets for this branch.
-
 # The last stable version name of the platform that was released.  During
 # development, this stays at that previous version, while the codename indicates
 # further work based on the previous version.
@@ -96,49 +55,6 @@ PLATFORM_VERSION_LAST_STABLE := 12
 PLATFORM_VERSION_CODENAME.SP2A := Sv2
 PLATFORM_VERSION_CODENAME.TP1A := Tiramisu
 
-ifndef PLATFORM_VERSION_CODENAME
-  PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION))
-  ifndef PLATFORM_VERSION_CODENAME
-    # PLATFORM_VERSION_CODENAME falls back to TARGET_PLATFORM_VERSION
-    PLATFORM_VERSION_CODENAME := $(TARGET_PLATFORM_VERSION)
-  endif
-
-  # This is all of the *active* development codenames.
-  # This confusing name is needed because
-  # all_codenames has been baked into build.prop for ages.
-  #
-  # Should be either the same as PLATFORM_VERSION_CODENAME or a comma-separated
-  # list of additional codenames after PLATFORM_VERSION_CODENAME.
-  PLATFORM_VERSION_ALL_CODENAMES :=
-
-  # Build a list of all active code names. Avoid duplicates, and stop when we
-  # reach a codename that matches PLATFORM_VERSION_CODENAME (anything beyond
-  # that is not included in our build).
-  _versions_in_target := \
-    $(call find_and_earlier,$(ALL_VERSIONS),$(TARGET_PLATFORM_VERSION))
-  $(foreach version,$(_versions_in_target),\
-    $(eval _codename := $(PLATFORM_VERSION_CODENAME.$(version)))\
-    $(if $(filter $(_codename),$(PLATFORM_VERSION_ALL_CODENAMES)),,\
-      $(eval PLATFORM_VERSION_ALL_CODENAMES += $(_codename))))
-
-  # And convert from space separated to comma separated.
-  PLATFORM_VERSION_ALL_CODENAMES := \
-    $(subst $(space),$(comma),$(strip $(PLATFORM_VERSION_ALL_CODENAMES)))
-
-endif
-.KATI_READONLY := \
-  PLATFORM_VERSION_CODENAME \
-  PLATFORM_VERSION_ALL_CODENAMES
-
-ifndef PLATFORM_VERSION
-  ifeq (REL,$(PLATFORM_VERSION_CODENAME))
-      PLATFORM_VERSION := $(PLATFORM_VERSION_LAST_STABLE)
-  else
-      PLATFORM_VERSION := $(PLATFORM_VERSION_CODENAME)
-  endif
-endif
-.KATI_READONLY := PLATFORM_VERSION
-
 ifndef PLATFORM_SDK_VERSION
   # This is the canonical definition of the SDK version, which defines
   # the set of APIs and functionality available in the platform.  It
@@ -157,89 +73,12 @@ endif
 .KATI_READONLY := PLATFORM_SDK_VERSION
 
 # This is the sdk extension version of this tree.
-PLATFORM_SDK_EXTENSION_VERSION :=$= 1
+PLATFORM_SDK_EXTENSION_VERSION := 1
+.KATI_READONLY := PLATFORM_SDK_EXTENSION_VERSION
 
 # This is the sdk extension version that PLATFORM_SDK_VERSION ships with.
-PLATFORM_BASE_SDK_EXTENSION_VERSION :=$= 0
-
-ifeq (REL,$(PLATFORM_VERSION_CODENAME))
-  PLATFORM_PREVIEW_SDK_VERSION := 0
-else
-  ifndef PLATFORM_PREVIEW_SDK_VERSION
-    # This is the definition of a preview SDK version over and above the current
-    # platform SDK version. Unlike the platform SDK version, a higher value
-    # for preview SDK version does NOT mean that all prior preview APIs are
-    # included. Packages reading this value to determine compatibility with
-    # known APIs should check that this value is precisely equal to the preview
-    # SDK version the package was built for, otherwise it should fall back to
-    # assuming the device can only support APIs as of the previous official
-    # public release.
-    # This value will always be forced to 0 for release builds by the logic
-    # in the "ifeq" block above, so the value below will be used on any
-    # non-release builds, and it should always be at least 1, to indicate that
-    # APIs may have changed since the claimed PLATFORM_SDK_VERSION.
-    PLATFORM_PREVIEW_SDK_VERSION := 1
-  endif
-endif
-.KATI_READONLY := PLATFORM_PREVIEW_SDK_VERSION
-
-ifndef DEFAULT_APP_TARGET_SDK
-  # This is the default minSdkVersion and targetSdkVersion to use for
-  # all .apks created by the build system.  It can be overridden by explicitly
-  # setting these in the .apk's AndroidManifest.xml.  It is either the code
-  # name of the development build or, if this is a release build, the official
-  # SDK version of this release.
-  ifeq (REL,$(PLATFORM_VERSION_CODENAME))
-    DEFAULT_APP_TARGET_SDK := $(PLATFORM_SDK_VERSION)
-  else
-    DEFAULT_APP_TARGET_SDK := $(PLATFORM_VERSION_CODENAME)
-  endif
-endif
-.KATI_READONLY := DEFAULT_APP_TARGET_SDK
-
-ifndef PLATFORM_VNDK_VERSION
-  # This is the definition of the VNDK version for the current VNDK libraries.
-  # The version is only available when PLATFORM_VERSION_CODENAME == REL.
-  # Otherwise, it will be set to a CODENAME version. The ABI is allowed to be
-  # changed only before the Android version is released. Once
-  # PLATFORM_VNDK_VERSION is set to actual version, the ABI for this version
-  # will be frozon and emit build errors if any ABI for the VNDK libs are
-  # changed.
-  # After that the snapshot of the VNDK with this version will be generated.
-  #
-  # The VNDK version follows PLATFORM_SDK_VERSION.
-  ifeq (REL,$(PLATFORM_VERSION_CODENAME))
-    PLATFORM_VNDK_VERSION := $(PLATFORM_SDK_VERSION)
-  else
-    PLATFORM_VNDK_VERSION := $(PLATFORM_VERSION_CODENAME)
-  endif
-endif
-.KATI_READONLY := PLATFORM_VNDK_VERSION
-
-ifndef PLATFORM_SYSTEMSDK_MIN_VERSION
-  # This is the oldest version of system SDK that the platform supports. Contrary
-  # to the public SDK where platform essentially supports all previous SDK versions,
-  # platform supports only a few number of recent system SDK versions as some of
-  # old system APIs are gradually deprecated, removed and then deleted.
-  PLATFORM_SYSTEMSDK_MIN_VERSION := 28
-endif
-.KATI_READONLY := PLATFORM_SYSTEMSDK_MIN_VERSION
-
-# This is the list of system SDK versions that the current platform supports.
-PLATFORM_SYSTEMSDK_VERSIONS :=
-ifneq (,$(PLATFORM_SYSTEMSDK_MIN_VERSION))
-  $(if $(call math_is_number,$(PLATFORM_SYSTEMSDK_MIN_VERSION)),,\
-    $(error PLATFORM_SYSTEMSDK_MIN_VERSION must be a number, but was $(PLATFORM_SYSTEMSDK_MIN_VERSION)))
-  PLATFORM_SYSTEMSDK_VERSIONS := $(call int_range_list,$(PLATFORM_SYSTEMSDK_MIN_VERSION),$(PLATFORM_SDK_VERSION))
-endif
-# Platform always supports the current version
-ifeq (REL,$(PLATFORM_VERSION_CODENAME))
-  PLATFORM_SYSTEMSDK_VERSIONS += $(PLATFORM_SDK_VERSION)
-else
-  PLATFORM_SYSTEMSDK_VERSIONS += $(subst $(comma),$(space),$(PLATFORM_VERSION_ALL_CODENAMES))
-endif
-PLATFORM_SYSTEMSDK_VERSIONS := $(strip $(sort $(PLATFORM_SYSTEMSDK_VERSIONS)))
-.KATI_READONLY := PLATFORM_SYSTEMSDK_VERSIONS
+PLATFORM_BASE_SDK_EXTENSION_VERSION := 0
+.KATI_READONLY := PLATFORM_BASE_SDK_EXTENSION_VERSION
 
 ifndef PLATFORM_SECURITY_PATCH
     #  Used to indicate the security patch that has been applied to the device.
@@ -247,69 +86,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 := 2021-10-05
-endif
-.KATI_READONLY := PLATFORM_SECURITY_PATCH
-
-ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP
-  # Used to indicate the matching timestamp for the security patch string in PLATFORM_SECURITY_PATCH.
-  PLATFORM_SECURITY_PATCH_TIMESTAMP := $(shell date -d 'TZ="GMT" $(PLATFORM_SECURITY_PATCH)' +%s)
-endif
-.KATI_READONLY := PLATFORM_SECURITY_PATCH_TIMESTAMP
-
-ifndef PLATFORM_BASE_OS
-  # Used to indicate the base os applied to the device.
-  # Can be an arbitrary string, but must be a single word.
-  #
-  # If there is no $PLATFORM_BASE_OS set, keep it empty.
-  PLATFORM_BASE_OS :=
-endif
-.KATI_READONLY := PLATFORM_BASE_OS
-
-ifndef BUILD_ID
-  # Used to signify special builds.  E.g., branches and/or releases,
-  # like "M5-RC7".  Can be an arbitrary string, but must be a single
-  # word and a valid file name.
-  #
-  # If there is no BUILD_ID set, make it obvious.
-  BUILD_ID := UNKNOWN
-endif
-.KATI_READONLY := BUILD_ID
-
-ifndef BUILD_DATETIME
-  # Used to reproduce builds by setting the same time. Must be the number
-  # of seconds since the Epoch.
-  BUILD_DATETIME := $(shell date +%s)
+    PLATFORM_SECURITY_PATCH := 2021-10-05
 endif
 
-DATE := date -d @$(BUILD_DATETIME)
-.KATI_READONLY := DATE
-
-# Everything should be using BUILD_DATETIME_FROM_FILE instead.
-# BUILD_DATETIME and DATE can be removed once BUILD_NUMBER moves
-# to soong_ui.
-$(KATI_obsolete_var BUILD_DATETIME,Use BUILD_DATETIME_FROM_FILE)
-
-HAS_BUILD_NUMBER := true
-ifndef BUILD_NUMBER
-  # BUILD_NUMBER should be set to the source control value that
-  # represents the current state of the source code.  E.g., a
-  # perforce changelist number or a git hash.  Can be an arbitrary string
-  # (to allow for source control that uses something other than numbers),
-  # but must be a single word and a valid file name.
-  #
-  # If no BUILD_NUMBER is set, create a useful "I am an engineering build
-  # from this date/time" value.  Make it start with a non-digit so that
-  # anyone trying to parse it as an integer will probably get "0".
-  BUILD_NUMBER := eng.$(shell echo $${BUILD_USERNAME:0:6}).$(shell $(DATE) +%Y%m%d.%H%M%S)
-  HAS_BUILD_NUMBER := false
-endif
-.KATI_READONLY := BUILD_NUMBER HAS_BUILD_NUMBER
-
-ifndef PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION
-  # Used to set minimum supported target sdk version. Apps targeting sdk
-  # version lower than the set value will result in a warning being shown
-  # when any activity from the app is started.
-  PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23
-endif
-.KATI_READONLY := PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION
+include $(BUILD_SYSTEM)/version_util.mk
diff --git a/core/version_util.mk b/core/version_util.mk
new file mode 100644
index 0000000000..b7c4e48641
--- /dev/null
+++ b/core/version_util.mk
@@ -0,0 +1,245 @@
+#
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+
+ALLOWED_VERSIONS := $(call allowed-platform-versions,\
+  $(MIN_PLATFORM_VERSION),\
+  $(MAX_PLATFORM_VERSION),\
+  $(DEFAULT_PLATFORM_VERSION))
+
+ifndef TARGET_PLATFORM_VERSION
+  TARGET_PLATFORM_VERSION := $(DEFAULT_PLATFORM_VERSION)
+endif
+
+ifeq (,$(filter $(ALLOWED_VERSIONS), $(TARGET_PLATFORM_VERSION)))
+  $(warning Invalid TARGET_PLATFORM_VERSION '$(TARGET_PLATFORM_VERSION)', must be one of)
+  $(error $(ALLOWED_VERSIONS))
+endif
+ALLOWED_VERSIONS :=
+MIN_PLATFORM_VERSION :=
+MAX_PLATFORM_VERSION :=
+
+.KATI_READONLY := TARGET_PLATFORM_VERSION
+
+# Default versions for each TARGET_PLATFORM_VERSION
+# TODO: PLATFORM_VERSION, PLATFORM_SDK_VERSION, etc. should be conditional
+# on this
+
+# This is the canonical definition of the platform version,
+# which is the version that we reveal to the end user.
+# Update this value when the platform version changes (rather
+# than overriding it somewhere else).  Can be an arbitrary string.
+
+# When you change PLATFORM_VERSION for a given PLATFORM_SDK_VERSION
+# please add that PLATFORM_VERSION as well as clean up obsolete PLATFORM_VERSION's
+# in the following text file:
+# cts/tests/tests/os/assets/platform_versions.txt
+
+# Note that there should be one PLATFORM_VERSION and PLATFORM_VERSION_CODENAME
+# entry for each unreleased API level, regardless of
+# MIN_PLATFORM_VERSION/MAX_PLATFORM_VERSION. PLATFORM_VERSION is used to
+# generate the range of allowed SDK versions, so it must have an entry for every
+# unreleased API level targetable by this branch, not just those that are valid
+# lunch targets for this branch.
+
+ifndef PLATFORM_VERSION_CODENAME
+  PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION))
+  ifndef PLATFORM_VERSION_CODENAME
+    # PLATFORM_VERSION_CODENAME falls back to TARGET_PLATFORM_VERSION
+    PLATFORM_VERSION_CODENAME := $(TARGET_PLATFORM_VERSION)
+  endif
+
+  # This is all of the *active* development codenames.
+  # This confusing name is needed because
+  # all_codenames has been baked into build.prop for ages.
+  #
+  # Should be either the same as PLATFORM_VERSION_CODENAME or a comma-separated
+  # list of additional codenames after PLATFORM_VERSION_CODENAME.
+  PLATFORM_VERSION_ALL_CODENAMES :=
+
+  # Build a list of all active code names. Avoid duplicates, and stop when we
+  # reach a codename that matches PLATFORM_VERSION_CODENAME (anything beyond
+  # that is not included in our build).
+  _versions_in_target := \
+    $(call find_and_earlier,$(ALL_VERSIONS),$(TARGET_PLATFORM_VERSION))
+  $(foreach version,$(_versions_in_target),\
+    $(eval _codename := $(PLATFORM_VERSION_CODENAME.$(version)))\
+    $(if $(filter $(_codename),$(PLATFORM_VERSION_ALL_CODENAMES)),,\
+      $(eval PLATFORM_VERSION_ALL_CODENAMES += $(_codename))))
+
+  # And convert from space separated to comma separated.
+  PLATFORM_VERSION_ALL_CODENAMES := \
+    $(subst $(space),$(comma),$(strip $(PLATFORM_VERSION_ALL_CODENAMES)))
+
+endif
+.KATI_READONLY := \
+  PLATFORM_VERSION_CODENAME \
+  PLATFORM_VERSION_ALL_CODENAMES
+
+ifndef PLATFORM_VERSION
+  ifeq (REL,$(PLATFORM_VERSION_CODENAME))
+      PLATFORM_VERSION := $(PLATFORM_VERSION_LAST_STABLE)
+  else
+      PLATFORM_VERSION := $(PLATFORM_VERSION_CODENAME)
+  endif
+endif
+.KATI_READONLY := PLATFORM_VERSION
+
+
+ifeq (REL,$(PLATFORM_VERSION_CODENAME))
+  PLATFORM_PREVIEW_SDK_VERSION := 0
+else
+  ifndef PLATFORM_PREVIEW_SDK_VERSION
+    # This is the definition of a preview SDK version over and above the current
+    # platform SDK version. Unlike the platform SDK version, a higher value
+    # for preview SDK version does NOT mean that all prior preview APIs are
+    # included. Packages reading this value to determine compatibility with
+    # known APIs should check that this value is precisely equal to the preview
+    # SDK version the package was built for, otherwise it should fall back to
+    # assuming the device can only support APIs as of the previous official
+    # public release.
+    # This value will always be forced to 0 for release builds by the logic
+    # in the "ifeq" block above, so the value below will be used on any
+    # non-release builds, and it should always be at least 1, to indicate that
+    # APIs may have changed since the claimed PLATFORM_SDK_VERSION.
+    PLATFORM_PREVIEW_SDK_VERSION := 1
+  endif
+endif
+.KATI_READONLY := PLATFORM_PREVIEW_SDK_VERSION
+
+ifndef DEFAULT_APP_TARGET_SDK
+  # This is the default minSdkVersion and targetSdkVersion to use for
+  # all .apks created by the build system.  It can be overridden by explicitly
+  # setting these in the .apk's AndroidManifest.xml.  It is either the code
+  # name of the development build or, if this is a release build, the official
+  # SDK version of this release.
+  ifeq (REL,$(PLATFORM_VERSION_CODENAME))
+    DEFAULT_APP_TARGET_SDK := $(PLATFORM_SDK_VERSION)
+  else
+    DEFAULT_APP_TARGET_SDK := $(PLATFORM_VERSION_CODENAME)
+  endif
+endif
+.KATI_READONLY := DEFAULT_APP_TARGET_SDK
+
+ifndef PLATFORM_VNDK_VERSION
+  # This is the definition of the VNDK version for the current VNDK libraries.
+  # The version is only available when PLATFORM_VERSION_CODENAME == REL.
+  # Otherwise, it will be set to a CODENAME version. The ABI is allowed to be
+  # changed only before the Android version is released. Once
+  # PLATFORM_VNDK_VERSION is set to actual version, the ABI for this version
+  # will be frozon and emit build errors if any ABI for the VNDK libs are
+  # changed.
+  # After that the snapshot of the VNDK with this version will be generated.
+  #
+  # The VNDK version follows PLATFORM_SDK_VERSION.
+  ifeq (REL,$(PLATFORM_VERSION_CODENAME))
+    PLATFORM_VNDK_VERSION := $(PLATFORM_SDK_VERSION)
+  else
+    PLATFORM_VNDK_VERSION := $(PLATFORM_VERSION_CODENAME)
+  endif
+endif
+.KATI_READONLY := PLATFORM_VNDK_VERSION
+
+ifndef PLATFORM_SYSTEMSDK_MIN_VERSION
+  # This is the oldest version of system SDK that the platform supports. Contrary
+  # to the public SDK where platform essentially supports all previous SDK versions,
+  # platform supports only a few number of recent system SDK versions as some of
+  # old system APIs are gradually deprecated, removed and then deleted.
+  PLATFORM_SYSTEMSDK_MIN_VERSION := 28
+endif
+.KATI_READONLY := PLATFORM_SYSTEMSDK_MIN_VERSION
+
+# This is the list of system SDK versions that the current platform supports.
+PLATFORM_SYSTEMSDK_VERSIONS :=
+ifneq (,$(PLATFORM_SYSTEMSDK_MIN_VERSION))
+  $(if $(call math_is_number,$(PLATFORM_SYSTEMSDK_MIN_VERSION)),,\
+    $(error PLATFORM_SYSTEMSDK_MIN_VERSION must be a number, but was $(PLATFORM_SYSTEMSDK_MIN_VERSION)))
+  PLATFORM_SYSTEMSDK_VERSIONS := $(call int_range_list,$(PLATFORM_SYSTEMSDK_MIN_VERSION),$(PLATFORM_SDK_VERSION))
+endif
+# Platform always supports the current version
+ifeq (REL,$(PLATFORM_VERSION_CODENAME))
+  PLATFORM_SYSTEMSDK_VERSIONS += $(PLATFORM_SDK_VERSION)
+else
+  PLATFORM_SYSTEMSDK_VERSIONS += $(subst $(comma),$(space),$(PLATFORM_VERSION_ALL_CODENAMES))
+endif
+PLATFORM_SYSTEMSDK_VERSIONS := $(strip $(sort $(PLATFORM_SYSTEMSDK_VERSIONS)))
+.KATI_READONLY := PLATFORM_SYSTEMSDK_VERSIONS
+
+.KATI_READONLY := PLATFORM_SECURITY_PATCH
+
+ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP
+  # Used to indicate the matching timestamp for the security patch string in PLATFORM_SECURITY_PATCH.
+  PLATFORM_SECURITY_PATCH_TIMESTAMP := $(shell date -d 'TZ="GMT" $(PLATFORM_SECURITY_PATCH)' +%s)
+endif
+.KATI_READONLY := PLATFORM_SECURITY_PATCH_TIMESTAMP
+
+ifndef PLATFORM_BASE_OS
+  # Used to indicate the base os applied to the device.
+  # Can be an arbitrary string, but must be a single word.
+  #
+  # If there is no $PLATFORM_BASE_OS set, keep it empty.
+  PLATFORM_BASE_OS :=
+endif
+.KATI_READONLY := PLATFORM_BASE_OS
+
+ifndef BUILD_ID
+  # Used to signify special builds.  E.g., branches and/or releases,
+  # like "M5-RC7".  Can be an arbitrary string, but must be a single
+  # word and a valid file name.
+  #
+  # If there is no BUILD_ID set, make it obvious.
+  BUILD_ID := UNKNOWN
+endif
+.KATI_READONLY := BUILD_ID
+
+ifndef BUILD_DATETIME
+  # Used to reproduce builds by setting the same time. Must be the number
+  # of seconds since the Epoch.
+  BUILD_DATETIME := $(shell date +%s)
+endif
+
+DATE := date -d @$(BUILD_DATETIME)
+.KATI_READONLY := DATE
+
+# Everything should be using BUILD_DATETIME_FROM_FILE instead.
+# BUILD_DATETIME and DATE can be removed once BUILD_NUMBER moves
+# to soong_ui.
+$(KATI_obsolete_var BUILD_DATETIME,Use BUILD_DATETIME_FROM_FILE)
+
+HAS_BUILD_NUMBER := true
+ifndef BUILD_NUMBER
+  # BUILD_NUMBER should be set to the source control value that
+  # represents the current state of the source code.  E.g., a
+  # perforce changelist number or a git hash.  Can be an arbitrary string
+  # (to allow for source control that uses something other than numbers),
+  # but must be a single word and a valid file name.
+  #
+  # If no BUILD_NUMBER is set, create a useful "I am an engineering build
+  # from this date/time" value.  Make it start with a non-digit so that
+  # anyone trying to parse it as an integer will probably get "0".
+  BUILD_NUMBER := eng.$(shell echo $${BUILD_USERNAME:0:6}).$(shell $(DATE) +%Y%m%d.%H%M%S)
+  HAS_BUILD_NUMBER := false
+endif
+.KATI_READONLY := BUILD_NUMBER HAS_BUILD_NUMBER
+
+ifndef PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION
+  # Used to set minimum supported target sdk version. Apps targeting sdk
+  # version lower than the set value will result in a warning being shown
+  # when any activity from the app is started.
+  PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23
+endif
+.KATI_READONLY := PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION

From 0cc2245fdaf769a064a36b8df01b04832e5b9601 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 9 Sep 2021 07:21:59 +0000
Subject: [PATCH 118/425] Version bump to TP1A.210909.002 [core/build_id.mk]

Change-Id: I4b3d5a58cb06dd943e226edbfe26f83cf1268045
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 653d8dce7e..1d453dab59 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=TP1A.210909.001
+BUILD_ID=TP1A.210909.002

From 948f7fa55249c76c9617399b9ff6420a8ceb3fc3 Mon Sep 17 00:00:00 2001
From: Paul Scovanner <pscovanner@google.com>
Date: Tue, 14 Sep 2021 23:27:03 +0000
Subject: [PATCH 119/425] Update Security String to 2021-11-05

Bug: 199784479
Change-Id: I93db0c1fa9fbf42223fa2be0d6859bb22d1abac4
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 3b4c851480..a585285edf 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -86,7 +86,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 := 2021-10-05
+    PLATFORM_SECURITY_PATCH := 2021-11-05
 endif
 
 include $(BUILD_SYSTEM)/version_util.mk

From b44ef6b8323aaf9d5c169eed6db65e5d4f8b9df4 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 16 Sep 2021 21:57:12 +0000
Subject: [PATCH 120/425] Version bump to TP1A.210916.002 [core/build_id.mk]

Change-Id: I34318691a086c6f5505938bd78753261200f8212
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 3a33185e9a..2ee1b2e029 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=TP1A.210916.001
+BUILD_ID=TP1A.210916.002

From 4cd8622686d0413e725794344a65be9339b27e68 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 17 Sep 2021 18:51:03 +0000
Subject: [PATCH 121/425] Version bump to TP1A.210917.002 [core/build_id.mk]

Change-Id: Ia0fe7ebdfd6408e5e0b389baf7a4b8baf1684e02
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 6d1a86b863..5e9ac8b428 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=TP1A.210917.001
+BUILD_ID=TP1A.210917.002

From 330c04d05f200f7afdbf3d10a8304028a6753bdb Mon Sep 17 00:00:00 2001
From: Serik Beketayev <serikb@google.com>
Date: Tue, 14 Sep 2021 16:24:57 -0700
Subject: [PATCH 122/425] [IRadioConfig] Adding to VNDK

Generated IRadioConfig.aidl and dependencies using tool
hidl2aidl.

Bug: 198331805
Test: m android.hardware.radio.config
Change-Id: Ifdbac8646bd20849fe4111f75f411426c5a23248
---
 target/product/gsi/current.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 7ade247455..26d1942793 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -97,6 +97,8 @@ VNDK-core: android.hardware.power.stats-V1-ndk.so
 VNDK-core: android.hardware.power.stats-V1-ndk_platform.so
 VNDK-core: android.hardware.radio-V1-ndk.so
 VNDK-core: android.hardware.radio-V1-ndk_platform.so
+VNDK-core: android.hardware.radio.config-V1-ndk.so
+VNDK-core: android.hardware.radio.config-V1-ndk_platform.so
 VNDK-core: android.hardware.rebootescrow-V1-ndk.so
 VNDK-core: android.hardware.rebootescrow-V1-ndk_platform.so
 VNDK-core: android.hardware.security.keymint-V1-ndk.so

From 6ec40ea3c86afa4365387fd69e4c7cfa76758e5d Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 22 Sep 2021 18:33:07 +0000
Subject: [PATCH 123/425] Version bump to TP1A.210922.002 [core/build_id.mk]

Change-Id: I3046b7aafc198b9de9dab79e11a06f3686e17e4a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 30a4f1c5e2..4ba30cb87c 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=TP1A.210922.001
+BUILD_ID=TP1A.210922.002

From 82fa604b79e0141084a07ae7a27a1099d40055dd Mon Sep 17 00:00:00 2001
From: Ady Abraham <adyabr@google.com>
Date: Thu, 23 Sep 2021 14:36:22 -0700
Subject: [PATCH 124/425] Add android.hardware.graphics.composer3

Test: Build
Bug: 198690211
Change-Id: I2468b4af12f898a2a49d2cfdd253652abbbc3a59
---
 target/product/gsi/current.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index c0b5387d4a..8fe764cad8 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -22,11 +22,13 @@ VNDK-SP: android.hardware.common-V2-ndk.so
 VNDK-SP: android.hardware.common-V2-ndk_platform.so
 VNDK-SP: android.hardware.common.fmq-V1-ndk.so
 VNDK-SP: android.hardware.common.fmq-V1-ndk_platform.so
-VNDK-SP: android.hardware.graphics.common-V2-ndk.so
-VNDK-SP: android.hardware.graphics.common-V2-ndk_platform.so
+VNDK-SP: android.hardware.graphics.common-V3-ndk.so
+VNDK-SP: android.hardware.graphics.common-V3-ndk_platform.so
 VNDK-SP: android.hardware.graphics.common@1.0.so
 VNDK-SP: android.hardware.graphics.common@1.1.so
 VNDK-SP: android.hardware.graphics.common@1.2.so
+VNDK-SP: android.hardware.graphics.composer3-V1-ndk.so
+VNDK-SP: android.hardware.graphics.composer3-V1-ndk_platform.so
 VNDK-SP: android.hardware.graphics.mapper@2.0.so
 VNDK-SP: android.hardware.graphics.mapper@2.1.so
 VNDK-SP: android.hardware.graphics.mapper@3.0.so

From de8cb7566237c24e580113cf3fa0da09168d6ab6 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 29 Sep 2021 17:46:55 +0000
Subject: [PATCH 125/425] Version bump to TP1A.210929.002 [core/build_id.mk]

Change-Id: Ibeada6a506c1bb2f02a0fd5dc03fd3a93d608a2b
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 8f9462fa80..45b6421ea9 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=TP1A.210929.001
+BUILD_ID=TP1A.210929.002

From f52a20dfc31a348fb2aa0d30095ecaeeabd547c6 Mon Sep 17 00:00:00 2001
From: Yahan Zhou <yahan@google.com>
Date: Fri, 1 Oct 2021 00:18:39 +0000
Subject: [PATCH 126/425] Revert "Port sdk_slim_x86_64 from rvc-emu-dev."

This reverts commit c8dbfb795fb2012183941f458ca17164f15ee94c.

Reason for revert: moved to goldfish

Change-Id: I1e0cd5a04b5a2a3d584f806c4c3ce290725017c7
---
 target/product/AndroidProducts.mk |  1 -
 target/product/sdk_slim_x86_64.mk | 78 -------------------------------
 2 files changed, 79 deletions(-)
 delete mode 100644 target/product/sdk_slim_x86_64.mk

diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk
index d490e15528..7d9d90e92a 100644
--- a/target/product/AndroidProducts.mk
+++ b/target/product/AndroidProducts.mk
@@ -67,7 +67,6 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/sdk_phone_armv7.mk \
     $(LOCAL_DIR)/sdk_phone_x86_64.mk \
     $(LOCAL_DIR)/sdk_phone_x86.mk \
-    $(LOCAL_DIR)/sdk_slim_x86_64.mk \
     $(LOCAL_DIR)/sdk_x86_64.mk \
     $(LOCAL_DIR)/sdk_x86.mk \
 
diff --git a/target/product/sdk_slim_x86_64.mk b/target/product/sdk_slim_x86_64.mk
deleted file mode 100644
index f9568593a8..0000000000
--- a/target/product/sdk_slim_x86_64.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# Copyright (C) 2021 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-QEMU_USE_SYSTEM_EXT_PARTITIONS := true
-PRODUCT_USE_DYNAMIC_PARTITIONS := true
-
-# This is a build configuration for the 'slim' image targeted
-# for headless automated testing. Compared to the full AOSP 'sdk_phone'
-# image it removes/replaces most product apps, and turns off rendering
-# by default.
-
-#
-# All components inherited here go to system image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
-
-# Enable mainline checking for exact this product name
-ifeq (sdk_slim_x86_64,$(TARGET_PRODUCT))
-PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
-endif
-
-#
-# All components inherited here go to system_ext image
-#
-# don't include full handheld_system_Ext which includes SystemUi, Settings etc
-$(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
-
-#
-# All components inherited here go to product image
-#
-# Just include webview, do not include most other apps
-$(call inherit-product, $(SRC_TARGET_DIR)/product/media_product.mk)
-
-# Include FakeSystemApp which replaces core system apps like Settings,
-# Launcher
-PRODUCT_PACKAGES += \
-    FakeSystemApp \
-
-#
-# All components inherited here go to vendor image
-#
-# this must go first - overwrites the goldfish handheld_core_hardware.xml
-$(call inherit-product, device/generic/goldfish/slim/vendor.mk)
-
-$(call inherit-product-if-exists, device/generic/goldfish/x86_64-vendor.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_x86_64/device.mk)
-
-# include the overlay that overrides systemui definitions with fakesystemapp
-DEVICE_PACKAGE_OVERLAYS := device/generic/goldfish/slim/overlay
-
-# Define the host tools and libs that are parts of the SDK.
-$(call inherit-product-if-exists, sdk/build/product_sdk.mk)
-$(call inherit-product-if-exists, development/build/product_sdk.mk)
-
-# Overrides
-PRODUCT_BRAND := Android
-PRODUCT_NAME := sdk_slim_x86_64
-PRODUCT_DEVICE := emulator_x86_64
-PRODUCT_MODEL := Android SDK built for x86_64
-# Disable <uses-library> checks for SDK product. It lacks some libraries (e.g.
-# RadioConfigLib), which makes it impossible to translate their module names to
-# library name, so the check fails.
-PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true

From e4c1af5cf972337c48248bd67d4038b91e58b202 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 1 Oct 2021 17:11:45 +0000
Subject: [PATCH 127/425] Version bump to TP1A.211001.002 [core/build_id.mk]

Change-Id: If5fd6f427c9d43de3c78285b5fef97ecfe582368
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 6e5995c20b..050e8e5ec9 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=TP1A.211001.001
+BUILD_ID=TP1A.211001.002

From ef55f6f736b7e5bcf9f4d2909d8a617c75470c65 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 1 Oct 2021 17:37:16 +0000
Subject: [PATCH 128/425] Version bump to TP1A.211001.003 [core/build_id.mk]

Change-Id: I41cd34cc368bc5dee233688a271921b9744b274e
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 050e8e5ec9..a842347f70 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=TP1A.211001.002
+BUILD_ID=TP1A.211001.003

From bf27e97d42f6305d70a5801d99e804b4061e79e3 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 4 Oct 2021 23:49:05 +0000
Subject: [PATCH 129/425] Version bump to TP1A.211004.002 [core/build_id.mk]

Change-Id: Id1fe714db5766a4a9ebb95b7503086a89792722e
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index c406100f22..31a718beb2 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=TP1A.211004.001
+BUILD_ID=TP1A.211004.002

From 2c473e9067b728ce235f75f911d918a5742cff91 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 6 Oct 2021 18:41:10 +0000
Subject: [PATCH 130/425] Version bump to TP1A.211006.002 [core/build_id.mk]

Change-Id: I2728f069db5f5aec2cd6d342ec22e404fc9fe5c6
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index ec1cb3df89..3445ea8b45 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=TP1A.211006.001
+BUILD_ID=TP1A.211006.002

From 7fb46e75b2d3a6232199615427f2da54680067b7 Mon Sep 17 00:00:00 2001
From: Paul Scovanner <pscovanner@google.com>
Date: Thu, 7 Oct 2021 21:54:07 +0000
Subject: [PATCH 131/425] Update SPL to 2021-12-05

Bug: 202436544
Change-Id: Ie4645b81d47aa677c4237bda8303d6c2e502844f
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index e31465bfdf..8a12f6164c 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -86,7 +86,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 := 2021-11-05
+    PLATFORM_SECURITY_PATCH := 2021-12-05
 endif
 
 include $(BUILD_SYSTEM)/version_util.mk

From af485891dc9f8ebc0a13d406a13e7792b781511b Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 13 Oct 2021 17:19:13 +0000
Subject: [PATCH 132/425] Version bump to TP1A.211013.002 [core/build_id.mk]

Change-Id: I0b6f5603da944f190d63d90444b5e6f65f4e3cbc
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index e7d9512fd4..59da149923 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=TP1A.211013.001
+BUILD_ID=TP1A.211013.002

From 0b9a4be973adbb12648f02733daf64638f94d456 Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Wed, 13 Oct 2021 13:26:47 -0700
Subject: [PATCH 133/425] gsi: Add android uwb commands package

Bug: 197886322
Test: Compiles
Change-Id: I6ef29163ebdeed5df31f85d617aec9a7b51cb725
---
 target/product/gsi/current.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 3057ccd2f4..6e040288b5 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -127,6 +127,8 @@ VNDK-core: android.hardware.soundtrigger@2.0-core.so
 VNDK-core: android.hardware.soundtrigger@2.0.so
 VNDK-core: android.hardware.uwb-V1-ndk.so
 VNDK-core: android.hardware.uwb-V1-ndk_platform.so
+VNDK-core: android.hardware.uwb.fira_android-V1-ndk.so
+VNDK-core: android.hardware.uwb.fira_android-V1-ndk_platform.so
 VNDK-core: android.hardware.vibrator-V2-ndk.so
 VNDK-core: android.hardware.vibrator-V2-ndk_platform.so
 VNDK-core: android.hardware.weaver-V1-ndk.so

From 98dc00d7dd2ff80a7a81b04030c59eb323189626 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Tue, 12 Oct 2021 13:30:07 +0900
Subject: [PATCH 134/425] Revert "Set VNDK version to current for module
 builds"

This reverts commit af35677f030d2edae0ad640047abd40066b59932.

Bug: 185769808
Test: banchan com.android.media.swcodec module_arm64; m apps_only dist
Test: banchan com.android.media.swcodec aosp_arm64; m apps_only dist

In both cases, the built APEX doesn't have libsync.so in it.
apex_manifest.pb has libsync.so as requireNativeLibs.

Merged-In: I62397d50a6970a9316f0d6ddd36736f149bc7c2c
Change-Id: I62397d50a6970a9316f0d6ddd36736f149bc7c2c
(cherry picked from commit 83ac8b74819c42b6f5a6fc555fc10d623f5aa79a)
---
 target/board/BoardConfigModuleCommon.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/target/board/BoardConfigModuleCommon.mk b/target/board/BoardConfigModuleCommon.mk
index 983247434e..24c01a58ef 100644
--- a/target/board/BoardConfigModuleCommon.mk
+++ b/target/board/BoardConfigModuleCommon.mk
@@ -4,7 +4,3 @@
 
 # Required for all module devices.
 TARGET_USES_64_BIT_BINDER := true
-
-# Necessary to make modules able to use the VNDK via 'use_vendor: true'
-# TODO(b/185769808): look into whether this is still used.
-BOARD_VNDK_VERSION := current

From 30d6e67ed57bd37c45febb400861903aaa4a968c Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 14 Oct 2021 22:53:04 +0000
Subject: [PATCH 135/425] Version bump to TP1A.211014.002 [core/build_id.mk]

Change-Id: Id6c76005213f86bef388c6d29bafa45a29519f01
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 017eb3b456..dbfb50f567 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=TP1A.211014.001
+BUILD_ID=TP1A.211014.002

From 56296f5660d2951cc3928db45f404b745476c908 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 15 Oct 2021 01:45:28 +0000
Subject: [PATCH 136/425] Version bump to TP1A.211015.002 [core/build_id.mk]

Change-Id: I922632dcdf6ba34b4bcf93a3fd433abd7f769f0b
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index e6d2ff6956..1acd779c17 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=TP1A.211015.001
+BUILD_ID=TP1A.211015.002

From 2c4ba909dbf782cab83fe28b9d403283bcd03d39 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 15 Oct 2021 21:39:00 +0000
Subject: [PATCH 137/425] Version bump to TP1A.211015.003 [core/build_id.mk]

Change-Id: Ic7fae3a3023f4e7389c3fdf1537a07636aac9561
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 1acd779c17..8456a96372 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=TP1A.211015.002
+BUILD_ID=TP1A.211015.003

From cda6aa38b8c8510981d67b65ddf5e6053aa7bb5e Mon Sep 17 00:00:00 2001
From: Nikita Ioffe <ioffe@google.com>
Date: Sat, 16 Oct 2021 00:27:28 +0100
Subject: [PATCH 138/425] Add com.android.supplementalprocess to base_system.mk

Test: flash
Change-Id: I62ce41a9cd2a21031a08a08a58ad257dda2732dd
---
 target/product/base_system.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 7b6c2c9f5c..641a1cccd7 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -67,6 +67,7 @@ PRODUCT_PACKAGES += \
     com.android.neuralnetworks \
     com.android.scheduling \
     com.android.sdkext \
+    com.android.supplementalprocess \
     com.android.tethering \
     com.android.tzdata \
     com.android.uwb \

From ee29502db26a8835980403ef37564beb6c5a0a1c Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Tue, 12 Oct 2021 16:50:21 +0900
Subject: [PATCH 139/425] Add NEED_AIDL_NDK_PLATFORM_BACKEND

The config variable is used to force the generation of the AIDL
ndk_platform backend which will eventually be removed in favor of the
ndk backend. The switch is needed as an escape hatch for some devices
whose BSP (outsourced and thus hardly modifiable) depends on the
ndk_backend libraries.

Bug: 161456198
Test: m
Change-Id: I62c995642b820419eaeedeee616c47aee1da251d
---
 core/soong_config.mk           |  2 ++
 target/product/gsi/Android.mk  | 24 +++++++++++++++++-----
 target/product/gsi/current.txt | 37 ----------------------------------
 3 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 49994646d4..837ed4f071 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -271,6 +271,8 @@ $(call add_json_bool, SepolicySplit, $(filter true,$(PRODUCT_SEPOLICY_SPLIT)))
 $(call add_json_list, SepolicyFreezeTestExtraDirs,         $(SEPOLICY_FREEZE_TEST_EXTRA_DIRS))
 $(call add_json_list, SepolicyFreezeTestExtraPrebuiltDirs, $(SEPOLICY_FREEZE_TEST_EXTRA_PREBUILT_DIRS))
 
+$(call add_json_bool, GenerateAidlNdkPlatformBackend, $(filter true,$(NEED_AIDL_NDK_PLATFORM_BACKEND)))
+
 $(call json_end)
 
 $(file >$(SOONG_VARIABLES).tmp,$(json_contents))
diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
index 39848e534a..0d788fad44 100644
--- a/target/product/gsi/Android.mk
+++ b/target/product/gsi/Android.mk
@@ -50,11 +50,21 @@ else
 _vndk_check_failure_message += "       Run \`update-vndk-list.sh\` to update $(LATEST_VNDK_LIB_LIST)"
 endif
 
+# The *-ndk_platform.so libraries no longer exist and are removed from the VNDK set. However, they
+# can exist if NEED_AIDL_NDK_PLATFORM_BACKEND is set to true for legacy devices. Don't be bothered
+# with the extraneous libraries.
+ifeq ($(NEED_AIDL_NDK_PLATFORM_BACKEND),true)
+	_READ_INTERNAL_VNDK_LIB_LIST := sed /ndk_platform.so/d $(INTERNAL_VNDK_LIB_LIST)
+else
+	_READ_INTERNAL_VNDK_LIB_LIST := cat $(INTERNAL_VNDK_LIB_LIST)
+endif
+
 $(check-vndk-list-timestamp): $(INTERNAL_VNDK_LIB_LIST) $(LATEST_VNDK_LIB_LIST) $(HOST_OUT_EXECUTABLES)/update-vndk-list.sh
-	$(hide) ( diff --old-line-format="Removed %L" \
+	$(hide) ($(_READ_INTERNAL_VNDK_LIB_LIST) | \
+	diff --old-line-format="Removed %L" \
 	  --new-line-format="Added %L" \
 	  --unchanged-line-format="" \
-	  $(LATEST_VNDK_LIB_LIST) $(INTERNAL_VNDK_LIB_LIST) \
+	  $(LATEST_VNDK_LIB_LIST) - \
 	  || ( echo -e $(_vndk_check_failure_message); exit 1 ))
 	$(hide) mkdir -p $(dir $@)
 	$(hide) touch $@
@@ -84,9 +94,13 @@ else
 	        echo "  echo Run lunch or choosecombo first" >> $@; \
 	        echo "  exit 1" >> $@; \
 	        echo "fi" >> $@; \
-	        echo "cd \$${ANDROID_BUILD_TOP}" >> $@; \
-	        echo "cp $(PRIVATE_INTERNAL_VNDK_LIB_LIST) $(PRIVATE_LATEST_VNDK_LIB_LIST)" >> $@; \
-	        echo "echo $(PRIVATE_LATEST_VNDK_LIB_LIST) updated." >> $@
+	        echo "cd \$${ANDROID_BUILD_TOP}" >> $@
+ifeq ($(NEED_AIDL_NDK_PLATFORM_BACKEND),true)
+	$(hide) echo "sed /ndk_platform.so/d $(PRIVATE_INTERNAL_VNDK_LIB_LIST) > $(PRIVATE_LATEST_VNDK_LIB_LIST)" >> $@
+else
+	$(hide) echo "cp $(PRIVATE_INTERNAL_VNDK_LIB_LIST) $(PRIVATE_LATEST_VNDK_LIB_LIST)" >> $@
+endif
+	$(hide) echo "echo $(PRIVATE_LATEST_VNDK_LIB_LIST) updated." >> $@
 endif
 	@chmod a+x $@
 
diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 6e040288b5..27c94275a7 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -19,16 +19,12 @@ LLNDK: libsync.so
 LLNDK: libvndksupport.so
 LLNDK: libvulkan.so
 VNDK-SP: android.hardware.common-V2-ndk.so
-VNDK-SP: android.hardware.common-V2-ndk_platform.so
 VNDK-SP: android.hardware.common.fmq-V1-ndk.so
-VNDK-SP: android.hardware.common.fmq-V1-ndk_platform.so
 VNDK-SP: android.hardware.graphics.common-V3-ndk.so
-VNDK-SP: android.hardware.graphics.common-V3-ndk_platform.so
 VNDK-SP: android.hardware.graphics.common@1.0.so
 VNDK-SP: android.hardware.graphics.common@1.1.so
 VNDK-SP: android.hardware.graphics.common@1.2.so
 VNDK-SP: android.hardware.graphics.composer3-V1-ndk.so
-VNDK-SP: android.hardware.graphics.composer3-V1-ndk_platform.so
 VNDK-SP: android.hardware.graphics.mapper@2.0.so
 VNDK-SP: android.hardware.graphics.mapper@2.1.so
 VNDK-SP: android.hardware.graphics.mapper@3.0.so
@@ -63,88 +59,55 @@ VNDK-SP: libutilscallstack.so
 VNDK-SP: libz.so
 VNDK-core: android.hardware.audio.common@2.0.so
 VNDK-core: android.hardware.authsecret-V1-ndk.so
-VNDK-core: android.hardware.authsecret-V1-ndk_platform.so
 VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk.so
-VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk_platform.so
 VNDK-core: android.hardware.configstore-utils.so
 VNDK-core: android.hardware.configstore@1.0.so
 VNDK-core: android.hardware.configstore@1.1.so
 VNDK-core: android.hardware.confirmationui-support-lib.so
 VNDK-core: android.hardware.gnss-V1-ndk.so
-VNDK-core: android.hardware.gnss-V1-ndk_platform.so
 VNDK-core: android.hardware.graphics.allocator@2.0.so
 VNDK-core: android.hardware.graphics.allocator@3.0.so
 VNDK-core: android.hardware.graphics.allocator@4.0.so
 VNDK-core: android.hardware.graphics.bufferqueue@1.0.so
 VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
 VNDK-core: android.hardware.health.storage-V1-ndk.so
-VNDK-core: android.hardware.health.storage-V1-ndk_platform.so
 VNDK-core: android.hardware.identity-V3-ndk.so
-VNDK-core: android.hardware.identity-V3-ndk_platform.so
 VNDK-core: android.hardware.keymaster-V3-ndk.so
-VNDK-core: android.hardware.keymaster-V3-ndk_platform.so
 VNDK-core: android.hardware.light-V1-ndk.so
-VNDK-core: android.hardware.light-V1-ndk_platform.so
 VNDK-core: android.hardware.media.bufferpool@2.0.so
 VNDK-core: android.hardware.media.omx@1.0.so
 VNDK-core: android.hardware.media@1.0.so
 VNDK-core: android.hardware.memtrack-V1-ndk.so
-VNDK-core: android.hardware.memtrack-V1-ndk_platform.so
 VNDK-core: android.hardware.memtrack@1.0.so
 VNDK-core: android.hardware.oemlock-V1-ndk.so
-VNDK-core: android.hardware.oemlock-V1-ndk_platform.so
 VNDK-core: android.hardware.power-V2-ndk.so
-VNDK-core: android.hardware.power-V2-ndk_platform.so
 VNDK-core: android.hardware.power.stats-V1-ndk.so
-VNDK-core: android.hardware.power.stats-V1-ndk_platform.so
 VNDK-core: android.hardware.radio-V1-ndk.so
-VNDK-core: android.hardware.radio-V1-ndk_platform.so
 VNDK-core: android.hardware.radio.config-V1-ndk.so
-VNDK-core: android.hardware.radio.config-V1-ndk_platform.so
 VNDK-core: android.hardware.radio.data-V1-ndk.so
-VNDK-core: android.hardware.radio.data-V1-ndk_platform.so
 VNDK-core: android.hardware.radio.messaging-V1-ndk.so
-VNDK-core: android.hardware.radio.messaging-V1-ndk_platform.so
 VNDK-core: android.hardware.radio.modem-V1-ndk.so
-VNDK-core: android.hardware.radio.modem-V1-ndk_platform.so
 VNDK-core: android.hardware.radio.network-V1-ndk.so
-VNDK-core: android.hardware.radio.network-V1-ndk_platform.so
 VNDK-core: android.hardware.radio.sim-V1-ndk.so
-VNDK-core: android.hardware.radio.sim-V1-ndk_platform.so
 VNDK-core: android.hardware.radio.voice-V1-ndk.so
-VNDK-core: android.hardware.radio.voice-V1-ndk_platform.so
 VNDK-core: android.hardware.rebootescrow-V1-ndk.so
-VNDK-core: android.hardware.rebootescrow-V1-ndk_platform.so
 VNDK-core: android.hardware.security.keymint-V1-ndk.so
-VNDK-core: android.hardware.security.keymint-V1-ndk_platform.so
 VNDK-core: android.hardware.security.secureclock-V1-ndk.so
-VNDK-core: android.hardware.security.secureclock-V1-ndk_platform.so
 VNDK-core: android.hardware.security.sharedsecret-V1-ndk.so
-VNDK-core: android.hardware.security.sharedsecret-V1-ndk_platform.so
 VNDK-core: android.hardware.soundtrigger3-V1-ndk.so
-VNDK-core: android.hardware.soundtrigger3-V1-ndk_platform.so
 VNDK-core: android.hardware.soundtrigger@2.0-core.so
 VNDK-core: android.hardware.soundtrigger@2.0.so
 VNDK-core: android.hardware.uwb-V1-ndk.so
-VNDK-core: android.hardware.uwb-V1-ndk_platform.so
 VNDK-core: android.hardware.uwb.fira_android-V1-ndk.so
-VNDK-core: android.hardware.uwb.fira_android-V1-ndk_platform.so
 VNDK-core: android.hardware.vibrator-V2-ndk.so
-VNDK-core: android.hardware.vibrator-V2-ndk_platform.so
 VNDK-core: android.hardware.weaver-V1-ndk.so
-VNDK-core: android.hardware.weaver-V1-ndk_platform.so
 VNDK-core: android.hardware.wifi.hostapd-V1-ndk.so
-VNDK-core: android.hardware.wifi.hostapd-V1-ndk_platform.so
 VNDK-core: android.hidl.token@1.0-utils.so
 VNDK-core: android.hidl.token@1.0.so
 VNDK-core: android.media.audio.common.types-V1-ndk.so
-VNDK-core: android.media.audio.common.types-V1-ndk_platform.so
 VNDK-core: android.media.soundtrigger.types-V1-ndk.so
-VNDK-core: android.media.soundtrigger.types-V1-ndk_platform.so
 VNDK-core: android.system.keystore2-V1-ndk.so
-VNDK-core: android.system.keystore2-V1-ndk_platform.so
 VNDK-core: android.system.suspend-V1-ndk.so
-VNDK-core: android.system.suspend-V1-ndk_platform.so
 VNDK-core: android.system.suspend@1.0.so
 VNDK-core: libaudioroute.so
 VNDK-core: libaudioutils.so

From e963c86be5d096b16650f1efc087316977ce8114 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 20 Oct 2021 20:25:01 +0000
Subject: [PATCH 140/425] Version bump to TP1A.211020.002 [core/build_id.mk]

Change-Id: Icabde046713f4e7f13d6459e0e8f660deccbdb08
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 944c8bc300..4114d2f8ee 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=TP1A.211020.001
+BUILD_ID=TP1A.211020.002

From b464ce6bb8146bfb5b4e85b21f76b71fad522805 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 21 Oct 2021 22:45:06 +0000
Subject: [PATCH 141/425] Version bump to TP1A.211021.002 [core/build_id.mk]

Change-Id: I2bfb849ed5c73ed893c71052174f5c63dc043502
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index e8e1868114..770b4e0477 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=TP1A.211021.001
+BUILD_ID=TP1A.211021.002

From 1800037026e938c960b14f24ef56b26604130d18 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 22 Oct 2021 19:14:57 +0000
Subject: [PATCH 142/425] Version bump to TP1A.211022.002 [core/build_id.mk]

Change-Id: I33c144d424eb4d7a9b51c0b71045b6997343cfed
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 005e2d6063..d2543f87af 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=TP1A.211022.001
+BUILD_ID=TP1A.211022.002

From ac34aa32453983b37bfefb89a5910f49cac842b4 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 25 Oct 2021 05:17:00 +0000
Subject: [PATCH 143/425] Version bump to TP1A.211025.002 [core/build_id.mk]

Change-Id: I1830c9d29d72176fed79a6e195d89ea68fa2abe6
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 1430a39a23..f47af1be46 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=TP1A.211025.001
+BUILD_ID=TP1A.211025.002

From a64c7ef9a7cf8e32dd77c3e58bd9cb49ab96da2d Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 25 Oct 2021 22:05:02 +0000
Subject: [PATCH 144/425] Version bump to TP1A.211025.003 [core/build_id.mk]

Change-Id: I90d5523fcf6e958a00f2580c6a2a24b8cd147d88
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index f47af1be46..fe27ec9776 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=TP1A.211025.002
+BUILD_ID=TP1A.211025.003

From 240ebf54278e26a1018e2909462b99d95e0f27b4 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 25 Oct 2021 22:25:02 +0000
Subject: [PATCH 145/425] Version bump to TP1A.211025.004 [core/build_id.mk]

Change-Id: Ic67f5e8151805b8a8744ccfcbbd2c13cd15858cd
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index fe27ec9776..2a6534adcf 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=TP1A.211025.003
+BUILD_ID=TP1A.211025.004

From 3e152e821944f112ba4c0d91111e9d7cfacdff6d Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 26 Oct 2021 01:39:03 +0000
Subject: [PATCH 146/425] Version bump to TP1A.211026.002 [core/build_id.mk]

Change-Id: Ia13800da69d85aaa780a79d35f03a030aab3a8f8
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index cd3a6c1f22..4e4380af6b 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=TP1A.211026.001
+BUILD_ID=TP1A.211026.002

From d919ea43b06c783dfcb9f4c9c7fe7146f87f1b15 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 26 Oct 2021 17:50:58 +0000
Subject: [PATCH 147/425] Version bump to TP1A.211026.003 [core/build_id.mk]

Change-Id: I92a9c99c994795124269a229b3fe0d00ce14cdfd
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 4e4380af6b..589e1770a5 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=TP1A.211026.002
+BUILD_ID=TP1A.211026.003

From 42bb7e851e66a37dd104ab9a6ba441d854308ad4 Mon Sep 17 00:00:00 2001
From: Arthur Ishiguro <arthuri@google.com>
Date: Thu, 14 Oct 2021 21:46:08 +0000
Subject: [PATCH 148/425] Add sensors AIDL HAL VNDK interfaces

Bug: 195593357
Test: Compile
Change-Id: I02cb11c2962beea26e3d207ec8c521893a25905b
---
 target/product/gsi/current.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 27c94275a7..3b04577b7d 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -94,6 +94,7 @@ VNDK-core: android.hardware.rebootescrow-V1-ndk.so
 VNDK-core: android.hardware.security.keymint-V1-ndk.so
 VNDK-core: android.hardware.security.secureclock-V1-ndk.so
 VNDK-core: android.hardware.security.sharedsecret-V1-ndk.so
+VNDK-core: android.hardware.sensors-V1-ndk.so
 VNDK-core: android.hardware.soundtrigger3-V1-ndk.so
 VNDK-core: android.hardware.soundtrigger@2.0-core.so
 VNDK-core: android.hardware.soundtrigger@2.0.so

From aa6cbad094a17aaa68135a825e0c428b72aaf998 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 27 Oct 2021 01:35:16 +0000
Subject: [PATCH 149/425] Version bump to TP1A.211027.002 [core/build_id.mk]

Change-Id: I470fb4876af370f80c8a73d7f8c8789eca8bdb54
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index a6caa79b22..ac624d3025 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=TP1A.211027.001
+BUILD_ID=TP1A.211027.002

From a95ab436f607d335eb39e1f45490681fec424dae Mon Sep 17 00:00:00 2001
From: Rupert Shuttleworth <ruperts@google.com>
Date: Wed, 20 Oct 2021 11:37:23 -0400
Subject: [PATCH 150/425] Add ability to set --rotation-min-sdk-version for
 signapk.

Bug: 197787352

Test: m signapk

Change-Id: I3b5e9bb3985c2ae83381499a44b339a7b1deb05c
---
 core/app_prebuilt_internal.mk                 |  3 ++
 core/clear_vars.mk                            |  1 +
 core/definitions.mk                           |  1 +
 core/package_internal.mk                      |  3 ++
 .../src/com/android/signapk/SignApk.java      | 35 ++++++++++++++-----
 5 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/core/app_prebuilt_internal.mk b/core/app_prebuilt_internal.mk
index 79639a8301..f5d213e646 100644
--- a/core/app_prebuilt_internal.mk
+++ b/core/app_prebuilt_internal.mk
@@ -142,6 +142,9 @@ else
 
   $(built_module): $(LOCAL_CERTIFICATE_LINEAGE)
   $(built_module): PRIVATE_CERTIFICATE_LINEAGE := $(LOCAL_CERTIFICATE_LINEAGE)
+
+  $(built_module): $(LOCAL_ROTATION_MIN_SDK_VERSION)
+  $(built_module): PRIVATE_ROTATION_MIN_SDK_VERSION := $(LOCAL_ROTATION_MIN_SDK_VERSION)
 endif
 
 ifneq ($(LOCAL_MODULE_STEM),)
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index a67cca6372..2ed7b856ad 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -263,6 +263,7 @@ LOCAL_RES_LIBRARIES:=
 LOCAL_RESOURCE_DIR:=
 LOCAL_RLIB_LIBRARIES:=
 LOCAL_RMTYPEDEFS:=
+LOCAL_ROTATION_MIN_SDK_VERSION:=
 LOCAL_RRO_THEME:=
 LOCAL_RTTI_FLAG:=
 LOCAL_SANITIZE:=
diff --git a/core/definitions.mk b/core/definitions.mk
index c7172ca9e6..00bd336d79 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2351,6 +2351,7 @@ define sign-package-arg
 $(hide) mv $(1) $(1).unsigned
 $(hide) $(JAVA) -Djava.library.path=$$(dirname $(SIGNAPK_JNI_LIBRARY_PATH)) -jar $(SIGNAPK_JAR) \
     $(if $(strip $(PRIVATE_CERTIFICATE_LINEAGE)), --lineage $(PRIVATE_CERTIFICATE_LINEAGE)) \
+    $(if $(strip $(PRIVATE_ROTATION_MIN_SDK_VERSION)), --rotation-min-sdk-version $(PRIVATE_ROTATION_MIN_SDK_VERSION)) \
     $(PRIVATE_CERTIFICATE) $(PRIVATE_PRIVATE_KEY) \
     $(PRIVATE_ADDITIONAL_CERTIFICATES) $(1).unsigned $(1).signed
 $(hide) mv $(1).signed $(1)
diff --git a/core/package_internal.mk b/core/package_internal.mk
index 9f5a5992dd..730395c80a 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -469,6 +469,9 @@ $(LOCAL_BUILT_MODULE): PRIVATE_ADDITIONAL_CERTIFICATES := $(additional_certifica
 $(LOCAL_BUILT_MODULE): $(LOCAL_CERTIFICATE_LINEAGE)
 $(LOCAL_BUILT_MODULE): PRIVATE_CERTIFICATE_LINEAGE := $(LOCAL_CERTIFICATE_LINEAGE)
 
+$(LOCAL_BUILT_MODULE): $(LOCAL_ROTATION_MIN_SDK_VERSION)
+$(LOCAL_BUILT_MODULE): PRIVATE_ROTATION_MIN_SDK_VERSION := $(LOCAL_ROTATION_MIN_SDK_VERSION)
+
 # Set a actual_partition_tag (calculated in base_rules.mk) for the package.
 PACKAGES.$(LOCAL_PACKAGE_NAME).PARTITION := $(actual_partition_tag)
 
diff --git a/tools/signapk/src/com/android/signapk/SignApk.java b/tools/signapk/src/com/android/signapk/SignApk.java
index 8bf1005466..ec55a2cd51 100644
--- a/tools/signapk/src/com/android/signapk/SignApk.java
+++ b/tools/signapk/src/com/android/signapk/SignApk.java
@@ -1050,6 +1050,7 @@ class SignApk {
         boolean signUsingApkSignatureSchemeV2 = true;
         boolean signUsingApkSignatureSchemeV4 = false;
         SigningCertificateLineage certLineage = null;
+        Integer rotationMinSdkVersion = null;
 
         int argstart = 0;
         while (argstart < args.length && args[argstart].startsWith("-")) {
@@ -1092,6 +1093,15 @@ class SignApk {
                             "Error reading lineage file: " + e.getMessage());
                 }
                 ++argstart;
+            } else if ("--rotation-min-sdk-version".equals(args[argstart])) {
+                String rotationMinSdkVersionString = args[++argstart];
+                try {
+                    rotationMinSdkVersion = Integer.parseInt(rotationMinSdkVersionString);
+                } catch (NumberFormatException e) {
+                    throw new IllegalArgumentException(
+                            "--rotation-min-sdk-version must be a decimal number: " + rotationMinSdkVersionString);
+                }
+                ++argstart;
             } else {
                 usage();
             }
@@ -1175,15 +1185,22 @@ class SignApk {
                     }
                 }
 
-                try (ApkSignerEngine apkSigner =
-                        new DefaultApkSignerEngine.Builder(
-                                createSignerConfigs(privateKey, publicKey), minSdkVersion)
-                                .setV1SigningEnabled(true)
-                                .setV2SigningEnabled(signUsingApkSignatureSchemeV2)
-                                .setOtherSignersSignaturesPreserved(false)
-                                .setCreatedBy("1.0 (Android SignApk)")
-                                .setSigningCertificateLineage(certLineage)
-                                .build()) {
+                DefaultApkSignerEngine.Builder builder = new DefaultApkSignerEngine.Builder(
+                    createSignerConfigs(privateKey, publicKey), minSdkVersion)
+                    .setV1SigningEnabled(true)
+                    .setV2SigningEnabled(signUsingApkSignatureSchemeV2)
+                    .setOtherSignersSignaturesPreserved(false)
+                    .setCreatedBy("1.0 (Android SignApk)");
+
+                if (certLineage != null) {
+                   builder = builder.setSigningCertificateLineage(certLineage);
+                }
+
+                if (rotationMinSdkVersion != null) {
+                   builder = builder.setMinSdkVersionForRotation(rotationMinSdkVersion);
+                }
+
+                try (ApkSignerEngine apkSigner = builder.build()) {
                     // We don't preserve the input APK's APK Signing Block (which contains v2
                     // signatures)
                     apkSigner.inputApkSigningBlock(null);

From 53a14bc621e69d81065cb5e65813c00aeaf8b6fb Mon Sep 17 00:00:00 2001
From: Mikhail Naganov <mnaganov@google.com>
Date: Wed, 27 Oct 2021 10:24:33 -0700
Subject: [PATCH 151/425] Add android.hardware.audio.common-V1-ndk.so

This is the package for the shared types of AIDL Audio HAL.

Bug: 198812639
Test: m
Change-Id: Ia953963380794591eae6b1140d180dc36dfbe7ca
---
 target/product/gsi/current.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 27c94275a7..f7e10cdbec 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -57,6 +57,7 @@ VNDK-SP: libunwindstack.so
 VNDK-SP: libutils.so
 VNDK-SP: libutilscallstack.so
 VNDK-SP: libz.so
+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

From ea842fa272ea05020533870be92951d8bae2df03 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 1 Nov 2021 21:09:15 +0000
Subject: [PATCH 152/425] Version bump to TP1A.211101.002 [core/build_id.mk]

Change-Id: I2cc3724992344ed04e7df613eea0d84dfeaa38c4
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 357e802877..b076c4a975 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=TP1A.211101.001
+BUILD_ID=TP1A.211101.002

From dc24dde20636a4823bc8aaf3825d139470fd4e36 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 2 Nov 2021 00:25:06 +0000
Subject: [PATCH 153/425] Version bump to TP1A.211101.003 [core/build_id.mk]

Change-Id: Iaddc20021551da1095e03e555df53fcb14eb1f17
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index b076c4a975..39ced73fe7 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=TP1A.211101.002
+BUILD_ID=TP1A.211101.003

From 12117c5e6c35f49428183add29ac1792bf0ba772 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 2 Nov 2021 04:21:09 +0000
Subject: [PATCH 154/425] Version bump to TP1A.211102.002 [core/build_id.mk]

Change-Id: I349598571eeeab0dda63ff6ca772b95a3e6d7e42
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index df23254d13..e5cee56ed2 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=TP1A.211102.001
+BUILD_ID=TP1A.211102.002

From 591e6a8f3fd40dc8f7e811a31aabb9ecb02372e7 Mon Sep 17 00:00:00 2001
From: Michael Wright <michaelwr@google.com>
Date: Thu, 28 Oct 2021 16:42:21 +0100
Subject: [PATCH 155/425] S V2 is now 32

Bug: 204295952
Test: N/A
Change-Id: I0627247e0b40c6c912584d55417671d20167b7c2
---
 core/config.mk            |   2 +-
 core/version_defaults.mk  |   4 +-
 target/product/gsi/32.txt | 223 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 226 insertions(+), 3 deletions(-)
 create mode 100644 target/product/gsi/32.txt

diff --git a/core/config.mk b/core/config.mk
index 8f47ab58b7..2a779c9b01 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -804,7 +804,7 @@ BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE))
 # is made which breaks compatibility with the previous platform sepolicy version,
 # not just on every increase in PLATFORM_SDK_VERSION.  The minor version should
 # be reset to 0 on every bump of the PLATFORM_SDK_VERSION.
-sepolicy_major_vers := 31
+sepolicy_major_vers := 32
 sepolicy_minor_vers := 0
 
 ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 8a12f6164c..d8300d44bb 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -47,7 +47,7 @@ MAX_PLATFORM_VERSION := TP1A
 # The last stable version name of the platform that was released.  During
 # development, this stays at that previous version, while the codename indicates
 # further work based on the previous version.
-PLATFORM_VERSION_LAST_STABLE := 12
+PLATFORM_VERSION_LAST_STABLE := 12L
 .KATI_READONLY := PLATFORM_VERSION_LAST_STABLE
 
 # These are the current development codenames, if the build is not a final
@@ -68,7 +68,7 @@ ifndef PLATFORM_SDK_VERSION
   # When you increment the PLATFORM_SDK_VERSION please ensure you also
   # clear out the following text file of all older PLATFORM_VERSION's:
   # cts/tests/tests/os/assets/platform_versions.txt
-  PLATFORM_SDK_VERSION := 31
+  PLATFORM_SDK_VERSION := 32
 endif
 .KATI_READONLY := PLATFORM_SDK_VERSION
 
diff --git a/target/product/gsi/32.txt b/target/product/gsi/32.txt
new file mode 100644
index 0000000000..971ec922a5
--- /dev/null
+++ b/target/product/gsi/32.txt
@@ -0,0 +1,223 @@
+LLNDK: libEGL.so
+LLNDK: libGLESv1_CM.so
+LLNDK: libGLESv2.so
+LLNDK: libGLESv3.so
+LLNDK: libRS.so
+LLNDK: libandroid_net.so
+LLNDK: libbinder_ndk.so
+LLNDK: libc.so
+LLNDK: libcgrouprc.so
+LLNDK: libdl.so
+LLNDK: libft2.so
+LLNDK: liblog.so
+LLNDK: libm.so
+LLNDK: libmediandk.so
+LLNDK: libnativewindow.so
+LLNDK: libneuralnetworks.so
+LLNDK: libselinux.so
+LLNDK: libsync.so
+LLNDK: libvndksupport.so
+LLNDK: libvulkan.so
+VNDK-SP: android.hardware.common-V2-ndk_platform.so
+VNDK-SP: android.hardware.common.fmq-V1-ndk_platform.so
+VNDK-SP: android.hardware.graphics.common-V2-ndk_platform.so
+VNDK-SP: android.hardware.graphics.common@1.0.so
+VNDK-SP: android.hardware.graphics.common@1.1.so
+VNDK-SP: android.hardware.graphics.common@1.2.so
+VNDK-SP: android.hardware.graphics.mapper@2.0.so
+VNDK-SP: android.hardware.graphics.mapper@2.1.so
+VNDK-SP: android.hardware.graphics.mapper@3.0.so
+VNDK-SP: android.hardware.graphics.mapper@4.0.so
+VNDK-SP: android.hardware.renderscript@1.0.so
+VNDK-SP: android.hidl.memory.token@1.0.so
+VNDK-SP: android.hidl.memory@1.0-impl.so
+VNDK-SP: android.hidl.memory@1.0.so
+VNDK-SP: android.hidl.safe_union@1.0.so
+VNDK-SP: libRSCpuRef.so
+VNDK-SP: libRSDriver.so
+VNDK-SP: libRS_internal.so
+VNDK-SP: libbacktrace.so
+VNDK-SP: libbase.so
+VNDK-SP: libbcinfo.so
+VNDK-SP: libblas.so
+VNDK-SP: libc++.so
+VNDK-SP: libcompiler_rt.so
+VNDK-SP: libcutils.so
+VNDK-SP: libdmabufheap.so
+VNDK-SP: libgralloctypes.so
+VNDK-SP: libhardware.so
+VNDK-SP: libhidlbase.so
+VNDK-SP: libhidlmemory.so
+VNDK-SP: libion.so
+VNDK-SP: libjsoncpp.so
+VNDK-SP: liblzma.so
+VNDK-SP: libprocessgroup.so
+VNDK-SP: libunwindstack.so
+VNDK-SP: libutils.so
+VNDK-SP: libutilscallstack.so
+VNDK-SP: libz.so
+VNDK-core: android.hardware.audio.common@2.0.so
+VNDK-core: android.hardware.authsecret-V1-ndk_platform.so
+VNDK-core: android.hardware.automotive.occupant_awareness-V1-ndk_platform.so
+VNDK-core: android.hardware.configstore-utils.so
+VNDK-core: android.hardware.configstore@1.0.so
+VNDK-core: android.hardware.configstore@1.1.so
+VNDK-core: android.hardware.confirmationui-support-lib.so
+VNDK-core: android.hardware.gnss-V1-ndk_platform.so
+VNDK-core: android.hardware.graphics.allocator@2.0.so
+VNDK-core: android.hardware.graphics.allocator@3.0.so
+VNDK-core: android.hardware.graphics.allocator@4.0.so
+VNDK-core: android.hardware.graphics.bufferqueue@1.0.so
+VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
+VNDK-core: android.hardware.health.storage-V1-ndk_platform.so
+VNDK-core: android.hardware.identity-V3-ndk_platform.so
+VNDK-core: android.hardware.keymaster-V3-ndk_platform.so
+VNDK-core: android.hardware.light-V1-ndk_platform.so
+VNDK-core: android.hardware.media.bufferpool@2.0.so
+VNDK-core: android.hardware.media.omx@1.0.so
+VNDK-core: android.hardware.media@1.0.so
+VNDK-core: android.hardware.memtrack-V1-ndk_platform.so
+VNDK-core: android.hardware.memtrack@1.0.so
+VNDK-core: android.hardware.oemlock-V1-ndk_platform.so
+VNDK-core: android.hardware.power-V2-ndk_platform.so
+VNDK-core: android.hardware.power.stats-V1-ndk_platform.so
+VNDK-core: android.hardware.rebootescrow-V1-ndk_platform.so
+VNDK-core: android.hardware.security.keymint-V1-ndk_platform.so
+VNDK-core: android.hardware.security.secureclock-V1-ndk_platform.so
+VNDK-core: android.hardware.security.sharedsecret-V1-ndk_platform.so
+VNDK-core: android.hardware.soundtrigger@2.0-core.so
+VNDK-core: android.hardware.soundtrigger@2.0.so
+VNDK-core: android.hardware.vibrator-V2-ndk_platform.so
+VNDK-core: android.hardware.weaver-V1-ndk_platform.so
+VNDK-core: android.hidl.token@1.0-utils.so
+VNDK-core: android.hidl.token@1.0.so
+VNDK-core: android.system.keystore2-V1-ndk_platform.so
+VNDK-core: android.system.suspend@1.0.so
+VNDK-core: libaudioroute.so
+VNDK-core: libaudioutils.so
+VNDK-core: libbinder.so
+VNDK-core: libbufferqueueconverter.so
+VNDK-core: libcamera_metadata.so
+VNDK-core: libcap.so
+VNDK-core: libcn-cbor.so
+VNDK-core: libcodec2.so
+VNDK-core: libcrypto.so
+VNDK-core: libcrypto_utils.so
+VNDK-core: libcurl.so
+VNDK-core: libdiskconfig.so
+VNDK-core: libdumpstateutil.so
+VNDK-core: libevent.so
+VNDK-core: libexif.so
+VNDK-core: libexpat.so
+VNDK-core: libfmq.so
+VNDK-core: libgatekeeper.so
+VNDK-core: libgui.so
+VNDK-core: libhardware_legacy.so
+VNDK-core: libhidlallocatorutils.so
+VNDK-core: libjpeg.so
+VNDK-core: libldacBT_abr.so
+VNDK-core: libldacBT_enc.so
+VNDK-core: liblz4.so
+VNDK-core: libmedia_helper.so
+VNDK-core: libmedia_omx.so
+VNDK-core: libmemtrack.so
+VNDK-core: libminijail.so
+VNDK-core: libmkbootimg_abi_check.so
+VNDK-core: libnetutils.so
+VNDK-core: libnl.so
+VNDK-core: libpcre2.so
+VNDK-core: libpiex.so
+VNDK-core: libpng.so
+VNDK-core: libpower.so
+VNDK-core: libprocinfo.so
+VNDK-core: libradio_metadata.so
+VNDK-core: libspeexresampler.so
+VNDK-core: libsqlite.so
+VNDK-core: libssl.so
+VNDK-core: libstagefright_bufferpool@2.0.so
+VNDK-core: libstagefright_bufferqueue_helper.so
+VNDK-core: libstagefright_foundation.so
+VNDK-core: libstagefright_omx.so
+VNDK-core: libstagefright_omx_utils.so
+VNDK-core: libstagefright_xmlparser.so
+VNDK-core: libsysutils.so
+VNDK-core: libtinyalsa.so
+VNDK-core: libtinyxml2.so
+VNDK-core: libui.so
+VNDK-core: libusbhost.so
+VNDK-core: libwifi-system-iface.so
+VNDK-core: libxml2.so
+VNDK-core: libyuv.so
+VNDK-core: libziparchive.so
+VNDK-private: libbacktrace.so
+VNDK-private: libblas.so
+VNDK-private: libcompiler_rt.so
+VNDK-private: libft2.so
+VNDK-private: libgui.so
+VNDK-product: android.hardware.audio.common@2.0.so
+VNDK-product: android.hardware.configstore@1.0.so
+VNDK-product: android.hardware.configstore@1.1.so
+VNDK-product: android.hardware.graphics.allocator@2.0.so
+VNDK-product: android.hardware.graphics.allocator@3.0.so
+VNDK-product: android.hardware.graphics.allocator@4.0.so
+VNDK-product: android.hardware.graphics.bufferqueue@1.0.so
+VNDK-product: android.hardware.graphics.bufferqueue@2.0.so
+VNDK-product: android.hardware.graphics.common@1.0.so
+VNDK-product: android.hardware.graphics.common@1.1.so
+VNDK-product: android.hardware.graphics.common@1.2.so
+VNDK-product: android.hardware.graphics.mapper@2.0.so
+VNDK-product: android.hardware.graphics.mapper@2.1.so
+VNDK-product: android.hardware.graphics.mapper@3.0.so
+VNDK-product: android.hardware.graphics.mapper@4.0.so
+VNDK-product: android.hardware.media.bufferpool@2.0.so
+VNDK-product: android.hardware.media.omx@1.0.so
+VNDK-product: android.hardware.media@1.0.so
+VNDK-product: android.hardware.memtrack@1.0.so
+VNDK-product: android.hardware.renderscript@1.0.so
+VNDK-product: android.hardware.soundtrigger@2.0.so
+VNDK-product: android.hidl.memory.token@1.0.so
+VNDK-product: android.hidl.memory@1.0.so
+VNDK-product: android.hidl.safe_union@1.0.so
+VNDK-product: android.hidl.token@1.0.so
+VNDK-product: android.system.suspend@1.0.so
+VNDK-product: libaudioutils.so
+VNDK-product: libbacktrace.so
+VNDK-product: libbase.so
+VNDK-product: libc++.so
+VNDK-product: libcamera_metadata.so
+VNDK-product: libcap.so
+VNDK-product: libcompiler_rt.so
+VNDK-product: libcrypto.so
+VNDK-product: libcurl.so
+VNDK-product: libcutils.so
+VNDK-product: libevent.so
+VNDK-product: libexpat.so
+VNDK-product: libfmq.so
+VNDK-product: libhidlbase.so
+VNDK-product: libhidlmemory.so
+VNDK-product: libion.so
+VNDK-product: libjpeg.so
+VNDK-product: libjsoncpp.so
+VNDK-product: libldacBT_abr.so
+VNDK-product: libldacBT_enc.so
+VNDK-product: liblz4.so
+VNDK-product: liblzma.so
+VNDK-product: libminijail.so
+VNDK-product: libnl.so
+VNDK-product: libpcre2.so
+VNDK-product: libpiex.so
+VNDK-product: libpng.so
+VNDK-product: libprocessgroup.so
+VNDK-product: libprocinfo.so
+VNDK-product: libspeexresampler.so
+VNDK-product: libssl.so
+VNDK-product: libtinyalsa.so
+VNDK-product: libtinyxml2.so
+VNDK-product: libunwindstack.so
+VNDK-product: libutils.so
+VNDK-product: libutilscallstack.so
+VNDK-product: libwifi-system-iface.so
+VNDK-product: libxml2.so
+VNDK-product: libyuv.so
+VNDK-product: libz.so
+VNDK-product: libziparchive.so

From 1e84e94b45b61bb6c44840921e8ff07a26115e8c Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 2 Nov 2021 19:05:04 +0000
Subject: [PATCH 156/425] Version bump to TP1A.211102.003 [core/build_id.mk]

Change-Id: I1a63ca468acdbb7417e109420e6be2f9d27af85b
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index e5cee56ed2..3ea72938d8 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=TP1A.211102.002
+BUILD_ID=TP1A.211102.003

From 38e7587660e57926f7589a7dc4ee7a7f26c1ad5d Mon Sep 17 00:00:00 2001
From: Gavin Corkery <gavincorkery@google.com>
Date: Fri, 5 Nov 2021 09:20:23 +0000
Subject: [PATCH 157/425] Add framework-supplementalprocess to
 PRODUCT_APEX_BOOT_JARS

Test: Builds
Bug: 204989700
Change-Id: I1ea34fabae77ae4158bf9799ff8d7e356a1f269e
---
 target/product/default_art_config.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 049c1365ec..5d1830213f 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -59,6 +59,7 @@ PRODUCT_APEX_BOOT_JARS := \
     com.android.permission:framework-permission-s \
     com.android.scheduling:framework-scheduling \
     com.android.sdkext:framework-sdkextensions \
+    com.android.supplementalprocess:framework-supplementalprocess \
     com.android.tethering:framework-connectivity \
     com.android.tethering:framework-tethering \
     com.android.uwb:framework-uwb \

From 652a11deb65154e3cfebed1a0e7af5ffe21848f7 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 5 Nov 2021 17:59:01 +0000
Subject: [PATCH 158/425] Version bump to TP1A.211105.002 [core/build_id.mk]

Change-Id: I3b0bf54c5273f70ad078004d98950dcec2613ddb
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 3f9b889ca5..fe1bfebe92 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=TP1A.211105.001
+BUILD_ID=TP1A.211105.002

From 6b6df5cf6903e72d3b5722b9cdb30378ba4d960d Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Fri, 5 Nov 2021 12:09:47 -0700
Subject: [PATCH 159/425] Remove fira_android uwb package from VNDK

Bug: 197886322
Test: Compiles
Change-Id: I1767910238e08d7c5cda73b4b4377d1f3039121d
---
 target/product/gsi/current.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index c6b5ec7ce1..0212cac768 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -100,7 +100,6 @@ VNDK-core: android.hardware.soundtrigger3-V1-ndk.so
 VNDK-core: android.hardware.soundtrigger@2.0-core.so
 VNDK-core: android.hardware.soundtrigger@2.0.so
 VNDK-core: android.hardware.uwb-V1-ndk.so
-VNDK-core: android.hardware.uwb.fira_android-V1-ndk.so
 VNDK-core: android.hardware.vibrator-V2-ndk.so
 VNDK-core: android.hardware.weaver-V1-ndk.so
 VNDK-core: android.hardware.wifi.hostapd-V1-ndk.so

From a603a503bee625f8618f0cae27b96a73e7b6cbfc Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 8 Nov 2021 21:51:25 +0000
Subject: [PATCH 160/425] Version bump to TP1A.211108.002 [core/build_id.mk]

Change-Id: I0b01ebe6a7979d66da4f91f633fbd4c7747e7e42
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 710ed975f9..c8e9ac58c5 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=TP1A.211108.001
+BUILD_ID=TP1A.211108.002

From f830b746366a6d4d25b0c919eab16184adaeac0a Mon Sep 17 00:00:00 2001
From: Tianjie <xunchang@google.com>
Date: Mon, 8 Nov 2021 22:55:53 -0800
Subject: [PATCH 161/425] Temporarily remove the care_map in the ota package

The care_map has incorrect size for non-sparse images. Temporarily
removes it until the root cause is fixed

Bug: 205541521
Test: build
Change-Id: I76bcd2c0c778566b4a6c69b6d45428952225d406
(cherry picked from commit 5856cfbf8212ddf9508bc03f58d61ed08a729cf8)
---
 tools/releasetools/ota_from_target_files.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index ec703ab7d6..6d1592c82a 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -1191,6 +1191,8 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
     care_map_list = [x for x in ["care_map.pb", "care_map.txt"] if
                      "META/" + x in target_zip.namelist()]
 
+    # TODO(b/205541521) remove the workaround after root cause is fixed.
+    care_map_list = []
     # Adds care_map if either the protobuf format or the plain text one exists.
     if care_map_list:
       care_map_name = care_map_list[0]

From d5a573352a68a716b571b5422da84ab7d752d467 Mon Sep 17 00:00:00 2001
From: Michael Wright <michaelwr@google.com>
Date: Fri, 29 Oct 2021 23:07:55 +0100
Subject: [PATCH 162/425] S V2 is now REL

Remove from the build file as it no longer is in development.

Bug: 204295952
Test: N/A
Change-Id: I5f94e458bf0c420341847a49242da20c9b4281e4
---
 core/version_defaults.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index d8300d44bb..9ae33a7a59 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -52,7 +52,6 @@ PLATFORM_VERSION_LAST_STABLE := 12L
 
 # These are the current development codenames, if the build is not a final
 # release build.  If this is a final release build, it is simply "REL".
-PLATFORM_VERSION_CODENAME.SP2A := Sv2
 PLATFORM_VERSION_CODENAME.TP1A := Tiramisu
 
 ifndef PLATFORM_SDK_VERSION

From 1bcaafcbdd06a600e1a0d786971d0761e1436097 Mon Sep 17 00:00:00 2001
From: Joshua Trask <joshtrask@google.com>
Date: Wed, 10 Nov 2021 16:10:23 -0500
Subject: [PATCH 163/425] Add unbundled IntentResolver to base_system.

Please let me know if there's some other config
where this might be a better fit instead.

The earlier prototyping work that established the
first "delegate chooser" component (i.e.
"Phase 2" of go/sharesheet-unbundling-phases)
implemented that component in SystemUI, which is
explicitly referenced only in handheld_system_ext.
OTOH the original ("system") Sharesheet comes
from frameworks/base, so for parity it seems like
this probably belongs in base_system instead.

Note that this still has no user-observable
effect; the IntentResolver component is only
invoked under the DeviceConfig flag
`systemui::use_delegate_chooser` which is
currently false for all users who haven't
manually opted-in.

Bug: 202164690
Test: Manually tested functionality on raven
after `mp droid` (or more easily, just confirm
the presence of the component by
`adb shell pm list packages` and check for
`package:com.android.intentresolver`).

Change-Id: I04579cd722fe5c04b4ce3fc1cc291b272c7ebab2
---
 target/product/base_system.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 0a6e007bd6..5c372ae522 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -116,6 +116,7 @@ PRODUCT_PACKAGES += \
     init_system \
     input \
     installd \
+    IntentResolver \
     iorapd \
     ip \
     iptables \

From f9c32620f4276f3358642eb61fa94cddf5766504 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 11 Nov 2021 20:06:27 +0000
Subject: [PATCH 164/425] Version bump to TP1A.211111.002 [core/build_id.mk]

Change-Id: Idbe4707902346bb76ff1ff3227a770a90d525c47
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index ede84257cf..0e881faacb 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=TP1A.211111.001
+BUILD_ID=TP1A.211111.002

From 9920f10d00efd2bf249f33fa33caadb6aca1e61f Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 12 Nov 2021 18:22:56 +0000
Subject: [PATCH 165/425] Version bump to TP1A.211112.002 [core/build_id.mk]

Change-Id: Ib389e430df08230d87dc3809fcb1bf8135cbac7d
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index d95dcca817..85154d153e 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=TP1A.211112.001
+BUILD_ID=TP1A.211112.002

From 1fa82bee12bf9158f69f3c5bacd785e340390503 Mon Sep 17 00:00:00 2001
From: Gavin Corkery <gavincorkery@google.com>
Date: Mon, 15 Nov 2021 20:39:32 +0000
Subject: [PATCH 166/425] Revert "Add framework-supplementalprocess to
 PRODUCT_APEX_BOOT_JARS"

Revert "Add framework-supplementalprocess prebuilts"

Revert submission 16194363-supplementalprocess-stubs

Reason for revert: PDK build break
Reverted Changes:
Ie1d3605d2:Add SupplementalProcess stubs and bootclasspath fr...
I1ea34faba:Add framework-supplementalprocess to PRODUCT_APEX_...
I8ef2a4c0f:Add jars and fragment to SupplementalProcess apex
Ibf9444f89:Add framework-supplementalprocess prebuilts

Change-Id: I76974501e045bfa3f96a29d72e23952eb7d824cb
---
 target/product/default_art_config.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 5d1830213f..049c1365ec 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -59,7 +59,6 @@ PRODUCT_APEX_BOOT_JARS := \
     com.android.permission:framework-permission-s \
     com.android.scheduling:framework-scheduling \
     com.android.sdkext:framework-sdkextensions \
-    com.android.supplementalprocess:framework-supplementalprocess \
     com.android.tethering:framework-connectivity \
     com.android.tethering:framework-tethering \
     com.android.uwb:framework-uwb \

From 7a70db721b052d6b43a652d9b01244bcc37d05eb Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 15 Nov 2021 10:58:31 -0800
Subject: [PATCH 167/425] Always default to 1.9 for host java modules in
 Android.mk files

Host modules shouldn't use the logic for device modules to determine
the java language version to use, always default to 1.9.

Cherry-pick from https://r.android.com/1892956 - this may be necessary
in sc-mainline-prod when it switches to prebuilt SDKs (b/204189791).

Bug: 202761304
Test: presubmits
Change-Id: I268dd34d887db4646e188858c7f2aedc30966856
Merged-In: I268dd34d887db4646e188858c7f2aedc30966856
---
 core/java_common.mk | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/core/java_common.mk b/core/java_common.mk
index 1798ca8452..f97f73c5fe 100644
--- a/core/java_common.mk
+++ b/core/java_common.mk
@@ -21,15 +21,20 @@ endif
 # Modules can override this logic by specifying
 # LOCAL_JAVA_LANGUAGE_VERSION explicitly.
 ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION))
-  ifneq (,$(filter $(LOCAL_SDK_VERSION), $(TARGET_SDK_VERSIONS_WITHOUT_JAVA_18_SUPPORT)))
-    LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-  else ifneq (,$(filter $(LOCAL_SDK_VERSION), $(TARGET_SDK_VERSIONS_WITHOUT_JAVA_19_SUPPORT)))
-    LOCAL_JAVA_LANGUAGE_VERSION := 1.8
-  else ifneq (,$(LOCAL_SDK_VERSION)$(TARGET_BUILD_USE_PREBUILT_SDKS))
-    # TODO(ccross): allow 1.9 for current and unbundled once we have SDK system modules
-    LOCAL_JAVA_LANGUAGE_VERSION := 1.8
-  else
+  ifdef LOCAL_IS_HOST_MODULE
+    # Host modules always default to 1.9
     LOCAL_JAVA_LANGUAGE_VERSION := 1.9
+  else
+    ifneq (,$(filter $(LOCAL_SDK_VERSION), $(TARGET_SDK_VERSIONS_WITHOUT_JAVA_18_SUPPORT)))
+      LOCAL_JAVA_LANGUAGE_VERSION := 1.7
+    else ifneq (,$(filter $(LOCAL_SDK_VERSION), $(TARGET_SDK_VERSIONS_WITHOUT_JAVA_19_SUPPORT)))
+      LOCAL_JAVA_LANGUAGE_VERSION := 1.8
+    else ifneq (,$(LOCAL_SDK_VERSION)$(TARGET_BUILD_USE_PREBUILT_SDKS))
+      # TODO(ccross): allow 1.9 for current and unbundled once we have SDK system modules
+      LOCAL_JAVA_LANGUAGE_VERSION := 1.8
+    else
+      LOCAL_JAVA_LANGUAGE_VERSION := 1.9
+    endif
   endif
 endif
 LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION)

From 2ac33aa15332bac2478304955dbc04437edbc9f7 Mon Sep 17 00:00:00 2001
From: Gavin Corkery <gavincorkery@google.com>
Date: Tue, 16 Nov 2021 22:33:10 +0000
Subject: [PATCH 168/425] Revert "Revert "Add framework-supplementalprocess to
 PRODUCT_APE..."

Revert^2 "Add framework-supplementalprocess prebuilts"

e0c2a4dea0d0e27abad0cd3e4d440ab8f82752e4

Change-Id: I1c35394c2fed645cbffa3e91e6b841a0f763329d
---
 target/product/default_art_config.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 049c1365ec..5d1830213f 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -59,6 +59,7 @@ PRODUCT_APEX_BOOT_JARS := \
     com.android.permission:framework-permission-s \
     com.android.scheduling:framework-scheduling \
     com.android.sdkext:framework-sdkextensions \
+    com.android.supplementalprocess:framework-supplementalprocess \
     com.android.tethering:framework-connectivity \
     com.android.tethering:framework-tethering \
     com.android.uwb:framework-uwb \

From 39d7b2bb93a83f3cf9577f772181e8752aee3055 Mon Sep 17 00:00:00 2001
From: Alice Kuo <aliceypkuo@google.com>
Date: Wed, 17 Nov 2021 17:00:07 +0800
Subject: [PATCH 169/425] Add android.hardware.bluetooth.audio-V1-ndk.so

This is the package for the shared types of AIDL Audio HAL.

Bug: 203490261
Test: m
Change-Id: I62e1ce426f741b0e241ebf409fa2e9ea91f8fe73
---
 target/product/gsi/current.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 0212cac768..12780b064e 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -61,6 +61,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.configstore-utils.so
 VNDK-core: android.hardware.configstore@1.0.so
 VNDK-core: android.hardware.configstore@1.1.so

From 5ebaf6ecfb1c54b36a214450bdbe8e529a3237eb Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 17 Nov 2021 20:59:50 +0000
Subject: [PATCH 170/425] Version bump to TP1A.211117.002 [core/build_id.mk]

Change-Id: If0258fbb1693401da0d2d79409075dc9e2698e2c
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 4b1fd446e6..b378e0b4f8 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=TP1A.211117.001
+BUILD_ID=TP1A.211117.002

From 8ad45ec83a64cee4bb629709b6211613684297ca Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 18 Nov 2021 23:09:11 +0000
Subject: [PATCH 171/425] Version bump to TP1A.211118.002 [core/build_id.mk]

Change-Id: I61348fffd01cb9410a49c78a60ae489b0cd2fed9
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 34ead30e80..5ca576c168 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=TP1A.211118.001
+BUILD_ID=TP1A.211118.002

From 05a3f808eb2f234ebfd06f5976969fa43bedca9e Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 19 Nov 2021 03:05:07 +0000
Subject: [PATCH 172/425] Version bump to TP1A.211119.002 [core/build_id.mk]

Change-Id: Iad03b377b5db9591ad201b75784dd3aaad5b4afa
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index eb9ada41b1..4a7bf6585e 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=TP1A.211119.001
+BUILD_ID=TP1A.211119.002

From 36af601dd4d621d656a6a09802f6a7af7095d019 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 22 Nov 2021 19:28:39 +0000
Subject: [PATCH 173/425] Version bump to TP1A.211122.002 [core/build_id.mk]

Change-Id: I58a85302cac6d84b05b44745ab6075a91170ecf5
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 04444f2ae7..de22492539 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=TP1A.211122.001
+BUILD_ID=TP1A.211122.002

From 4bb6145e88ec076e164fa9d49f704b01beab9eca Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 23 Nov 2021 17:35:18 +0000
Subject: [PATCH 174/425] Version bump to TP1A.211123.002 [core/build_id.mk]

Change-Id: Ifa9427f2c60fcce3d4a29c07a4871b2a4afd45d8
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 3c7baae101..43ed96f18c 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=TP1A.211123.001
+BUILD_ID=TP1A.211123.002

From b044c90302149ef8f28d119c674e960a35775059 Mon Sep 17 00:00:00 2001
From: RafayKamran <rafaykamran@google.com>
Date: Thu, 4 Nov 2021 10:33:24 +0000
Subject: [PATCH 175/425] Created supplemental_process certificate and private
 key

Used ~/master/development/tools/make_key with the subject '/C=US/ST=California/L=Mountain View/
O=Android/OU=Android/CN=Android/emailAddress=android@android.com' to create the certificate and key

Bug: 203670791
Test: make, Device boots
Change-Id: Ib0cdf7786c7f74cf294c54187649114e8ec6d315
---
 .../product/security/supplemental_process.pk8 | Bin 0 -> 1219 bytes
 .../security/supplemental_process.x509.pem    |  24 ++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 target/product/security/supplemental_process.pk8
 create mode 100644 target/product/security/supplemental_process.x509.pem

diff --git a/target/product/security/supplemental_process.pk8 b/target/product/security/supplemental_process.pk8
new file mode 100644
index 0000000000000000000000000000000000000000..23b880ba2f1267c631aff3d9f649e62d1dabb0f2
GIT binary patch
literal 1219
zcmV;!1U&mNf&{+;0RS)!1_>&LNQU<f0RaI800e>rsW5^Br2+u}0)hbn0Mpp_cO>z@
z$|G-!7ml@;vSrg?N3;I!m+G24`em1=TxHddagB=cWfO=KQwcA|n#;(TCMashv_V-j
z$zs+SOtB>ccXC4GAPj=7l>~P{0}-Lkh$^`saE9m-&h^G#{1SB1LG(#YK?S_npw2hJ
zdvaB@(8BZ-f8TO1_Jc$Z&MI5bx#AuZSaR~dj`_NL&p|<w>fs265!(OEr)88DU`KQ}
z01!5&+%eY8@EQ8C6hev74j}h@Qttz_iXSd6|6s~E2z^lH{!~G`Pqw8to5$lo-&SKY
z8qW2lwGloYfXDTT*9fpIRwoU1VPOJQ>x*7z8(<<vbgLfk>1uEs>jDD-009Dm0RaHZ
z+JuJ*?e};z5h?FUOhn~QM$qRjwW=~zc7`Vni<xM+HGvB30YA9g%AJkT(LZy=l?jvX
zV3IpZhU4aLO-Gv?`&km7$nACUlkOz%Uoj!V-N-?=n%q7V6HUemixKP2cFVlmt&PEa
z8}#`IcW$4vt@Vh_kirQnqh7QCEQV)9z9#w?$1k%K3K{*IO&;p;mrjrG&}M>)lr@_A
zZg^lg06%XxvN@&{J>DX;a!szarsqxN^)p<mO^K8&|MiC<_`j>S8@>XN`W?`^(-lL&
zW{fTE`$6^}UeRVd>Ruc|V6J}QiQFXrwQ`+tMTp}PQww}PzUr()6G&P;$&Nt+fq?+<
zkL-{tCwU_@Z!EpkJ-Bm5w7;d&aEp|ku*6r5{Mn{%m_j>9^NY6LhQjZ$9iV_xQ|?I0
zhF?Evyp}T+Rgpko3W{~~TE3&e4bye^iwqP5!P+5K5MXO5h~wMRrfu)J;Kc~?KobA0
z1@6tNM@)7R4m`oeq&f&5sC!>d`zSvGfq?+waZR+IcN?6DC1!Td=b{k9!FO*3Z!%ro
zK)xh&nd{aN`B^5R05ih1B*xX4-=}lVo6Yy92sY9|Wp6STc1`5gn8Yx5GcS{@iaMSi
zv1ZQwKvdL_1vN%ObRavH>;u?5^mE}A*{?R-=i6#y&s&8@u|4l@4}XA|NfPC{1VB{+
zfq?*+$Y0N6=5z{1=m7hJOS{zq=o0(p{&BbNy70(GwtFcz{$08^XYQ#p1y$2iqU2}$
zVX*1!E|FQi_V-crPsbCYtFJ1d3GE;x{^I$5L4s#UYBBbZDUgF6`vCNT0uZ`;Ol0?b
zoAWgd7s7@<icjW%h>=g^urlW>Nr)+p2>6o%fq;Ju;iLBAT{k={2eHw;Qo?KR?j<cm
z+jq97GyzMED>1s`D{$|xGkkfazCgw#)ifBc3CES>wJ?nqV=^%!e+Py^72ncrkW_;j
zYpRUZp@8X(g~B~x5(EU3c~0BmD$#_Pr){KY$E*F8)jI+J>@5<QI<;b}ZArz5`4ehi
z*7*W~fdHdkRd$$~Ez&cwg`Mq*BLmdvjUa3pbe>3wma{pTcH}##@a~Hv%xJo~$E4|r
zKV<}5vy=h!OEP!ebI*como2lO&?+s-RsjBX`-i9!c^QwgRqpr_HxVKx{HyHd)9bZF
h)21wBt^AwMTnVDg({lR9pMAj{7d|3?OL#5kvYckdQ_%nb

literal 0
HcmV?d00001

diff --git a/target/product/security/supplemental_process.x509.pem b/target/product/security/supplemental_process.x509.pem
new file mode 100644
index 0000000000..0bd20f3ee8
--- /dev/null
+++ b/target/product/security/supplemental_process.x509.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIECzCCAvOgAwIBAgIUMWJGQnrJU7zBEpPqv63u2HOlib0wDQYJKoZIhvcNAQEL
+BQAwgZQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH
+DA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRy
+b2lkMRAwDgYDVQQDDAdBbmRyb2lkMSIwIAYJKoZIhvcNAQkBFhNhbmRyb2lkQGFu
+ZHJvaWQuY29tMB4XDTIxMTEwMjE3MDIxNFoXDTQ5MDMyMDE3MDIxNFowgZQxCzAJ
+BgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFp
+biBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRyb2lkMRAwDgYD
+VQQDDAdBbmRyb2lkMSIwIAYJKoZIhvcNAQkBFhNhbmRyb2lkQGFuZHJvaWQuY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA09j3dyTxv8ojb4sXjrWX
+smXTYEez/u6X6po8+mWXp1xl1Y9xjYrxZROIE1MJL8aay8iYJihqx7RBWTPJYtYZ
+TLElA3dyQuMgDIKtlQR3QAMRoc2IKrkfcIboEs71xl78EnTSQfRJTUEFvNigzjfB
+e3JVtNDC9BR/33Iv9oNED84qW9C54h4TWHLyvo75unzPQUGS6uEIhhHa/8ynZZQW
+YEd0NwAQNqbcMdbN8Bn6sRRCidEOIPd8Uu8DtIofLi7/YMo4CH1Q5f5UQbtPtqU2
+m8fjQN9WYzMazvWltRE+HYDH9YnXCLAsVicNdmFhAlXri15nG2AiRnSrHu/panAc
+6wIDAQABo1MwUTAdBgNVHQ4EFgQU3F5r2DhJbRfkJKuqs1hjP/0dCUEwHwYDVR0j
+BBgwFoAU3F5r2DhJbRfkJKuqs1hjP/0dCUEwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAwQQ8/D3f/WS5cwqcsFpT+Qzik9yTu53nsXz/pBDSbeM3
+zX1RCejXsmXhPjN7cu0uJYlrIuArOagHSC5pDci6GzcwunnnkRazSAmTpHLSRgeb
+cLgKHLCph9sulI1r82x9upF47zLlbfkTrtGJryej+yWJ2Ne8irJIPeNR0z0sTBWJ
+2Ngg55ezFWj3mihzw4Z6YU9txJB7Gj9eNYXdcubjoNs2mSU/6dR+HwJtD64FuH3x
+QLGMZscizCN8N6b5xayjwPsszQhaHI4iR4oGJ9prbDd0JoylwWr2LrQhYuWQCn20
+cG5YhrtZshj6f1eGV1TDYd8xziapilqwzrchARvP8g==
+-----END CERTIFICATE-----

From cf713d429b40f45938625daecd659b490af13c0a Mon Sep 17 00:00:00 2001
From: Jerome Gaillard <jgaillard@google.com>
Date: Wed, 23 Oct 2019 11:43:26 +0100
Subject: [PATCH 176/425] Use Android fonts as they are for layoutlib native

Layoutlib native can handle fonts as the Android framework does. So
simply copy the Android fonts for layoutlib.

Exempt-From-Owner-Approval: experimental branch
Bug: 143073883
Test: layoutlib tests
Change-Id: Ida2e081d1b0737c70ea8621b23b5f0e729d5df35
Merged-In: Ida2e081d1b0737c70ea8621b23b5f0e729d5df35
---
 core/Makefile           | 11 ++++---
 core/layoutlib_fonts.mk | 35 ++++++++++++++++++++++
 core/sdk_font.mk        | 66 -----------------------------------------
 3 files changed, 40 insertions(+), 72 deletions(-)
 create mode 100644 core/layoutlib_fonts.mk
 delete mode 100644 core/sdk_font.mk

diff --git a/core/Makefile b/core/Makefile
index 6498a471bc..a73bfe1951 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -5973,8 +5973,6 @@ else
 sdk_atree_files += $(atree_dir)/sdk.atree
 endif
 
-include $(BUILD_SYSTEM)/sdk_font.mk
-
 deps := \
 	$(target_notice_file_txt) \
 	$(tools_notice_file_txt) \
@@ -5995,8 +5993,7 @@ deps := \
 	$(ATREE_FILES) \
 	$(sdk_atree_files) \
 	$(HOST_OUT_EXECUTABLES)/atree \
-	$(HOST_OUT_EXECUTABLES)/line_endings \
-	$(SDK_FONT_DEPS)
+	$(HOST_OUT_EXECUTABLES)/line_endings
 
 INTERNAL_SDK_TARGET := $(sdk_dir)/$(sdk_name).zip
 $(INTERNAL_SDK_TARGET): PRIVATE_NAME := $(sdk_name)
@@ -6019,7 +6016,6 @@ $(INTERNAL_SDK_TARGET): $(deps)
 	  fi; \
 	done; \
 	if [ $$FAIL ]; then exit 1; fi
-	$(hide) echo $(notdir $(SDK_FONT_DEPS)) | tr " " "\n"  > $(SDK_FONT_TEMP)/fontsInSdk.txt
 	$(hide) ( \
 	    ATREE_STRIP="$(HOST_STRIP) -x" \
 	    $(HOST_OUT_EXECUTABLES)/atree \
@@ -6035,7 +6031,6 @@ $(INTERNAL_SDK_TARGET): $(deps)
 	        -v "TARGET_ARCH=$(TARGET_ARCH)" \
 	        -v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \
 	        -v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \
-	        -v "FONT_OUT=$(SDK_FONT_TEMP)" \
 	        -o $(PRIVATE_DIR) && \
 	    cp -f $(target_notice_file_txt) \
 	            $(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \
@@ -6121,3 +6116,7 @@ $(call dist-for-goals,haiku,$(SOONG_FUZZ_PACKAGING_ARCH_MODULES))
 .PHONY: haiku-rust
 haiku-rust: $(SOONG_RUST_FUZZ_PACKAGING_ARCH_MODULES) $(ALL_RUST_FUZZ_TARGETS)
 $(call dist-for-goals,haiku-rust,$(SOONG_RUST_FUZZ_PACKAGING_ARCH_MODULES))
+
+# -----------------------------------------------------------------
+# Extract platform fonts used in Layoutlib
+include $(BUILD_SYSTEM)/layoutlib_fonts.mk
diff --git a/core/layoutlib_fonts.mk b/core/layoutlib_fonts.mk
new file mode 100644
index 0000000000..d2a814f85d
--- /dev/null
+++ b/core/layoutlib_fonts.mk
@@ -0,0 +1,35 @@
+# Fonts for layoutlib
+
+FONT_TEMP := $(call intermediates-dir-for,PACKAGING,fonts,HOST,COMMON)
+
+# The font configuration files - system_fonts.xml, fallback_fonts.xml etc.
+font_config := $(sort $(wildcard frameworks/base/data/fonts/*.xml))
+font_config := $(addprefix $(FONT_TEMP)/, $(notdir $(font_config)))
+
+$(font_config): $(FONT_TEMP)/%.xml: \
+			frameworks/base/data/fonts/%.xml
+	$(hide) mkdir -p $(dir $@)
+	$(hide) cp -vf $< $@
+
+# List of fonts on the device that we want to ship. This is all .ttf, .ttc and .otf fonts.
+fonts_device := $(filter $(TARGET_OUT)/fonts/%.ttf $(TARGET_OUT)/fonts/%.ttc $(TARGET_OUT)/fonts/%.otf, $(INTERNAL_SYSTEMIMAGE_FILES))
+fonts_device := $(addprefix $(FONT_TEMP)/, $(notdir $(fonts_device)))
+
+# TODO: If the font file is a symlink, reuse the font renamed from the symlink
+# target.
+$(fonts_device): $(FONT_TEMP)/%: $(TARGET_OUT)/fonts/%
+	$(hide) mkdir -p $(dir $@)
+	$(hide) cp -vf $< $@
+
+# List of all dependencies - all fonts and configuration files.
+FONT_FILES := $(fonts_device) $(font_config)
+
+.PHONY: layoutlib layoutlib-tests
+layoutlib layoutlib-tests: $(FONT_FILES)
+
+$(call dist-for-goals, layoutlib, $(foreach m,$(FONT_FILES), $(m):layoutlib_native/fonts/$(notdir $(m))))
+
+FONT_TEMP :=
+font_config :=
+fonts_device :=
+FONT_FILES :=
diff --git a/core/sdk_font.mk b/core/sdk_font.mk
deleted file mode 100644
index 174292559f..0000000000
--- a/core/sdk_font.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-###############################################################################
-# Fonts shipped with the SDK need to be renamed for Java to handle them
-# properly. Hence, a special script is used to rename the fonts. We bundle all
-# the fonts that are shipped on a newer non-space-constrained device. However,
-# OpenType fonts used on these devices are not supported by Java. Their
-# replacements are added separately.
-###############################################################################
-
-
-# The script that renames the font.
-sdk_font_rename_script := frameworks/layoutlib/rename_font/build_font_single.py
-
-# Location of the fonttools library that the above script depends on.
-fonttools_lib := external/fonttools/Lib
-
-# A temporary location to store the renamed fonts. atree picks all files in
-# this directory and bundles it with the SDK.
-SDK_FONT_TEMP := $(call intermediates-dir-for,PACKAGING,sdk-fonts,HOST,COMMON)
-
-# The font configuration files - system_fonts.xml, fallback_fonts.xml etc.
-sdk_font_config := $(sort $(wildcard frameworks/base/data/fonts/*.xml))
-sdk_font_config :=  $(addprefix $(SDK_FONT_TEMP)/standard/, $(notdir $(sdk_font_config)))
-
-$(sdk_font_config): $(SDK_FONT_TEMP)/standard/%.xml: \
-			frameworks/base/data/fonts/%.xml
-	$(hide) mkdir -p $(dir $@)
-	$(hide) cp -vf $< $@
-
-# List of fonts on the device that we want to ship. This is all .ttf fonts.
-sdk_fonts_device := $(filter $(TARGET_OUT)/fonts/%.ttf, $(INTERNAL_SYSTEMIMAGE_FILES))
-sdk_fonts_device := $(addprefix $(SDK_FONT_TEMP)/, $(notdir $(sdk_fonts_device)))
-
-# Macro to rename the font.
-sdk_rename_font = PYTHONPATH=$$PYTHONPATH:$(fonttools_lib) $(sdk_font_rename_script) \
-	    $1 $2
-
-# TODO: If the font file is a symlink, reuse the font renamed from the symlink
-# target.
-$(sdk_fonts_device): $(SDK_FONT_TEMP)/%.ttf: $(TARGET_OUT)/fonts/%.ttf \
-			$(sdk_font_rename_script)
-	$(hide) mkdir -p $(dir $@)
-	$(hide) $(call sdk_rename_font,$<,$@)
-
-# List of all dependencies - all fonts and configuration files.
-SDK_FONT_DEPS := $(sdk_fonts_device) $(sdk_font_config)
-
-# Define a macro to create rule for addititional fonts that we want to include
-# in the SDK.
-# $1 Output font name
-# $2 Source font path
-define sdk-extra-font-rule
-fontfullname := $$(SDK_FONT_TEMP)/$1
-ifeq ($$(filter $$(fontfullname),$$(sdk_fonts_device)),)
-SDK_FONT_DEPS += $$(fontfullname)
-$$(fontfullname): $2 $$(sdk_font_rename_script)
-	$$(hide) mkdir -p $$(dir $$@)
-	$$(hide) $$(call sdk_rename_font,$$<,$$@)
-endif
-fontfullname :=
-endef
-
-# These extra fonts are used as a replacement for OpenType fonts.
-$(eval $(call sdk-extra-font-rule,NanumGothic.ttf,external/naver-fonts/NanumGothic.ttf))
-$(eval $(call sdk-extra-font-rule,DroidSansFallback.ttf,frameworks/base/data/fonts/DroidSansFallbackFull.ttf))
-
-sdk-extra-font-rule :=

From 2cd7bb5126f230bf07026ae24139264cb7e6542d Mon Sep 17 00:00:00 2001
From: Edwin <edwinwong@google.com>
Date: Fri, 23 Jul 2021 10:36:49 -0700
Subject: [PATCH 177/425] Update current.txt for DRM AIDL changes

Add android.hardware.drm-V1-ndk.so to
VNDK-Core for converting drm HIDL to
AIDL interface.

Test: build
  m android.hardware.drm-update-api -j128 && m -j128

Bug: 200055138
Bug: 170964303
Change-Id: Idcd0a8e444abad978c38dee204e8a8c2db2e2762
---
 target/product/gsi/current.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 1091b0fd07..424f964401 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -65,6 +65,7 @@ VNDK-core: android.hardware.configstore-utils.so
 VNDK-core: android.hardware.configstore@1.0.so
 VNDK-core: android.hardware.configstore@1.1.so
 VNDK-core: android.hardware.confirmationui-support-lib.so
+VNDK-core: android.hardware.drm-V1-ndk.so
 VNDK-core: android.hardware.dumpstate-V1-ndk.so
 VNDK-core: android.hardware.gnss-V1-ndk.so
 VNDK-core: android.hardware.graphics.allocator@2.0.so

From 19c09265c171590d4f6743e792eff7544bd14f5b Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 2 Dec 2021 20:07:10 +0000
Subject: [PATCH 178/425] Version bump to TP1A.211202.002 [core/build_id.mk]

Change-Id: I009c6575c1b46abcd29ef340954a81b87f641bfc
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 3cfb3e1489..40265d3f68 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=TP1A.211202.001
+BUILD_ID=TP1A.211202.002

From 5de955389febeb77795295c8b2b0548855232057 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 3 Dec 2021 17:07:15 +0000
Subject: [PATCH 179/425] Version bump to TP1A.211203.002 [core/build_id.mk]

Change-Id: Ic5cd217926581bc82ae5a08c8315a45ab38e0f38
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 3b62f6cc8f..c5eca9b28a 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=TP1A.211203.001
+BUILD_ID=TP1A.211203.002

From 05bc7a1d9d9cf5d91d1daf233b7216caf515452b Mon Sep 17 00:00:00 2001
From: Bassem Khalife <bkhalife@google.com>
Date: Sat, 4 Dec 2021 17:29:01 +0000
Subject: [PATCH 180/425] Update Security String to 2022-01-05

Bug: 207022948

Change-Id: Icec6bde7de35a844d520d6450b5a2562335591aa
Merged-In: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index b68c197d37..5e85c7f4ca 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -85,7 +85,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 := 2021-12-05
+    PLATFORM_SECURITY_PATCH := 2022-01-05
 endif
 
 include $(BUILD_SYSTEM)/version_util.mk

From 6e9913648d5c783b4c3137ed7188ad8fe2748d65 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 7 Dec 2021 02:44:58 +0000
Subject: [PATCH 181/425] Version bump to TP1A.211207.002 [core/build_id.mk]

Change-Id: I245a7c3211eeb778d90fe6405a3f22f359448825
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 4a7c7acbe1..cd0b0da54b 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=TP1A.211207.001
+BUILD_ID=TP1A.211207.002

From 8bfa7cd0eabca425bccea531aca6cfab2f8e44b0 Mon Sep 17 00:00:00 2001
From: Edwin Tung <edwintung@google.com>
Date: Tue, 7 Dec 2021 13:50:06 +0800
Subject: [PATCH 182/425] Add GnssVisibilityControl AIDL to VNDK

Bug: 208728105
Test: build pass and atest VtsHalGnssTargetTest
Change-Id: Ic6326377e51b22ee50d0c56e68caf2cac3a93eb0
---
 target/product/gsi/current.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 0212cac768..3a275ec1e1 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -66,6 +66,7 @@ VNDK-core: android.hardware.configstore@1.0.so
 VNDK-core: android.hardware.configstore@1.1.so
 VNDK-core: android.hardware.confirmationui-support-lib.so
 VNDK-core: android.hardware.gnss-V1-ndk.so
+VNDK-core: android.hardware.gnss.visibility_control-V1-ndk.so
 VNDK-core: android.hardware.graphics.allocator@2.0.so
 VNDK-core: android.hardware.graphics.allocator@3.0.so
 VNDK-core: android.hardware.graphics.allocator@4.0.so

From ed499b61a43edcf9006b883f1984123922f17be3 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 7 Dec 2021 18:31:11 +0000
Subject: [PATCH 183/425] Version bump to TP1A.211207.003 [core/build_id.mk]

Change-Id: I9c6551880ae6e329cb010bbbfc5619042d58b75c
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index cd0b0da54b..ffef653931 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=TP1A.211207.002
+BUILD_ID=TP1A.211207.003

From 8c34de79b2755fd81719e42e2682c14693afbd30 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 9 Dec 2021 18:21:10 +0000
Subject: [PATCH 184/425] Version bump to TP1A.211209.002 [core/build_id.mk]

Change-Id: Ie73f4fc73339e9fc38a064e9c09c73c582d2e496
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index f6d2fa92ea..8e15f79e3b 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=TP1A.211209.001
+BUILD_ID=TP1A.211209.002

From 6082d0aeb592b8c90a4030f87739f74ce8a9e822 Mon Sep 17 00:00:00 2001
From: Ben Fennema <fennema@google.com>
Date: Sat, 11 Dec 2021 14:03:10 -0800
Subject: [PATCH 185/425] Add --avb_recovery_* options to replace recovery avb
 key

Test: run sign_target_files_apks with --avb_recovery_key to specify a different key and check with avbtool the key was replaced
Bug: 210126985
Signed-off-by: Ben Fennema <fennema@google.com>
Change-Id: Ic2bb3f6855a49ec065a4c778c429ff076902b95c
---
 tools/releasetools/sign_target_files_apks.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
index 562698096a..663ab348f8 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -99,15 +99,15 @@ Usage:  sign_target_files_apks [flags] input_target_files output_target_files
       The second dir will be used for lookup if BOARD_USES_RECOVERY_AS_BOOT is
       set to true.
 
-  --avb_{boot,system,system_other,vendor,dtbo,vbmeta,vbmeta_system,
+  --avb_{boot,recovery,system,system_other,vendor,dtbo,vbmeta,vbmeta_system,
          vbmeta_vendor}_algorithm <algorithm>
-  --avb_{boot,system,system_other,vendor,dtbo,vbmeta,vbmeta_system,
+  --avb_{boot,recovery,system,system_other,vendor,dtbo,vbmeta,vbmeta_system,
          vbmeta_vendor}_key <key>
       Use the specified algorithm (e.g. SHA256_RSA4096) and the key to AVB-sign
       the specified image. Otherwise it uses the existing values in info dict.
 
-  --avb_{apex,boot,system,system_other,vendor,dtbo,vbmeta,vbmeta_system,
-         vbmeta_vendor}_extra_args <args>
+  --avb_{apex,boot,recovery,system,system_other,vendor,dtbo,vbmeta,
+         vbmeta_system,vbmeta_vendor}_extra_args <args>
       Specify any additional args that are needed to AVB-sign the image
       (e.g. "--signing_helper /path/to/helper"). The args will be appended to
       the existing ones in info dict.
@@ -1322,6 +1322,12 @@ def main(argv):
       OPTIONS.avb_algorithms['dtbo'] = a
     elif o == "--avb_dtbo_extra_args":
       OPTIONS.avb_extra_args['dtbo'] = a
+    elif o == "--avb_recovery_key":
+      OPTIONS.avb_keys['recovery'] = a
+    elif o == "--avb_recovery_algorithm":
+      OPTIONS.avb_algorithms['recovery'] = a
+    elif o == "--avb_recovery_extra_args":
+      OPTIONS.avb_extra_args['recovery'] = a
     elif o == "--avb_system_key":
       OPTIONS.avb_keys['system'] = a
     elif o == "--avb_system_algorithm":
@@ -1407,6 +1413,9 @@ def main(argv):
           "avb_dtbo_algorithm=",
           "avb_dtbo_key=",
           "avb_dtbo_extra_args=",
+          "avb_recovery_algorithm=",
+          "avb_recovery_key=",
+          "avb_recovery_extra_args=",
           "avb_system_algorithm=",
           "avb_system_key=",
           "avb_system_extra_args=",

From 627b72a1051f9502d2c13e185102ca3006f11e43 Mon Sep 17 00:00:00 2001
From: paulhu <paulhu@google.com>
Date: Tue, 14 Dec 2021 02:21:38 +0000
Subject: [PATCH 186/425] Add framework-connectivity-tiramisu to
 PRODUCT_APEX_BOOT_JARS

framework-connectivity-tiramisu is the new jar in tethering apex
which is added since android T.

Bug: 206893064
Test: m
Change-Id: I04a89be2145fa180de4a51c5056f41d7a94a7399
---
 target/product/default_art_config.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 8b08a92617..1a9fadaf66 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -64,6 +64,7 @@ PRODUCT_APEX_BOOT_JARS := \
     com.android.sdkext:framework-sdkextensions \
     com.android.supplementalprocess:framework-supplementalprocess \
     com.android.tethering:framework-connectivity \
+    com.android.tethering:framework-connectivity-tiramisu \
     com.android.tethering:framework-tethering \
     com.android.uwb:framework-uwb \
     com.android.wifi:framework-wifi

From f06a350b1c1a1d3bade21b8bd981cb65847531a4 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 15 Dec 2021 19:25:08 +0000
Subject: [PATCH 187/425] Version bump to TP1A.211215.002 [core/build_id.mk]

Change-Id: Iee79966b1cc6a2f43dd3928421e9eb61aba1ecc6
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 20f1df6fb5..a2dab31484 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=TP1A.211215.001
+BUILD_ID=TP1A.211215.002

From 4361c2b659891bd7c6baa5feb00098e1f7248e9d Mon Sep 17 00:00:00 2001
From: Neha Pattan <npattan@google.com>
Date: Tue, 14 Dec 2021 21:25:51 +0000
Subject: [PATCH 188/425] (1/4) Empty APIs for SupplementalApi module.

Soong conditional changes to allow SupplementalApi targets for
internal builds only.

Bug: 208708734
Test: mmm -j packages/modules/SupplementalApi
Change-Id: I51ae41a7533c73d4e6778f436acdef5cb2a3ed15
---
 core/android_soong_config_vars.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index d24449b5d0..718e3e5a82 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -103,3 +103,11 @@ endif
 # TODO(b/196084106): Remove when Java optimizations enabled by default for
 # system packages.
 $(call add_soong_config_var,ANDROID,SYSTEM_OPTIMIZE_JAVA)
+
+# Check for SupplementalApi module.
+ifeq ($(wildcard packages/modules/SupplementalApi),)
+$(call add_soong_config_var_value,ANDROID,include_nonpublic_framework_api,false)
+else
+$(call add_soong_config_var_value,ANDROID,include_nonpublic_framework_api,true)
+endif
+

From ddb0c8afb97d46eb40666155695d852a3553cada Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 16 Dec 2021 04:03:19 +0000
Subject: [PATCH 189/425] Version bump to TP1A.211216.002 [core/build_id.mk]

Change-Id: I97ddba19fb0f8567d766d665bddc0074f2d2ab2a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index cf4fc31e27..43bba2c6da 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=TP1A.211216.001
+BUILD_ID=TP1A.211216.002

From 52b2c3458f1aa5bb5a6d9eb7931ec1b7b4bd1453 Mon Sep 17 00:00:00 2001
From: Bassem Khalife <bkhalife@google.com>
Date: Fri, 17 Dec 2021 23:30:48 +0000
Subject: [PATCH 190/425] Update Security String to 2022-02-05

Bug: 210005927
Change-Id: I689fb7c1bc77e6e0de442d1bb3a7ce6fee899f98
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 5e85c7f4ca..c598998993 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -85,7 +85,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-01-05
+    PLATFORM_SECURITY_PATCH := 2022-02-05
 endif
 
 include $(BUILD_SYSTEM)/version_util.mk

From 7c2973a0daf8847cdef9379933dbdef6f88b62c2 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 20 Dec 2021 08:01:16 +0000
Subject: [PATCH 191/425] Version bump to TP1A.211220.002 [core/build_id.mk]

Change-Id: Ia5e4e5f5ae575673a46624499cf3a2434133c865
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 7399ad7e09..7f63f6683e 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=TP1A.211220.001
+BUILD_ID=TP1A.211220.002

From aae373f984b1bf30724f9d9c53f962d61938bbdd Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 20 Dec 2021 18:03:24 +0000
Subject: [PATCH 192/425] Version bump to TP1A.211220.003 [core/build_id.mk]

Change-Id: I9630f6a2c8c8f4749de50f33a97359cede96b118
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 7f63f6683e..ccaf7f6fa4 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=TP1A.211220.002
+BUILD_ID=TP1A.211220.003

From b27bb3b16df69aa837e4feb5e4d3c79a127f0889 Mon Sep 17 00:00:00 2001
From: Jiakai Zhang <jiakaiz@google.com>
Date: Mon, 20 Dec 2021 20:21:14 +0000
Subject: [PATCH 193/425] Add the remaining entries to
 PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS

After the change, the list contains all the jars that system_server
loaded dynamically.

Bug: 203198541
Test: m nothing
Change-Id: I4e404c48e2df052fff077649609050af4897dca3
---
 target/product/default_art_config.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 8b08a92617..33a6265d13 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -87,7 +87,9 @@ PRODUCT_STANDALONE_SYSTEM_SERVER_JARS := \
 PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS := \
     com.android.os.statsd:service-statsd \
     com.android.scheduling:service-scheduling \
+    com.android.supplementalprocess:service-supplementalprocess \
     com.android.tethering:service-connectivity \
+    com.android.uwb:service-uwb \
     com.android.wifi:service-wifi \
 
 # Minimal configuration for running dex2oat (default argument values).

From 446ed63a667bcaec1429d50fda92e85b7aa6c325 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 23 Dec 2021 17:51:45 +0000
Subject: [PATCH 194/425] Version bump to TP1A.211223.002 [core/build_id.mk]

Change-Id: Id3f9ecb432b0fc45cd0aa085c5aaa83ec9158d23
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 8c40ccd9f3..373b999d40 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=TP1A.211223.001
+BUILD_ID=TP1A.211223.002

From 98bbb48dfd4be0c404b00451830e2eb5bf03d8f4 Mon Sep 17 00:00:00 2001
From: Devin Moore <devinmoore@google.com>
Date: Wed, 5 Jan 2022 01:11:17 +0000
Subject: [PATCH 195/425] Add android.hardware.ir to vndk

Change created with "update-vndk-list.sh"

Bug: 206116595
Test: m
Change-Id: I8361cc94a60d70977c1c85d349d54a6f6504b4b6
---
 target/product/gsi/current.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index d59eac63e2..741eb5344c 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -77,6 +77,7 @@ VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
 VNDK-core: android.hardware.health-V1-ndk.so
 VNDK-core: android.hardware.health.storage-V1-ndk.so
 VNDK-core: android.hardware.identity-V3-ndk.so
+VNDK-core: android.hardware.ir-V1-ndk.so
 VNDK-core: android.hardware.keymaster-V3-ndk.so
 VNDK-core: android.hardware.light-V1-ndk.so
 VNDK-core: android.hardware.media.bufferpool@2.0.so

From 7a9fee0a205ff59042f37e9f33ec211ac57e6497 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 6 Jan 2022 19:43:16 +0000
Subject: [PATCH 196/425] Version bump to TP1A.220106.002 [core/build_id.mk]

Change-Id: I7164241f70ebf998642a30e2c359ec2d7cc14e15
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 0e7e271ca6..3548a5f93d 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=TP1A.220106.001
+BUILD_ID=TP1A.220106.002

From 6ed651473f0f834107097fe18313865cbf7272be Mon Sep 17 00:00:00 2001
From: Jayant Chowdhary <jchowdhary@google.com>
Date: Fri, 31 Dec 2021 19:08:29 +0000
Subject: [PATCH 197/425] Add camera aidl interfaces

Bug: 196432585

Test: build

Change-Id: I62d3e320b465ee48c4686a1791f354892ac002dc
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
---
 target/product/gsi/current.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index dbcb4571b4..bd7a9c720f 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -62,6 +62,10 @@ 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.camera.common-V1-ndk.so
+VNDK-core: android.hardware.camera.device-V1-ndk.so
+VNDK-core: android.hardware.camera.metadata-V1-ndk.so
+VNDK-core: android.hardware.camera.provider-V1-ndk.so
 VNDK-core: android.hardware.configstore-utils.so
 VNDK-core: android.hardware.configstore@1.0.so
 VNDK-core: android.hardware.configstore@1.1.so

From dd70d1cb7c521288b48398e3de7c250218a82803 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 7 Jan 2022 15:53:51 +0000
Subject: [PATCH 198/425] Version bump to TP1A.220107.002 [core/build_id.mk]

Change-Id: Idcee90b3bf3d28688383447e180cca5c9269f7d5
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index e53c6a78fa..15ed0628f2 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=TP1A.220107.001
+BUILD_ID=TP1A.220107.002

From 2e272df576456c9bd834a23ceba83dd55e5ea17c Mon Sep 17 00:00:00 2001
From: Jeff Vander Stoep <jeffv@google.com>
Date: Wed, 15 Dec 2021 09:07:13 +0100
Subject: [PATCH 199/425] Make com.android.sepolicy mandatory

Bug: 199914227
Test: aosp/1910032
Change-Id: I23599517b427363e758e6f06763079cc1482cb47
---
 target/product/base_system.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 451b3a1e50..6aded7c9af 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -67,6 +67,7 @@ PRODUCT_PACKAGES += \
     com.android.neuralnetworks \
     com.android.scheduling \
     com.android.sdkext \
+    com.android.sepolicy \
     com.android.supplementalprocess \
     com.android.tethering \
     com.android.tzdata \
@@ -371,6 +372,7 @@ PRODUCT_SYSTEM_PROPERTIES += persist.traced.enable=1
 PRODUCT_PACKAGES_DEBUG := \
     adb_keys \
     arping \
+    com.android.sepolicy.cert-debug.der \
     dmuserd \
     idlcli \
     init-debug.rc \

From 891d7f149989db9e4aa15ae7bf0a0ae153cc7346 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 10 Jan 2022 15:01:35 +0000
Subject: [PATCH 200/425] Version bump to TP1A.220110.002 [core/build_id.mk]

Change-Id: I525ba4a9c5949be05e64fc259a5652f1f0975eaf
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 39c6ab14e7..1ae246bd16 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=TP1A.220110.001
+BUILD_ID=TP1A.220110.002

From 3f7acd943c67c57c909065a95448d85c06a62a5a Mon Sep 17 00:00:00 2001
From: Frank Wang <xueyiwang@google.com>
Date: Tue, 11 Jan 2022 22:51:19 +0000
Subject: [PATCH 201/425] Add com.android.auxiliary to base_system.mk

Test: loaded to an AVD
Bug: b/210728915
Change-Id: Ic9f6592ccaf02ca56147f8386da5c9e3a8085005
---
 target/product/base_system.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 6aded7c9af..68dc91021c 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -51,6 +51,7 @@ PRODUCT_PACKAGES += \
     cmd \
     com.android.adbd \
     com.android.appsearch \
+    com.android.auxiliary \
     com.android.conscrypt \
     com.android.cronet \
     com.android.extservices \

From 05525826b33b43837e4a8f5e9e289693efd2458d Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 13 Jan 2022 03:29:35 +0000
Subject: [PATCH 202/425] Version bump to TP1A.220113.002 [core/build_id.mk]

Change-Id: I84a35ec678532c41df5784638c3800105298c8a9
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index bebe23ade7..5be545e184 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=TP1A.220113.001
+BUILD_ID=TP1A.220113.002

From 616e29578691de546856ce84622a71a15ca91d09 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Tue, 11 Jan 2022 15:54:19 -0500
Subject: [PATCH 203/425] Add IAllocator stable-aidl to VNDK

Necessary because it's used by libui, which is used
by everything. See also existing allocator hidl HALs
in this list.

Test: make
Bug: 193558894

Change-Id: I6e2e4e29f407a71a57c17683d602a1a8c3cb645a
---
 target/product/gsi/current.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index d59eac63e2..3d3c7f4236 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -20,6 +20,7 @@ LLNDK: libvndksupport.so
 LLNDK: libvulkan.so
 VNDK-SP: android.hardware.common-V2-ndk.so
 VNDK-SP: android.hardware.common.fmq-V1-ndk.so
+VNDK-SP: android.hardware.graphics.allocator-V1-ndk.so
 VNDK-SP: android.hardware.graphics.common-V3-ndk.so
 VNDK-SP: android.hardware.graphics.common@1.0.so
 VNDK-SP: android.hardware.graphics.common@1.1.so

From 30786b428f5bd0864a605359051596c2e24cc458 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 13 Jan 2022 23:23:48 +0000
Subject: [PATCH 204/425] Version bump to TP1A.220113.003 [core/build_id.mk]

Change-Id: Ifcc3b33e9b70144e23f01325876e1a044de16a5d
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 5be545e184..b361e3dcb0 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=TP1A.220113.002
+BUILD_ID=TP1A.220113.003

From 2972f7b34a8b73c08682dcdadc994daaf8286310 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 14 Jan 2022 02:43:31 +0000
Subject: [PATCH 205/425] Version bump to TP1A.220114.002 [core/build_id.mk]

Change-Id: I9ecdc56397947cf955cf266267dfbf9df14f36b1
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 69b48d0887..ae889213d2 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=TP1A.220114.001
+BUILD_ID=TP1A.220114.002

From b27b0470dfd6821d4ce9f671bd78ab379774d9e5 Mon Sep 17 00:00:00 2001
From: Edwin Tung <edwintung@google.com>
Date: Fri, 14 Jan 2022 09:42:03 +0000
Subject: [PATCH 206/425] Revert "Add GnssVisibilityControl AIDL to VNDK"

This reverts commit 8bfa7cd0eabca425bccea531aca6cfab2f8e44b0.

Reason for revert: Combining GnssVisibilityControl AIDL to gnss aidl_interface, so remove this one.

Bug: 208728105
Change-Id: Iecf00dcb9b00155010d962f5274acf5a02ac8b54
---
 target/product/gsi/current.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 3a275ec1e1..0212cac768 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -66,7 +66,6 @@ VNDK-core: android.hardware.configstore@1.0.so
 VNDK-core: android.hardware.configstore@1.1.so
 VNDK-core: android.hardware.confirmationui-support-lib.so
 VNDK-core: android.hardware.gnss-V1-ndk.so
-VNDK-core: android.hardware.gnss.visibility_control-V1-ndk.so
 VNDK-core: android.hardware.graphics.allocator@2.0.so
 VNDK-core: android.hardware.graphics.allocator@3.0.so
 VNDK-core: android.hardware.graphics.allocator@4.0.so

From fb413fb5866f873f0f5383463a5030f94abd860c Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 14 Jan 2022 20:01:09 +0000
Subject: [PATCH 207/425] Version bump to TP1A.220114.003 [core/build_id.mk]

Change-Id: I66afec80387ddc44b3f99c20f9354561645b2ab6
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index ae889213d2..76ed0d90af 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=TP1A.220114.002
+BUILD_ID=TP1A.220114.003

From d67c8e45691d423e23f96910236dde7f8f262974 Mon Sep 17 00:00:00 2001
From: Badhri Jagan Sridharan <badhri@google.com>
Date: Tue, 19 Oct 2021 13:31:19 -0700
Subject: [PATCH 208/425] Add android.hardware.usb-V1 to vndk

Bug: 200993386
Change-Id: Ibb328d9080c7879d9fc097039fcc9af18640937f
---
 target/product/gsi/current.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 8435288fc7..5786c57ad1 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -106,6 +106,7 @@ VNDK-core: android.hardware.sensors-V1-ndk.so
 VNDK-core: android.hardware.soundtrigger3-V1-ndk.so
 VNDK-core: android.hardware.soundtrigger@2.0-core.so
 VNDK-core: android.hardware.soundtrigger@2.0.so
+VNDK-core: android.hardware.usb-V1-ndk.so
 VNDK-core: android.hardware.uwb-V1-ndk.so
 VNDK-core: android.hardware.vibrator-V2-ndk.so
 VNDK-core: android.hardware.weaver-V1-ndk.so

From 22006fb420aa1d48c7a4676267f8e53ca502970b Mon Sep 17 00:00:00 2001
From: Nikita Ioffe <ioffe@google.com>
Date: Tue, 18 Jan 2022 19:47:09 +0000
Subject: [PATCH 209/425] Add services-supplementalprocess to system server
 classpath

Test: m
Bug: 212577961
Change-Id: If107d808ea712b50230f4b4d9a9baaf220a66252
---
 target/product/default_art_config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index d110926f51..186d4ff49c 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -78,6 +78,7 @@ PRODUCT_APEX_SYSTEM_SERVER_JARS := \
     com.android.art:service-art \
     com.android.media:service-media-s \
     com.android.permission:service-permission \
+    com.android.supplementalprocess:service-supplementalprocess \
 
 PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION += art/build/boot/boot-image-profile.txt
 
@@ -91,7 +92,6 @@ PRODUCT_STANDALONE_SYSTEM_SERVER_JARS := \
 PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS := \
     com.android.os.statsd:service-statsd \
     com.android.scheduling:service-scheduling \
-    com.android.supplementalprocess:service-supplementalprocess \
     com.android.tethering:service-connectivity \
     com.android.uwb:service-uwb \
     com.android.wifi:service-wifi \

From 6ee2f51885add6ef99942af46be4b59273a0efaf Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 18 Jan 2022 21:23:08 +0000
Subject: [PATCH 210/425] Version bump to TP1A.220118.002 [core/build_id.mk]

Change-Id: I07e16da996716b68ae2ae88d261d74264c96cae4
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 988fa30013..6081b323b1 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=TP1A.220118.001
+BUILD_ID=TP1A.220118.002

From 85db3089d52b3114b4c516a70ace33de9fb0f62e Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 19 Jan 2022 19:19:30 +0000
Subject: [PATCH 211/425] Version bump to TP1A.220119.002 [core/build_id.mk]

Change-Id: Icf8c46333b81ae0d220126fc3e4f549932e6fe63
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 6eee1eb8c9..aa45af5c30 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=TP1A.220119.001
+BUILD_ID=TP1A.220119.002

From 670db6f51336f3855c4b35162e2b9d11b3184951 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 19 Jan 2022 22:33:04 +0000
Subject: [PATCH 212/425] Version bump to TP1A.220119.003 [core/build_id.mk]

Change-Id: Ib9e3ddbe2eb688cba14bdcc04e11f2c441111fc2
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index aa45af5c30..583a6a2a4b 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=TP1A.220119.002
+BUILD_ID=TP1A.220119.003

From ece94e68074d40352b3a1ada1e62c34d227d2109 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 20 Jan 2022 02:49:26 +0000
Subject: [PATCH 213/425] Version bump to TP1A.220120.002 [core/build_id.mk]

Change-Id: Ice867320eef9a807fad76feb9dc69869c1139cd2
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index c75addbd3b..c009571b7a 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=TP1A.220120.001
+BUILD_ID=TP1A.220120.002

From b42c464cf6da23524cfd4cb1399b24adf17138c5 Mon Sep 17 00:00:00 2001
From: Junfeng Wu <wujunfen@google.com>
Date: Thu, 20 Jan 2022 16:22:34 +0800
Subject: [PATCH 214/425] Remove the duplicate RBE_CXX_COMPARE config.

The duplication comes from a merge conflict resolution: https://cs.android.com/android/_/android/platform/build/+/0d0d422359de1d0c443edad0bb1168a125b94dfe:core/rbe.mk;dlc=76ffe4f5ba0c711b118b9df010ffde328866367d

Test: Ran an RBE build locally with RBE_CXX_COMPARE enabled.
Bug: b/214886208

Change-Id: I7104fe3ce0c2861594f42633eb19105ff845ae4d
---
 core/rbe.mk | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/core/rbe.mk b/core/rbe.mk
index 370d4bd0e0..fd3427abf4 100644
--- a/core/rbe.mk
+++ b/core/rbe.mk
@@ -46,12 +46,6 @@ ifneq ($(filter-out false,$(USE_RBE)),)
     cxx_compare := false
   endif
 
-  ifdef RBE_CXX_COMPARE
-    cxx_compare := $(RBE_CXX_COMPARE)
-  else
-    cxx_compare := "false"
-  endif
-
   ifdef RBE_JAVAC_EXEC_STRATEGY
     javac_exec_strategy := $(RBE_JAVAC_EXEC_STRATEGY)
   else

From d70bd88c366316eb4c09b602878b667d4b8b4cac Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 20 Jan 2022 18:21:15 +0000
Subject: [PATCH 215/425] Version bump to TP1A.220120.003 [core/build_id.mk]

Change-Id: I4a3c4e2e6412303044e2befdf9d98425e35f4a14
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index c009571b7a..a1a9bd354e 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=TP1A.220120.002
+BUILD_ID=TP1A.220120.003

From 5ac60161fcf4844d1cddbccd7bc30e9db2ee64f7 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 21 Jan 2022 03:43:23 +0000
Subject: [PATCH 216/425] Version bump to TP1A.220121.002 [core/build_id.mk]

Change-Id: Ief87004333e47cd71259b89f176a0e69858deddb
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index e6500d3a2e..71f0c6bbeb 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=TP1A.220121.001
+BUILD_ID=TP1A.220121.002

From 13f6bb4879e6e646c121d52e146565cfc9c70e0b Mon Sep 17 00:00:00 2001
From: Rupert Shuttleworth <ruperts@google.com>
Date: Wed, 19 Jan 2022 19:23:13 -0500
Subject: [PATCH 217/425] Fix phony target warning for
 LOCAL_ROTATION_MIN_SDK_VERSION.

Test: m signapk
Test: make GoogleRestorePrebuilt apksigner
Test: Add LOCAL_ROTATION_MIN_SDK_VERSION := 33 to vendor/unbundled_google/packages/GoogleRestorePrebuilt/Android.mk and run both commands above again -- no phony target warnings

Bug: 197787352

Change-Id: If106113b6557ad1ecf24e2778bd38e7cb30e39ca
---
 core/app_prebuilt_internal.mk | 4 +++-
 core/package_internal.mk      | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/app_prebuilt_internal.mk b/core/app_prebuilt_internal.mk
index f5d213e646..4586f356c6 100644
--- a/core/app_prebuilt_internal.mk
+++ b/core/app_prebuilt_internal.mk
@@ -128,6 +128,9 @@ else
     LOCAL_CERTIFICATE := $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))$(LOCAL_CERTIFICATE)
   endif
 
+  # NOTE(ruperts): Consider moving the logic below out of a conditional,
+  # to avoid the possibility of silently ignoring user settings.
+
   PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8
   PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem
   PACKAGES := $(PACKAGES) $(LOCAL_MODULE)
@@ -143,7 +146,6 @@ else
   $(built_module): $(LOCAL_CERTIFICATE_LINEAGE)
   $(built_module): PRIVATE_CERTIFICATE_LINEAGE := $(LOCAL_CERTIFICATE_LINEAGE)
 
-  $(built_module): $(LOCAL_ROTATION_MIN_SDK_VERSION)
   $(built_module): PRIVATE_ROTATION_MIN_SDK_VERSION := $(LOCAL_ROTATION_MIN_SDK_VERSION)
 endif
 
diff --git a/core/package_internal.mk b/core/package_internal.mk
index 70396d1de5..c7a173b71f 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -481,7 +481,6 @@ $(LOCAL_BUILT_MODULE): PRIVATE_ADDITIONAL_CERTIFICATES := $(additional_certifica
 $(LOCAL_BUILT_MODULE): $(LOCAL_CERTIFICATE_LINEAGE)
 $(LOCAL_BUILT_MODULE): PRIVATE_CERTIFICATE_LINEAGE := $(LOCAL_CERTIFICATE_LINEAGE)
 
-$(LOCAL_BUILT_MODULE): $(LOCAL_ROTATION_MIN_SDK_VERSION)
 $(LOCAL_BUILT_MODULE): PRIVATE_ROTATION_MIN_SDK_VERSION := $(LOCAL_ROTATION_MIN_SDK_VERSION)
 
 # Set a actual_partition_tag (calculated in base_rules.mk) for the package.

From 96dfc7cde330446178699f6b105a4bd4bc0fd596 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 21 Jan 2022 21:49:09 +0000
Subject: [PATCH 218/425] Version bump to TP1A.220121.003 [core/build_id.mk]

Change-Id: I0423b178797354645c56748bd9af6eee0bc68275
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 71f0c6bbeb..f1f03113df 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=TP1A.220121.002
+BUILD_ID=TP1A.220121.003

From cce4c7d3a9d5d00283683a3437acc2714fb4735d Mon Sep 17 00:00:00 2001
From: Frank Wang <xueyiwang@google.com>
Date: Thu, 20 Jan 2022 22:48:22 +0000
Subject: [PATCH 219/425] Add framework-auxiliary to PRODUCT_APEX_BOOT_JARS

Test: Builds
Bug: b/210728915
Change-Id: I7cf3b31b099b6d27ae1a443f1856421c111ebf62
---
 target/product/default_art_config.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 186d4ff49c..00083ec5d7 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -52,6 +52,7 @@ PRODUCT_BOOT_JARS += \
 # Note: For modules available in Q, DO NOT add new entries here.
 PRODUCT_APEX_BOOT_JARS := \
     com.android.appsearch:framework-appsearch \
+    com.android.auxiliary:framework-auxiliary \
     com.android.conscrypt:conscrypt \
     com.android.i18n:core-icu4j \
     com.android.ipsec:android.net.ipsec.ike \

From 57e8549480d6ea1c823529a42e90ec7c7bb09c5a Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Fri, 7 Jan 2022 13:07:49 +0900
Subject: [PATCH 220/425] Move nearby apex to tethering

Nearby will be merged together with the tethering/connectivity APEX, so
that module maintenance efforts can be reduced, and the two codebases
can evolve the interfaces that they expose to each other over time.

Bug: 189355156
Test: m
Change-Id: I51ba3fe8bee34fa226fa5ed31ff9f87ee61fdd63
---
 target/product/base_system.mk        | 1 -
 target/product/default_art_config.mk | 1 -
 2 files changed, 2 deletions(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 68dc91021c..657be557aa 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -61,7 +61,6 @@ PRODUCT_PACKAGES += \
     com.android.media \
     com.android.media.swcodec \
     com.android.mediaprovider \
-    com.android.nearby \
     com.android.os.statsd \
     com.android.permission \
     com.android.resolv \
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 186d4ff49c..7bdcfed136 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -57,7 +57,6 @@ PRODUCT_APEX_BOOT_JARS := \
     com.android.ipsec:android.net.ipsec.ike \
     com.android.media:updatable-media \
     com.android.mediaprovider:framework-mediaprovider \
-    com.android.nearby:framework-nearby \
     com.android.os.statsd:framework-statsd \
     com.android.permission:framework-permission \
     com.android.permission:framework-permission-s \

From 30cd8fd01e6e92b31c638abe066e0eb3d8178ef9 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 24 Jan 2022 18:37:25 +0000
Subject: [PATCH 221/425] Version bump to TP1A.220124.002 [core/build_id.mk]

Change-Id: I8ddbd76f23a5b5c36c11fc02fa3418b559f7e366
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 26a732e37f..4115e2b89c 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=TP1A.220124.001
+BUILD_ID=TP1A.220124.002

From 0ae8ff8077c74c110d7499960eaffb8168f1056e Mon Sep 17 00:00:00 2001
From: Johnny Lee <johnnlee@google.com>
Date: Tue, 25 Jan 2022 06:58:55 +0000
Subject: [PATCH 222/425] Revert "Add framework-auxiliary to
 PRODUCT_APEX_BOOT_JARS"

Revert submission 16684516-auxiliary_bcp

Reason for revert: pdk build breakage
Reverted Changes:
I8c92d2ccb:Add bootclasspath config in Auxiliary.
I9ac910fa2:Add SupplementalProcess stubs and bootclasspath fr...
I7cf3b31b0:Add framework-auxiliary to PRODUCT_APEX_BOOT_JARS

Bug: 216218564
Change-Id: I791870137097180eb02d4ada2b2f0743467cc422
---
 target/product/default_art_config.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 00083ec5d7..186d4ff49c 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -52,7 +52,6 @@ PRODUCT_BOOT_JARS += \
 # Note: For modules available in Q, DO NOT add new entries here.
 PRODUCT_APEX_BOOT_JARS := \
     com.android.appsearch:framework-appsearch \
-    com.android.auxiliary:framework-auxiliary \
     com.android.conscrypt:conscrypt \
     com.android.i18n:core-icu4j \
     com.android.ipsec:android.net.ipsec.ike \

From 27c5377bab5a7a9c86226c9d0cb8777f31b452ca Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 25 Jan 2022 21:31:31 +0000
Subject: [PATCH 223/425] Version bump to TP1A.220125.002 [core/build_id.mk]

Change-Id: Id8060a525246fc2ad1c2a22a79d4540d949ba0fe
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index f7b182ab09..1f9180e3db 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=TP1A.220125.001
+BUILD_ID=TP1A.220125.002

From e20042c5f8ff9cf9be913e68c0c9c6d38c97fb9c Mon Sep 17 00:00:00 2001
From: Frank Wang <xueyiwang@google.com>
Date: Tue, 25 Jan 2022 18:41:45 +0000
Subject: [PATCH 224/425] Revert^2 "Add framework-auxiliary to
 PRODUCT_APEX_BOOT_JARS"

0ae8ff8077c74c110d7499960eaffb8168f1056e

Change-Id: Iabbdbb0d253137727ff9f94d3c1869e1ca6ef9c9
---
 target/product/default_art_config.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 186d4ff49c..00083ec5d7 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -52,6 +52,7 @@ PRODUCT_BOOT_JARS += \
 # Note: For modules available in Q, DO NOT add new entries here.
 PRODUCT_APEX_BOOT_JARS := \
     com.android.appsearch:framework-appsearch \
+    com.android.auxiliary:framework-auxiliary \
     com.android.conscrypt:conscrypt \
     com.android.i18n:core-icu4j \
     com.android.ipsec:android.net.ipsec.ike \

From 7377c6fd6b8c2e428b688ff2acec470f4f90d501 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 26 Jan 2022 21:32:17 +0000
Subject: [PATCH 225/425] Version bump to TP1A.220126.002 [core/build_id.mk]

Change-Id: I3b1c4f3244291ce0804966379e6ad457dab92d90
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 4b84825828..8b0e70073a 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=TP1A.220126.001
+BUILD_ID=TP1A.220126.002

From 49a416a68a3667869c68544cd5ed04d8f35008dd Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 27 Jan 2022 02:59:12 +0000
Subject: [PATCH 226/425] Version bump to TP1A.220127.002 [core/build_id.mk]

Change-Id: I4f955a494bdb33e31184314c1183138e2945817e
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 795e29e6fd..758b9804e7 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=TP1A.220127.001
+BUILD_ID=TP1A.220127.002

From a60add20d04a46e1ab7469f4cb25a6f31040622a Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 28 Jan 2022 07:13:10 +0000
Subject: [PATCH 227/425] Version bump to TP1A.220128.002 [core/build_id.mk]

Change-Id: Ibdecfec9c01a5fe3a6c698af8741c5be31be6175
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index fb3144d76b..1e6ca1b9e0 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=TP1A.220128.001
+BUILD_ID=TP1A.220128.002

From 7f49a67d0d54c740300e9e1a20b0f17d4c2a91c5 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 27 Jan 2022 18:15:53 -0800
Subject: [PATCH 228/425] Add a keys argument to tapas

Add a keys argument to tapas that allows specifying devkeys to
use internal aosp_devkeys_* products that use the internal
devkeys, which will allow building unbundled apps that use platform
keys for testing.

Bug: 216553104
Test: tapas CarMediaApp devkeys
Change-Id: I2161be9e15f99713e11d22901d6eb7ad3c420093
---
 envsetup.sh  | 12 +++++++++++-
 tapasHelp.sh |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/envsetup.sh b/envsetup.sh
index 50cd4df313..c1d4970124 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -753,7 +753,9 @@ function tapas()
     local arch="$(echo $* | xargs -n 1 echo | \grep -E '^(arm|x86|arm64|x86_64)$' | xargs)"
     local variant="$(echo $* | xargs -n 1 echo | \grep -E '^(user|userdebug|eng)$' | xargs)"
     local density="$(echo $* | xargs -n 1 echo | \grep -E '^(ldpi|mdpi|tvdpi|hdpi|xhdpi|xxhdpi|xxxhdpi|alldpi)$' | xargs)"
-    local apps="$(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|arm|x86|arm64|x86_64|ldpi|mdpi|tvdpi|hdpi|xhdpi|xxhdpi|xxxhdpi|alldpi)$' | xargs)"
+    local keys="$(echo $* | xargs -n 1 echo | \grep -E '^(devkeys)$' | xargs)"
+    local apps="$(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|arm|x86|arm64|x86_64|ldpi|mdpi|tvdpi|hdpi|xhdpi|xxhdpi|xxxhdpi|alldpi|devkeys)$' | xargs)"
+
 
     if [ "$showHelp" != "" ]; then
       $(gettop)/build/make/tapasHelp.sh
@@ -772,6 +774,10 @@ function tapas()
         echo "tapas: Error: Multiple densities supplied: $density"
         return
     fi
+    if [ $(echo $keys | wc -w) -gt 1 ]; then
+        echo "tapas: Error: Multiple keys supplied: $keys"
+        return
+    fi
 
     local product=aosp_arm
     case $arch in
@@ -779,6 +785,10 @@ function tapas()
       arm64)  product=aosp_arm64;;
       x86_64) product=aosp_x86_64;;
     esac
+    if [ -n "$keys" ]; then
+        product=${product/aosp_/aosp_${keys}_}
+    fi;
+
     if [ -z "$variant" ]; then
         variant=eng
     fi
diff --git a/tapasHelp.sh b/tapasHelp.sh
index 0f461304a3..7cb5f2c0fd 100755
--- a/tapasHelp.sh
+++ b/tapasHelp.sh
@@ -6,7 +6,7 @@ SCRIPT_DIR="${PWD}"
 cd ../..
 TOP="${PWD}"
 
-message='usage: tapas [<App1> <App2> ...] [arm|x86|arm64|x86_64] [eng|userdebug|user]
+message='usage: tapas [<App1> <App2> ...] [arm|x86|arm64|x86_64] [eng|userdebug|user] [devkeys]
 
 tapas selects individual apps to be built by the Android build system. Unlike
 "lunch", "tapas" does not request the building of images for a device.

From e90cc6f27bf4c4f945627a1248da25e7dc624c9b Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 28 Jan 2022 21:40:59 +0000
Subject: [PATCH 229/425] Version bump to TP1A.220128.003 [core/build_id.mk]

Change-Id: If9446d20612d476ce2f6313b29e22b24bf12ed81
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 1e6ca1b9e0..f82c2e5690 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=TP1A.220128.002
+BUILD_ID=TP1A.220128.003

From e4fee8d7ac09974b7bb09104e8e76c073b684183 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Sat, 29 Jan 2022 00:57:06 +0000
Subject: [PATCH 230/425] Version bump to TP1A.220128.004 [core/build_id.mk]

Change-Id: Ied7a4e869f92b061271fc304c56c2345aea092e0
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index f82c2e5690..99d2d30074 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=TP1A.220128.003
+BUILD_ID=TP1A.220128.004

From fbba710c4fe9f374ada19ab7079127df14e86612 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 31 Jan 2022 02:59:03 +0000
Subject: [PATCH 231/425] Version bump to TP1A.220131.002 [core/build_id.mk]

Change-Id: I18f35720c2f6df3fd1b89ce05260ffe202045486
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index ae2d4a47e2..52c46ed417 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=TP1A.220131.001
+BUILD_ID=TP1A.220131.002

From 275b1272d6ea3b0bacf15c36ae440f59ebc3a27c Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 31 Jan 2022 23:10:58 +0000
Subject: [PATCH 232/425] Version bump to TP1A.220131.003 [core/build_id.mk]

Change-Id: I477e1c6ef7b0391acbe2fd526580849ec6fcc1b8
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 52c46ed417..db77c35082 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=TP1A.220131.002
+BUILD_ID=TP1A.220131.003

From 46f200a083eac7e4741b9ca5cdcccde01a7a0888 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 1 Feb 2022 05:21:01 +0000
Subject: [PATCH 233/425] Version bump to TP1A.220201.002 [core/build_id.mk]

Change-Id: Ib8f14ed29e2b1f444b905650bd3b7f23a9c10184
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 33865521b6..31110efd36 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=TP1A.220201.001
+BUILD_ID=TP1A.220201.002

From a2e5fd115fa92aab07e0bf19b95a377877d17afe Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 2 Feb 2022 02:41:00 +0000
Subject: [PATCH 234/425] Version bump to TP1A.220202.002 [core/build_id.mk]

Change-Id: I2dc9c5f59666400639e721d9bf8f6a7ec2ea6012
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index c7097aca41..3d3ff77c4b 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=TP1A.220202.001
+BUILD_ID=TP1A.220202.002

From c0f85017c92326f79c543e44a8315682e793be48 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 2 Feb 2022 03:57:08 +0000
Subject: [PATCH 235/425] Version bump to TP1A.220202.003 [core/build_id.mk]

Change-Id: Id21ca7861a9b0712b49f05edeae15a8b82686831
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 3d3ff77c4b..ef64ec76fb 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=TP1A.220202.002
+BUILD_ID=TP1A.220202.003

From 2d5d7a53d115df84786baad05c49a4a4e0f35da0 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 3 Feb 2022 23:09:09 +0000
Subject: [PATCH 236/425] Version bump to TP1A.220203.002 [core/build_id.mk]

Change-Id: Ib80ccecffe19bd284e75cb291d110f1b29e1baa7
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 2d7ee4c285..992ec077cb 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=TP1A.220203.001
+BUILD_ID=TP1A.220203.002

From 0d388948d5ae08bef3f35ebd0a182339b7b9b8c3 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 4 Feb 2022 00:07:04 +0000
Subject: [PATCH 237/425] Version bump to TP1A.220203.003 [core/build_id.mk]

Change-Id: I52c5d2c43d3f5aa256983f2f7edada326b50b513
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 992ec077cb..14b62c435c 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=TP1A.220203.002
+BUILD_ID=TP1A.220203.003

From 3d22bd726e8f689af5358a9bf67f82b9f3c1e2be Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 4 Feb 2022 00:38:57 +0000
Subject: [PATCH 238/425] Version bump to TP1A.220203.004 [core/build_id.mk]

Change-Id: I0b38beb79c7b9658f4487d0c1af05705f2bcd18a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 14b62c435c..37f3e9be87 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=TP1A.220203.003
+BUILD_ID=TP1A.220203.004

From 548625f8b15ee32e78ea3c67daa9429ae69770c7 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 4 Feb 2022 03:05:23 +0000
Subject: [PATCH 239/425] Version bump to TP1A.220204.002 [core/build_id.mk]

Change-Id: I2465a84fd0f222d6461ffab3bdbe3b53d36a5c41
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index ca59027819..f1cf13fc1a 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=TP1A.220204.001
+BUILD_ID=TP1A.220204.002

From 1dff6a108e9a8a4794c13d8eadb58deda939a515 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 4 Feb 2022 21:53:25 +0000
Subject: [PATCH 240/425] Version bump to TP1A.220204.003 [core/build_id.mk]

Change-Id: I316ccda849afc140e3307e88a2e85e82a72c7a62
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index f1cf13fc1a..25386f4b13 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=TP1A.220204.002
+BUILD_ID=TP1A.220204.003

From 4d237f2f99e13ca5195b6b70c28aad3763b12685 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 7 Feb 2022 01:43:05 +0000
Subject: [PATCH 241/425] Version bump to TP1A.220207.002 [core/build_id.mk]

Change-Id: I5176d19b30278403cead13c1cf499caafacefe99
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index f69c002a4d..6936ad30f5 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=TP1A.220207.001
+BUILD_ID=TP1A.220207.002

From a07f6801bb3c6ec127f73680a02b72813e86e2c5 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 7 Feb 2022 18:31:12 +0000
Subject: [PATCH 242/425] Version bump to TP1A.220207.003 [core/build_id.mk]

Change-Id: I61b6d247ab518091cd010b4c57920fee2ccf2e5d
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 6936ad30f5..8c627465ec 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=TP1A.220207.002
+BUILD_ID=TP1A.220207.003

From 2ea0660bc765c3d92fc5b5a26fcad579f0d2f5f9 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 8 Feb 2022 01:07:02 +0000
Subject: [PATCH 243/425] Version bump to TP1A.220207.004 [core/build_id.mk]

Change-Id: Iad18ab767a0e68ed513a65a65a5b9bf132f821ca
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 8c627465ec..c0d7f1065f 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=TP1A.220207.003
+BUILD_ID=TP1A.220207.004

From 4135c3bd58efdcc30dd402d6e843b33ec321884f Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 8 Feb 2022 02:57:09 +0000
Subject: [PATCH 244/425] Version bump to TP1A.220208.002 [core/build_id.mk]

Change-Id: I5606548ede1b96c05c9113056b8984307a44b25e
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 4af799f69a..d8ff344f14 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=TP1A.220208.001
+BUILD_ID=TP1A.220208.002

From 960c7a4db7faad179b7c10e59e42a2008f071570 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 8 Feb 2022 23:33:06 +0000
Subject: [PATCH 245/425] Version bump to TP1A.220208.003 [core/build_id.mk]

Change-Id: I64638b9365a60ee10d26ba70783347d4b65a0123
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index d8ff344f14..de84f743da 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=TP1A.220208.002
+BUILD_ID=TP1A.220208.003

From 6266f2844d043b6e392bd72f08fba407f9372992 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 9 Feb 2022 03:15:13 +0000
Subject: [PATCH 246/425] Version bump to TP1A.220209.002 [core/build_id.mk]

Change-Id: Ic4f5aedff4b49292fccb4fd512cde14787259b17
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 9892412211..1c6bab11e9 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=TP1A.220209.001
+BUILD_ID=TP1A.220209.002

From e3fd488fbd1274b9e3646f15ca0adc5832e850a4 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 9 Feb 2022 19:29:27 +0000
Subject: [PATCH 247/425] Version bump to TP1A.220209.003 [core/build_id.mk]

Change-Id: I70a895e485b403297016461223c748c92dd99849
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 1c6bab11e9..1cb35b8480 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=TP1A.220209.002
+BUILD_ID=TP1A.220209.003

From 42027dc1174213edfe4a86260f9d65f7b39a257a Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 10 Feb 2022 23:03:18 +0000
Subject: [PATCH 248/425] Version bump to TP1A.220210.002 [core/build_id.mk]

Change-Id: Idd3eead09f0308b39824a2177e4d8568ffd00958
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 5d5b72ea8f..a49e32ef9f 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=TP1A.220210.001
+BUILD_ID=TP1A.220210.002

From a262e1c7ea6c6099d1f03d3f281fa8cba099e057 Mon Sep 17 00:00:00 2001
From: Neha Pattan <npattan@google.com>
Date: Tue, 8 Feb 2022 22:32:32 +0000
Subject: [PATCH 249/425] [2/2] Add SupplementalApi to BCP.

Test: build
Bug: 218568223
Change-Id: I9f97bdf8dae9f0271755411293243bbfa9986acc
---
 target/product/default_art_config.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 00083ec5d7..6a797ad64d 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -69,11 +69,18 @@ PRODUCT_APEX_BOOT_JARS := \
     com.android.tethering:framework-connectivity-tiramisu \
     com.android.tethering:framework-tethering \
     com.android.uwb:framework-uwb \
-    com.android.wifi:framework-wifi
+    com.android.wifi:framework-wifi \
+
+# TODO(b/210903289): Remove filters after merge.
+ifneq ($(wildcard packages/modules/SupplementalApi),)
+PRODUCT_APEX_BOOT_JARS += \
+    com.android.supplementalprocess:framework-supplementalapi
+endif
 
 # List of system_server classpath jars delivered via apex.
 # Keep the list sorted by module names and then library names.
 # Note: For modules available in Q, DO NOT add new entries here.
+# TODO(b/218568223): Add supplementalapi to system server jars.
 PRODUCT_APEX_SYSTEM_SERVER_JARS := \
     com.android.appsearch:service-appsearch \
     com.android.art:service-art \

From a0d8ea0999cfc44369c43a814684821afbc52efb Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 11 Feb 2022 14:49:14 +0000
Subject: [PATCH 250/425] Version bump to TP1A.220211.002 [core/build_id.mk]

Change-Id: I0b95ebd6354ed9fe148f6cc4f8a3e2b30e1b5c17
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 6b9dfa79af..e297b784a1 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=TP1A.220211.001
+BUILD_ID=TP1A.220211.002

From 5e559715a794a4311d849e17103cc5db6a901c46 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 11 Feb 2022 19:13:14 +0000
Subject: [PATCH 251/425] Version bump to TP1A.220211.003 [core/build_id.mk]

Change-Id: Ic1d010b8261ea567b37f235752c6b0dcef621c99
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index e297b784a1..612cc8ef59 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=TP1A.220211.002
+BUILD_ID=TP1A.220211.003

From 5f40e6e46df1482fd4ab79fbaf78abca4bd884d1 Mon Sep 17 00:00:00 2001
From: Frank Wang <xueyiwang@google.com>
Date: Sun, 13 Feb 2022 06:26:55 +0000
Subject: [PATCH 252/425] Add ondevicepersonalization in build branch.

Test: Build
Bug: b/218749359
Change-Id: I1bf1de0ea64fa09551a2f545f2e99bae183775e6
---
 target/product/base_system.mk        | 1 +
 target/product/default_art_config.mk | 1 +
 2 files changed, 2 insertions(+)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 44f219126f..76163092fa 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -61,6 +61,7 @@ PRODUCT_PACKAGES += \
     com.android.media \
     com.android.media.swcodec \
     com.android.mediaprovider \
+    com.android.ondevicepersonalization \
     com.android.os.statsd \
     com.android.permission \
     com.android.resolv \
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index f49a5370bd..2e34a3d2dd 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -58,6 +58,7 @@ PRODUCT_APEX_BOOT_JARS := \
     com.android.ipsec:android.net.ipsec.ike \
     com.android.media:updatable-media \
     com.android.mediaprovider:framework-mediaprovider \
+    com.android.ondevicepersonalization:framework-ondevicepersonalization \
     com.android.os.statsd:framework-statsd \
     com.android.permission:framework-permission \
     com.android.permission:framework-permission-s \

From 2b182331a689e3843d3fba4e189d142601e8c540 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 14 Feb 2022 21:03:26 +0000
Subject: [PATCH 253/425] Version bump to TP1A.220214.002 [core/build_id.mk]

Change-Id: I72abcc02d48ae46859a98876be9e74d1488202f1
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index e61e5627ba..067cfa4de6 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=TP1A.220214.001
+BUILD_ID=TP1A.220214.002

From 5e7c564eb661500f8cb9e3b7e3cbbfae73340637 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 15 Feb 2022 03:09:25 +0000
Subject: [PATCH 254/425] Version bump to TP1A.220215.002 [core/build_id.mk]

Change-Id: I8b590e04969fa9306df180d4dcb08e8c28d48b76
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 27f93ceaab..6baa58e1a1 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=TP1A.220215.001
+BUILD_ID=TP1A.220215.002

From 61fa6af5fdad57f2b380ad44beb90b310424adf2 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 16 Feb 2022 02:33:21 +0000
Subject: [PATCH 255/425] Version bump to TP1A.220216.002 [core/build_id.mk]

Change-Id: Icf93647c53fa43bbc756942a000b17415630b8fb
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index fbc12fce79..3fcb0e5220 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=TP1A.220216.001
+BUILD_ID=TP1A.220216.002

From 24bbb1276681ef7b948d5b5a155ea9d7696892e6 Mon Sep 17 00:00:00 2001
From: Bill Rassieur <rassb@google.com>
Date: Fri, 18 Feb 2022 08:08:31 -0800
Subject: [PATCH 256/425] DO NOT MERGE  Designate tm-dev* branches as TM.

BUG:218719100

Change-Id: I3880438a8af16cfe559f4469e160f7a80281f163
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 2f9c3f3bf1..a4897887a2 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=MASTER
+BUILD_ID=TM

From 1cd12d795fce3ebcc42803ebb6e659a93a94e103 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 18 Feb 2022 22:19:15 +0000
Subject: [PATCH 257/425] Version bump to TP1A.220218.002 [core/build_id.mk]

Change-Id: I4c3d190a4279e9f75210dd1d1f506e6fd6fde3ef
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index ecf4ce07b0..ac5bba484f 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=TP1A.220218.001
+BUILD_ID=TP1A.220218.002

From 3dfbfee02e25b830c8b5669e044a81027c63dbb9 Mon Sep 17 00:00:00 2001
From: paulhu <paulhu@google.com>
Date: Tue, 8 Feb 2022 21:21:41 +0800
Subject: [PATCH 258/425] Rename framework-connectivity-tiramisu to
 framework-connectivity-t

Bug: 215434166
Test: build, flash, device boot to home.
Merged-In: I046503a60f39aa1ec6026c139203b1a1d5a7dab5
Change-Id: I046503a60f39aa1ec6026c139203b1a1d5a7dab5
---
 target/product/default_art_config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 2e34a3d2dd..531af33a76 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -66,7 +66,7 @@ PRODUCT_APEX_BOOT_JARS := \
     com.android.sdkext:framework-sdkextensions \
     com.android.supplementalprocess:framework-supplementalprocess \
     com.android.tethering:framework-connectivity \
-    com.android.tethering:framework-connectivity-tiramisu \
+    com.android.tethering:framework-connectivity-t \
     com.android.tethering:framework-tethering \
     com.android.uwb:framework-uwb \
     com.android.wifi:framework-wifi \

From b4ce54f0ae093ce5e04ba794f7e00d99caaa746d Mon Sep 17 00:00:00 2001
From: Anton Kulakov <akulakov@google.com>
Date: Mon, 21 Feb 2022 19:14:58 +0000
Subject: [PATCH 259/425] Add AdServices module to base_system.mk

Test: Build
Bug: b/220336612
Change-Id: Icb4c1373a0c2ca3dfa9cb07094e85ec3b51ac557
---
 target/product/base_system.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 76163092fa..e025e388d7 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -50,6 +50,7 @@ PRODUCT_PACKAGES += \
     charger \
     cmd \
     com.android.adbd \
+    com.android.adservices \
     com.android.appsearch \
     com.android.auxiliary \
     com.android.conscrypt \

From 6af6d631c7a5035a41177aa1db32a269e3f7c011 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 23 Feb 2022 03:07:43 +0000
Subject: [PATCH 260/425] Version bump to TP1A.220223.002 [core/build_id.mk]

Change-Id: I7954991214eed52b3621c3ac07a4b87cd97ae6b9
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 3d9ee65f68..b03123705d 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=TP1A.220223.001
+BUILD_ID=TP1A.220223.002

From be5c887ced0982c6ac94186a3c1f9d2a6598e78e Mon Sep 17 00:00:00 2001
From: Roopa Sattiraju <sattiraju@google.com>
Date: Thu, 3 Feb 2022 09:04:07 -0800
Subject: [PATCH 261/425] Enabling Apex in BT

Bug: 217736913
Test: Compile, bringup and test user journeys
Change-Id: I2371a3cfbb3770802b1a318cf0695af52dcf8cc0
---
 target/product/base_system.mk        | 1 +
 target/product/default_art_config.mk | 2 ++
 target/product/handheld_system.mk    | 1 -
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index e025e388d7..de093a26c8 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -52,6 +52,7 @@ PRODUCT_PACKAGES += \
     com.android.adbd \
     com.android.adservices \
     com.android.appsearch \
+    com.android.bluetooth \
     com.android.auxiliary \
     com.android.conscrypt \
     com.android.cronet \
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 531af33a76..9340743688 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -53,6 +53,7 @@ PRODUCT_BOOT_JARS += \
 PRODUCT_APEX_BOOT_JARS := \
     com.android.appsearch:framework-appsearch \
     com.android.auxiliary:framework-auxiliary \
+    com.android.bluetooth:framework-bluetooth \
     com.android.conscrypt:conscrypt \
     com.android.i18n:core-icu4j \
     com.android.ipsec:android.net.ipsec.ike \
@@ -98,6 +99,7 @@ PRODUCT_STANDALONE_SYSTEM_SERVER_JARS := \
 # Keep the list sorted by module names and then library names.
 # Note: For modules available in Q, DO NOT add new entries here.
 PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS := \
+    com.android.bluetooth:service-bluetooth \
     com.android.os.statsd:service-statsd \
     com.android.scheduling:service-scheduling \
     com.android.tethering:service-connectivity \
diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk
index 3a59f6c320..41233b2c0a 100644
--- a/target/product/handheld_system.mk
+++ b/target/product/handheld_system.mk
@@ -34,7 +34,6 @@ $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)
 PRODUCT_PACKAGES += \
     BasicDreams \
     BlockedNumberProvider \
-    Bluetooth \
     BluetoothMidiService \
     BookmarkProvider \
     BuiltInPrintService \

From a77e15a3a31b0011663a4f9b4866ff5a1098da9c Mon Sep 17 00:00:00 2001
From: Nikita Ioffe <ioffe@google.com>
Date: Tue, 22 Feb 2022 16:08:20 +0000
Subject: [PATCH 262/425] Rename SupplementalProcess to SdkSandbox

Bug: 220320098
Test: presubmit
Change-Id: I3f757c7e3e81c2ac31cd623eae68f7778bf3bafa
---
 .../{supplemental_process.pk8 => sdk_sandbox.pk8}   | Bin
 ...mental_process.x509.pem => sdk_sandbox.x509.pem} |   0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename target/product/security/{supplemental_process.pk8 => sdk_sandbox.pk8} (100%)
 rename target/product/security/{supplemental_process.x509.pem => sdk_sandbox.x509.pem} (100%)

diff --git a/target/product/security/supplemental_process.pk8 b/target/product/security/sdk_sandbox.pk8
similarity index 100%
rename from target/product/security/supplemental_process.pk8
rename to target/product/security/sdk_sandbox.pk8
diff --git a/target/product/security/supplemental_process.x509.pem b/target/product/security/sdk_sandbox.x509.pem
similarity index 100%
rename from target/product/security/supplemental_process.x509.pem
rename to target/product/security/sdk_sandbox.x509.pem

From 08cae808f4ca5d33d11d83ac03586530075da79e Mon Sep 17 00:00:00 2001
From: Nikita Ioffe <ioffe@google.com>
Date: Thu, 24 Feb 2022 01:55:58 +0000
Subject: [PATCH 263/425] Rename supplementalprocess->sdksandbox jars

Bug: 220320098
Test: m
Test: presubmit
Change-Id: I53288f29ba0cf242e333904b2209bdc07ed85706
---
 target/product/default_art_config.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 531af33a76..0709239cbb 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -64,7 +64,7 @@ PRODUCT_APEX_BOOT_JARS := \
     com.android.permission:framework-permission-s \
     com.android.scheduling:framework-scheduling \
     com.android.sdkext:framework-sdkextensions \
-    com.android.supplementalprocess:framework-supplementalprocess \
+    com.android.supplementalprocess:framework-sdksandbox \
     com.android.tethering:framework-connectivity \
     com.android.tethering:framework-connectivity-t \
     com.android.tethering:framework-tethering \
@@ -86,7 +86,7 @@ PRODUCT_APEX_SYSTEM_SERVER_JARS := \
     com.android.art:service-art \
     com.android.media:service-media-s \
     com.android.permission:service-permission \
-    com.android.supplementalprocess:service-supplementalprocess \
+    com.android.supplementalprocess:service-sdksandbox \
 
 PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION += art/build/boot/boot-image-profile.txt
 

From 2023a530f0f1fb251cb02db1bb9def4b9ed1afb2 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 24 Feb 2022 03:51:10 +0000
Subject: [PATCH 264/425] Version bump to TP1A.220224.002 [core/build_id.mk]

Change-Id: Ib3857d5c8cfa271d8cdd6e4302fc200ee88ea775
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 718342dc74..cb9e7fc5dc 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=TP1A.220224.001
+BUILD_ID=TP1A.220224.002

From a2ae94e6896095c6b5590d8ed1e0e3d2fefea834 Mon Sep 17 00:00:00 2001
From: Neha Pattan <npattan@google.com>
Date: Wed, 23 Feb 2022 15:54:08 +0000
Subject: [PATCH 265/425] (5/6) AdServices setup.

Bug: 219953633
Test: build
      mmm -j packages/modules/AdServices
      mmm -j packages/modules/SupplementalApi
Change-Id: I9ee8818848b16879a39c2abc2e557499488bce5c
---
 target/product/default_art_config.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 531af33a76..e95cd03d3c 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -51,6 +51,7 @@ PRODUCT_BOOT_JARS += \
 # Note: core-icu4j is moved back to PRODUCT_BOOT_JARS in product_config.mk at a later stage.
 # Note: For modules available in Q, DO NOT add new entries here.
 PRODUCT_APEX_BOOT_JARS := \
+    com.android.adservices:framework-adservices \
     com.android.appsearch:framework-appsearch \
     com.android.auxiliary:framework-auxiliary \
     com.android.conscrypt:conscrypt \
@@ -82,6 +83,7 @@ endif
 # Note: For modules available in Q, DO NOT add new entries here.
 # TODO(b/218568223): Add supplementalapi to system server jars.
 PRODUCT_APEX_SYSTEM_SERVER_JARS := \
+    com.android.adservices:service-adservices \
     com.android.appsearch:service-appsearch \
     com.android.art:service-art \
     com.android.media:service-media-s \

From 113da5984a806f835ef79cab6da84f52f574fb8b Mon Sep 17 00:00:00 2001
From: Eric Jeong <ericjeong@google.com>
Date: Mon, 14 Feb 2022 23:38:54 -0800
Subject: [PATCH 266/425] Remove iorapd from base product packages

- iorapd is being removed.
- So, it cannot be installed.

Bug: 211461392
Test: build okay
Change-Id: I17491f42ca7a0b73de0b3a3c588a90c8e3e3f3e9
Merged-In: I17491f42ca7a0b73de0b3a3c588a90c8e3e3f3e9
(cherry picked from commit 4c0ac42c0601fb9cb1524f78565a2fcffdf5dde1)
---
 target/product/base_system.mk    |  1 -
 target/product/runtime_libart.mk | 11 -----------
 2 files changed, 12 deletions(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index e025e388d7..19616b8e50 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -124,7 +124,6 @@ PRODUCT_PACKAGES += \
     input \
     installd \
     IntentResolver \
-    iorapd \
     ip \
     iptables \
     ip-up-vpn \
diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index ee63757c95..b6560fc8f3 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -148,17 +148,6 @@ PRODUCT_SYSTEM_PROPERTIES += \
     dalvik.vm.minidebuginfo=true \
     dalvik.vm.dex2oat-minidebuginfo=true
 
-# Two other device configs are added to IORap besides "ro.iorapd.enable".
-# IORap by default is off and starts when
-# (https://source.corp.google.com/android/system/iorap/iorapd.rc?q=iorapd.rc)
-#
-# * "ro.iorapd.enable" is true excluding unset
-# * One of the device configs is true.
-#
-# "ro.iorapd.enable" has to be set to true, so that iorap can be started.
-PRODUCT_SYSTEM_PROPERTIES += \
-    ro.iorapd.enable?=true
-
 # Enable Madvising of the whole art, odex and vdex files to MADV_WILLNEED.
 # The size specified here is the size limit of how much of the file
 # (in bytes) is madvised.

From 8229cef4a356e9752b9ea923027ceda7153fc56c Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 24 Feb 2022 22:43:18 +0000
Subject: [PATCH 267/425] Version bump to TP1A.220224.003 [core/build_id.mk]

Change-Id: I20f5cc1f8dc23f790b0276377dd79d3e2d22df9a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index cb9e7fc5dc..b0a3d42fae 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=TP1A.220224.002
+BUILD_ID=TP1A.220224.003

From 301ff70e7e00cfcf789e1bc69c32d311318f582d Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 25 Feb 2022 02:57:15 +0000
Subject: [PATCH 268/425] Version bump to TP1A.220225.002 [core/build_id.mk]

Change-Id: Idfe8159b42044b25185998538925cb281eeb89d6
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 014dab0a78..d956a58e04 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=TP1A.220225.001
+BUILD_ID=TP1A.220225.002

From 464378fce23c57605ab3f37f263d96588251b3e4 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Sat, 26 Feb 2022 01:43:11 +0000
Subject: [PATCH 269/425] Version bump to TP1A.220225.003 [core/build_id.mk]

Change-Id: I2a935838b85075933716143803d13ae359337d71
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index d956a58e04..2062f05a38 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=TP1A.220225.002
+BUILD_ID=TP1A.220225.003

From 4bd37daaece788aeccc6120c967dc057e490c791 Mon Sep 17 00:00:00 2001
From: Neha Pattan <npattan@google.com>
Date: Mon, 28 Feb 2022 20:30:18 +0000
Subject: [PATCH 270/425] (1/3) Remove SupplementalApi from BCP.

Bug: 221855066
Test: build
      mmm -j packages/modules/SupplementalProcess
Change-Id: I2f99ba8af33f1e019bf1dbcd1642b5fe641cdaf7
---
 target/product/default_art_config.mk | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 0b998f8e76..750f2f23d1 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -73,16 +73,9 @@ PRODUCT_APEX_BOOT_JARS := \
     com.android.uwb:framework-uwb \
     com.android.wifi:framework-wifi \
 
-# TODO(b/210903289): Remove filters after merge.
-ifneq ($(wildcard packages/modules/SupplementalApi),)
-PRODUCT_APEX_BOOT_JARS += \
-    com.android.supplementalprocess:framework-supplementalapi
-endif
-
 # List of system_server classpath jars delivered via apex.
 # Keep the list sorted by module names and then library names.
 # Note: For modules available in Q, DO NOT add new entries here.
-# TODO(b/218568223): Add supplementalapi to system server jars.
 PRODUCT_APEX_SYSTEM_SERVER_JARS := \
     com.android.adservices:service-adservices \
     com.android.appsearch:service-appsearch \

From 0d67930905da13755afbb75fb5bfd9bc610d5bc8 Mon Sep 17 00:00:00 2001
From: Nikita Ioffe <ioffe@google.com>
Date: Wed, 2 Mar 2022 16:15:55 +0000
Subject: [PATCH 271/425] Replace supplementalprocess with sdksandbox

And also remove supplementalprocess APEX

Bug: 220320098
Test: m
Change-Id: I7d92d48173baf0d55a12c710f2e494442d7feeaa
---
 target/product/base_system.mk        | 1 -
 target/product/default_art_config.mk | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 5ecd053e57..b59a84fa88 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -71,7 +71,6 @@ PRODUCT_PACKAGES += \
     com.android.scheduling \
     com.android.sdkext \
     com.android.sepolicy \
-    com.android.supplementalprocess \
     com.android.tethering \
     com.android.tzdata \
     com.android.uwb \
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index bdb082d9a4..d39dc6d4b8 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -52,6 +52,7 @@ PRODUCT_BOOT_JARS += \
 # Note: For modules available in Q, DO NOT add new entries here.
 PRODUCT_APEX_BOOT_JARS := \
     com.android.adservices:framework-adservices \
+    com.android.adservices:framework-sdksandbox \
     com.android.appsearch:framework-appsearch \
     com.android.auxiliary:framework-auxiliary \
     com.android.bluetooth:framework-bluetooth \
@@ -66,7 +67,6 @@ PRODUCT_APEX_BOOT_JARS := \
     com.android.permission:framework-permission-s \
     com.android.scheduling:framework-scheduling \
     com.android.sdkext:framework-sdkextensions \
-    com.android.supplementalprocess:framework-sdksandbox \
     com.android.tethering:framework-connectivity \
     com.android.tethering:framework-connectivity-t \
     com.android.tethering:framework-tethering \
@@ -78,11 +78,11 @@ PRODUCT_APEX_BOOT_JARS := \
 # Note: For modules available in Q, DO NOT add new entries here.
 PRODUCT_APEX_SYSTEM_SERVER_JARS := \
     com.android.adservices:service-adservices \
+    com.android.adservices:service-sdksandbox \
     com.android.appsearch:service-appsearch \
     com.android.art:service-art \
     com.android.media:service-media-s \
     com.android.permission:service-permission \
-    com.android.supplementalprocess:service-sdksandbox \
 
 PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION += art/build/boot/boot-image-profile.txt
 

From c3b0cc5fdebbcc6724483fa52c6b33227db83c8e Mon Sep 17 00:00:00 2001
From: Ramji Jiyani <ramjiyani@google.com>
Date: Wed, 2 Mar 2022 12:36:27 -0800
Subject: [PATCH 272/425] Pixel Common: system_dlkm: avb hashtree footer

Add avb hashtree footer args for the system_dlkm
partition required for the T launch devices.

Bug: 222334390
Test: TH, manual build, Code testing gs101 & R6
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I7a28ccfa2acad2e20c35a8a68edbffcca068678e
---
 target/board/BoardConfigPixelCommon.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/board/BoardConfigPixelCommon.mk b/target/board/BoardConfigPixelCommon.mk
index a970fec1ec..22521b5ee2 100644
--- a/target/board/BoardConfigPixelCommon.mk
+++ b/target/board/BoardConfigPixelCommon.mk
@@ -5,6 +5,7 @@
 # Using sha256 for dm-verity partitions. b/156162446
 # system, system_other, system_ext and product.
 BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS += --hash_algorithm sha256
+BOARD_AVB_SYSTEM_DLKM_ADD_HASHTREE_FOOTER_ARGS += --hash_algorithm sha256
 BOARD_AVB_SYSTEM_OTHER_ADD_HASHTREE_FOOTER_ARGS += --hash_algorithm sha256
 BOARD_AVB_SYSTEM_EXT_ADD_HASHTREE_FOOTER_ARGS += --hash_algorithm sha256
 BOARD_AVB_PRODUCT_ADD_HASHTREE_FOOTER_ARGS += --hash_algorithm sha256

From fc7459ce327d695175958ffd138250bc4ca720ae Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 3 Mar 2022 01:01:37 +0000
Subject: [PATCH 273/425] Version bump to TP1A.220302.002 [core/build_id.mk]

Change-Id: I9da5af11995acf649bec3fac018bec91d075a9cb
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index a671f6f985..ee32470d82 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=TP1A.220302.001
+BUILD_ID=TP1A.220302.002

From 28b914432104d0228db1b0ac8fab355bc162c4bb Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 3 Mar 2022 03:17:06 +0000
Subject: [PATCH 274/425] Version bump to TP1A.220303.002 [core/build_id.mk]

Change-Id: I8b56afa51ecc75c85866f48107fc4a48c81272c0
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index b7c4f4beab..f0887c1d00 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=TP1A.220303.001
+BUILD_ID=TP1A.220303.002

From d3b6ec274faa23d714848f1e5582b1825e24397f Mon Sep 17 00:00:00 2001
From: Frank Wang <xueyiwang@google.com>
Date: Thu, 3 Mar 2022 06:01:06 +0000
Subject: [PATCH 275/425] Remove Auxiliary from build/target branch.

Test: TH
Bug: 210728915
Change-Id: Icfc05fed7c2d6797b33a64f739af3a5a9d3d2b66
---
 target/product/base_system.mk        | 1 -
 target/product/default_art_config.mk | 1 -
 2 files changed, 2 deletions(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 5ecd053e57..0682c8fe8e 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -53,7 +53,6 @@ PRODUCT_PACKAGES += \
     com.android.adservices \
     com.android.appsearch \
     com.android.bluetooth \
-    com.android.auxiliary \
     com.android.conscrypt \
     com.android.cronet \
     com.android.extservices \
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index bdb082d9a4..5a415739ec 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -53,7 +53,6 @@ PRODUCT_BOOT_JARS += \
 PRODUCT_APEX_BOOT_JARS := \
     com.android.adservices:framework-adservices \
     com.android.appsearch:framework-appsearch \
-    com.android.auxiliary:framework-auxiliary \
     com.android.bluetooth:framework-bluetooth \
     com.android.conscrypt:conscrypt \
     com.android.i18n:core-icu4j \

From 1eac5d0b21b2f48a874f99a0c1bab45964c09159 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 3 Mar 2022 17:45:07 +0000
Subject: [PATCH 276/425] Version bump to TP1A.220303.003 [core/build_id.mk]

Change-Id: Ifea3c69a32ab1a7b99a4998b31191b2904190258
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index f0887c1d00..b24bf16356 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=TP1A.220303.002
+BUILD_ID=TP1A.220303.003

From 5e64b7c3a3514e6fd747c869beb7b278ee818572 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 4 Mar 2022 03:45:21 +0000
Subject: [PATCH 277/425] Version bump to TP1A.220304.002 [core/build_id.mk]

Change-Id: I9010dc416bc4d39adbd7af4f74f4fe2315c08301
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 3952b19965..d9829b079e 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=TP1A.220304.001
+BUILD_ID=TP1A.220304.002

From c87c9c66e3e70e88be3ed005347c4876e292e285 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 4 Mar 2022 04:49:14 +0000
Subject: [PATCH 278/425] Version bump to TP1A.220304.003 [core/build_id.mk]

Change-Id: Ie33504a028891188f2ab273f7a8cee1fa3e3c698
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index d9829b079e..4373751212 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=TP1A.220304.002
+BUILD_ID=TP1A.220304.003

From 1b7f408996ed0c58dd26f593c9ed9a7dea25a0d2 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 4 Mar 2022 16:07:06 +0000
Subject: [PATCH 279/425] Version bump to TP1A.220304.004 [core/build_id.mk]

Change-Id: I2a6b65f9d97ef0625b4ec1a66b671508fa5982b5
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 4373751212..a900eb4960 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=TP1A.220304.003
+BUILD_ID=TP1A.220304.004

From e8e5f96581522035f16e947732fff30aed9e08cf Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 1 Mar 2022 17:35:41 -0800
Subject: [PATCH 280/425] DO NOT MERGE: Set display version for T

Bug: 221950960
Test: manual
Change-Id: I76ef1fa3d48b8ab5343a093ff095f7a42732df9a
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 3f857aacc8..ebf4328208 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -58,7 +58,7 @@ PLATFORM_VERSION_CODENAME.TP1A := Tiramisu
 # This is the user-visible version.  In a final release build it should
 # be empty to use PLATFORM_VERSION as the user-visible version.  For
 # a preview release it can be set to a user-friendly value like `12 Preview 1`
-PLATFORM_DISPLAY_VERSION :=
+PLATFORM_DISPLAY_VERSION := 13
 
 ifndef PLATFORM_SDK_VERSION
   # This is the canonical definition of the SDK version, which defines

From d6487fb386bf7d9d82b7fbbce571430699457862 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 8 Mar 2022 21:59:24 +0000
Subject: [PATCH 281/425] Version bump to TP1A.220308.002 [core/build_id.mk]

Change-Id: Ia19882c838e8be7e3d5a6d370b391f6dc826e68f
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 298cb49837..f173308dfd 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=TP1A.220308.001
+BUILD_ID=TP1A.220308.002

From 6fab37e78b32348f906bfec432ca57d881478799 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 9 Mar 2022 05:17:04 +0000
Subject: [PATCH 282/425] Version bump to TP1A.220309.002 [core/build_id.mk]

Change-Id: I92290246edbc82efefc09c39d7effbfdbbdbbf05
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 8d45b7938c..6ddbcdeb55 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=TP1A.220309.001
+BUILD_ID=TP1A.220309.002

From 70d07602cba81bc223996852158accb1a9991ca2 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 9 Mar 2022 22:15:18 +0000
Subject: [PATCH 283/425] Version bump to TP1A.220309.003 [core/build_id.mk]

Change-Id: I71568bd4d5914ebf0dc904560b127ed4cf56eaf1
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 6ddbcdeb55..801e912d40 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=TP1A.220309.002
+BUILD_ID=TP1A.220309.003

From 0f9038999390e2a7c8b5415bad4c5b833b9c36f2 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 9 Mar 2022 23:17:07 +0000
Subject: [PATCH 284/425] Version bump to TP1A.220309.004 [core/build_id.mk]

Change-Id: I1dc490957aeb30eee12f1108ac5a215577bf0da9
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 801e912d40..f57412a49d 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=TP1A.220309.003
+BUILD_ID=TP1A.220309.004

From 44b364ed7ff71691cd91c3c15dedbc3467ed4bf1 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 10 Mar 2022 03:17:08 +0000
Subject: [PATCH 285/425] Version bump to TP1A.220310.002 [core/build_id.mk]

Change-Id: I3e2dc66967f55fe02958cf57422d0ab6dfb9cc02
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index f2fbdbf653..c36cb174df 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=TP1A.220310.001
+BUILD_ID=TP1A.220310.002

From dfbfcbfca505fb14bf85d66fd17450769d36e1bb Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 10 Mar 2022 18:31:17 +0000
Subject: [PATCH 286/425] Convert extension version assignment to be simple

To match what was done in I4798fb69c639e6d52d275a5b793fa0c8ba876202.

Test: m nothing
Merged-In: I4798fb69c639e6d52d275a5b793fa0c8ba876202
Change-Id: I65b7c5974e0ce64bb43474e49ef9ed8d2b13d001
---
 core/version_defaults.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index d65e697214..88fa42771f 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -156,7 +156,8 @@ endif
 .KATI_READONLY := PLATFORM_SDK_VERSION
 
 # This is the sdk extension version of this tree.
-PLATFORM_SDK_EXTENSION_VERSION :=$= 1
+PLATFORM_SDK_EXTENSION_VERSION := 1
+.KATI_READONLY := PLATFORM_SDK_EXTENSION_VERSION
 
 # This is the sdk extension version that PLATFORM_SDK_VERSION ships with.
 PLATFORM_BASE_SDK_EXTENSION_VERSION :=$= 0

From f5dfe3ff7b59b44556510ba89d15161c87312069 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Fri, 12 Nov 2021 12:45:09 +0000
Subject: [PATCH 287/425] Bump SDK Extension version to 2

This bump includes SdkExtensions and MediaProvider.

Bug: 222049920
Test: Manual install of MP & SDKExtensions
Change-Id: Ie68b78c93f66bd7b40f0dad301821d14d8dc5655
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 3f857aacc8..fb8333a656 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -78,7 +78,7 @@ endif
 .KATI_READONLY := PLATFORM_SDK_VERSION
 
 # This is the sdk extension version of this tree.
-PLATFORM_SDK_EXTENSION_VERSION := 1
+PLATFORM_SDK_EXTENSION_VERSION := 2
 .KATI_READONLY := PLATFORM_SDK_EXTENSION_VERSION
 
 # This is the sdk extension version that PLATFORM_SDK_VERSION ships with.

From e4842390604b29f4206a312c51ca21ca1d654f1b Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Fri, 12 Nov 2021 12:45:09 +0000
Subject: [PATCH 288/425] Bump SDK Extension version to 2

This bump includes SdkExtensions and MediaProvider.

Bug: 222049920
Test: Manual install of MP & SDKExtensions
Merged-In: Ie68b78c93f66bd7b40f0dad301821d14d8dc5655
Change-Id: Ie68b78c93f66bd7b40f0dad301821d14d8dc5655
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 88fa42771f..aad89a3ec7 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -156,7 +156,7 @@ endif
 .KATI_READONLY := PLATFORM_SDK_VERSION
 
 # This is the sdk extension version of this tree.
-PLATFORM_SDK_EXTENSION_VERSION := 1
+PLATFORM_SDK_EXTENSION_VERSION := 2
 .KATI_READONLY := PLATFORM_SDK_EXTENSION_VERSION
 
 # This is the sdk extension version that PLATFORM_SDK_VERSION ships with.

From 341915b0f5149c213b6f2dba80ad7af034b1462f Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Mon, 14 Mar 2022 13:08:40 +0000
Subject: [PATCH 289/425] Bump the base sdk extension version in TM

T will ship with extension version 2 (probably 3, actually, but
definitely not 1), so bump the base extension version.

Bug: 222049920
Test: m nothing
Change-Id: I9a718a514e64c2fa6795a3512af6528e177ede17
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index fb8333a656..7cd00e9a68 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -82,7 +82,7 @@ PLATFORM_SDK_EXTENSION_VERSION := 2
 .KATI_READONLY := PLATFORM_SDK_EXTENSION_VERSION
 
 # This is the sdk extension version that PLATFORM_SDK_VERSION ships with.
-PLATFORM_BASE_SDK_EXTENSION_VERSION := 1
+PLATFORM_BASE_SDK_EXTENSION_VERSION := 2
 .KATI_READONLY := PLATFORM_BASE_SDK_EXTENSION_VERSION
 
 # This is are all known codenames starting from Q.

From 3621c8ced816d5939e9f36a4ac955cb1eecd1c6f Mon Sep 17 00:00:00 2001
From: Xiao Ma <xiaom@google.com>
Date: Thu, 27 Jan 2022 14:05:48 +0000
Subject: [PATCH 290/425] Remove ethernet-service jar dependency.

ethernet service source code is going to be moved into Connectivity
mainline module, and start the ethernet service from the module. The
old ethernet-service lib will be deprecated, remove it from soong
build rule.

Bug: 210586283
Test: m
Change-Id: I19d517cac28c18c70b8dad979ecbfe3fb6d26902
---
 target/product/media_system.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index 30a8621b15..79bd74a01c 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -27,7 +27,6 @@ PRODUCT_PACKAGES += \
     com.android.media.remotedisplay.xml \
     CompanionDeviceManager \
     drmserver \
-    ethernet-service \
     fsck.f2fs \
     HTMLViewer \
     libfilterpack_imageproc \
@@ -51,8 +50,7 @@ endif
 # The order here is the same order they end up on the classpath, so it matters.
 PRODUCT_SYSTEM_SERVER_JARS := \
     com.android.location.provider \
-    services \
-    ethernet-service
+    services
 
 PRODUCT_COPY_FILES += \
     system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt

From 4a829c540736333c0d8a0c615ed487b05fcdb763 Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Fri, 4 Mar 2022 15:49:47 +0000
Subject: [PATCH 291/425] Remove sepolicy module from system image.

Bug: 199914227
Test: presubmit
Merged-In: If091dcea78358d024892533b734882274c2ea9a3
Change-Id: I02272bffa3abf2b7514eac1c917cda1f04b7e7da
---
 target/product/base_system.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 2ad9ac6506..83ca2248ae 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -69,7 +69,6 @@ PRODUCT_PACKAGES += \
     com.android.neuralnetworks \
     com.android.scheduling \
     com.android.sdkext \
-    com.android.sepolicy \
     com.android.tethering \
     com.android.tzdata \
     com.android.uwb \
@@ -373,7 +372,6 @@ PRODUCT_SYSTEM_PROPERTIES += persist.traced.enable=1
 PRODUCT_PACKAGES_DEBUG := \
     adb_keys \
     arping \
-    com.android.sepolicy.cert-debug.der \
     dmuserd \
     idlcli \
     init-debug.rc \

From f7ad1445d772c25f9fae874ceb54dc209fb1c1e0 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 15 Mar 2022 23:45:03 +0000
Subject: [PATCH 292/425] Version bump to TP1A.220315.002 [core/build_id.mk]

Change-Id: I2515aca1c767d3e024161c8e596e74f69e1f8ad6
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 5aff160f6b..9f92f9416a 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=TP1A.220315.001
+BUILD_ID=TP1A.220315.002

From df85aac0ad46fec13836397e2e0e0ffb38f8f882 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 16 Mar 2022 01:43:02 +0000
Subject: [PATCH 293/425] Version bump to TP1A.220316.002 [core/build_id.mk]

Change-Id: I5e68a83f98c4a1e5fa64b4876f2501c228c71a9d
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index e164c3906c..1612b7e416 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=TP1A.220316.001
+BUILD_ID=TP1A.220316.002

From 8fe2a621eea22cd668fc0471f739e2fff1e1abf7 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 16 Mar 2022 07:33:06 +0000
Subject: [PATCH 294/425] Version bump to TP1A.220316.003 [core/build_id.mk]

Change-Id: Iddc2a6ef2b12a4dd1f7057224bdfd443cd3f3c2e
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 1612b7e416..cdd05f0001 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=TP1A.220316.002
+BUILD_ID=TP1A.220316.003

From ebdefc0c76802d0d5c09fcce9a993b8aab0e6575 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Sat, 12 Feb 2022 15:39:22 -0800
Subject: [PATCH 295/425] Notice files and non-module targets.

Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m nothing reportmissinglicenses

Change-Id: Icdb11d3c72b180cd02231e8dc98ae500d6566a98
Merged-in: Icdb11d3c72b180cd02231e8dc98ae500d6566a98
---
 core/Makefile        | 430 ++++++++++++++++++++++++++++---------------
 core/definitions.mk  |  11 +-
 core/os_licensing.mk | 171 +++++++++++++++++
 core/sysprop.mk      |  18 ++
 4 files changed, 481 insertions(+), 149 deletions(-)
 create mode 100644 core/os_licensing.mk

diff --git a/core/Makefile b/core/Makefile
index a0a1d5093f..fd9ef672e1 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4,6 +4,17 @@
 # intermedites-dir-for
 LOCAL_PATH := $(BUILD_SYSTEM)
 
+SYSTEM_NOTICE_DEPS :=
+VENDOR_NOTICE_DEPS :=
+UNMOUNTED_NOTICE_DEPS :=
+ODM_NOTICE_DEPS :=
+OEM_NOTICE_DEPS :=
+PRODUCT_NOTICE_DEPS :=
+SYSTEM_EXT_NOTICE_DEPS :=
+VENDOR_DLKM_NOTICE_DEPS :=
+ODM_DLKM_NOTICE_DEPS :=
+SYSTEM_DLKM_NOTICE_DEPS :=
+
 # -----------------------------------------------------------------
 # Define rules to copy PRODUCT_COPY_FILES defined by the product.
 # PRODUCT_COPY_FILES contains words like <source file>:<dest file>[:<owner>].
@@ -816,6 +827,8 @@ $(INSTALLED_FILES_FILE_RAMDISK) : $(INTERNAL_RAMDISK_FILES) $(FILESLIST) $(FILES
 	$(FILESLIST) $(TARGET_RAMDISK_OUT) > $(@:.txt=.json)
 	$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@
 
+$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_RAMDISK)))
+
 ifeq ($(HOST_OS),linux)
 $(call dist-for-goals, sdk sdk_addon, $(INSTALLED_FILES_FILE_RAMDISK))
 endif
@@ -843,6 +856,11 @@ ifeq (true,$(BOARD_USES_GENERIC_KERNEL_IMAGE))
 endif
 	$(hide) $(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_RAMDISK_OUT) | $(COMPRESSION_COMMAND) > $@
 
+$(call declare-1p-container,$(INSTALLED_RAMDISK_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_RAMDISK_TARGET),$(INTERNAL_RAMDISK_FILE),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_RAMDISK_TARGET)
+
 .PHONY: ramdisk-nodeps
 ramdisk-nodeps: $(MKBOOTFS) | $(COMPRESSION_COMMAND_DEPS)
 	@echo "make $@: ignoring dependencies"
@@ -1040,6 +1058,11 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(AVBTOOL) $(INTERNAL_BOOTIMAGE_FILE
 	$(call pretty,"Target boot image: $@")
 	$(call build_boot_board_avb_enabled,$@)
 
+$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_BOOTIMAGE_FILES) $(INTERNAL_GKI_CERTIFICATE_DEPS),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)
+
 .PHONY: bootimage-nodeps
 bootimage-nodeps: $(MKBOOTIMG) $(AVBTOOL) $(BOARD_AVB_BOOT_KEY_PATH) $(INTERNAL_GKI_CERTIFICATE_DEPS)
 	@echo "make $@: ignoring dependencies"
@@ -1058,6 +1081,11 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(BOOT_S
 	$(call pretty,"Target boot image: $@")
 	$(call build_boot_supports_boot_signer,$@)
 
+$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_BOOTIMAGE_FILES),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)
+
 .PHONY: bootimage-nodeps
 bootimage-nodeps: $(MKBOOTIMG) $(BOOT_SIGNER)
 	@echo "make $@: ignoring dependencies"
@@ -1076,6 +1104,11 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(VBOOT_
 	$(call pretty,"Target boot image: $@")
 	$(call build_boot_supports_vboot,$@)
 
+$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_BOOTIMAGE_FILES),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)
+
 .PHONY: bootimage-nodeps
 bootimage-nodeps: $(MKBOOTIMG) $(VBOOT_SIGNER) $(FUTILITY)
 	@echo "make $@: ignoring dependencies"
@@ -1093,6 +1126,11 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES)
 	$(call pretty,"Target boot image: $@")
 	$(call build_boot_novboot,$@)
 
+$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_BOOTIMAGE_FILES),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)
+
 .PHONY: bootimage-nodeps
 bootimage-nodeps: $(MKBOOTIMG)
 	@echo "make $@: ignoring dependencies"
@@ -1114,6 +1152,11 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(INTERNAL_PREBUILT_BOOTIMAGE) $(AVBTOOL) $(BOARD
 	    $(call get-partition-size-argument,$(BOARD_BOOTIMAGE_PARTITION_SIZE)) \
 	    --partition_name boot $(INTERNAL_AVB_BOOT_SIGNING_ARGS) \
 	    $(BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS)
+
+$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_PREBUILT_BOOTIMAGE),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)
 else
 $(INSTALLED_BOOTIMAGE_TARGET): $(INTERNAL_PREBUILT_BOOTIMAGE)
 	cp $(INTERNAL_PREBUILT_BOOTIMAGE) $@
@@ -1149,13 +1192,20 @@ $(INSTALLED_INIT_BOOT_IMAGE_TARGET): $(AVBTOOL) $(BOARD_AVB_INIT_BOOT_KEY_PATH)
 	   $(call get-partition-size-argument,$(BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE)) \
 	   --partition_name init_boot $(INTERNAL_AVB_INIT_BOOT_SIGNING_ARGS) \
 	   $(BOARD_AVB_INIT_BOOT_ADD_HASH_FOOTER_ARGS)
+
+$(call declare-1p-container,$(INSTALLED_INIT_BOOT_IMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_INIT_BOOT_IMAGE_TARGET),$(INTERNAL_GENERIC_RAMDISK_BOOT_SIGNATURE),$(PRODUCT_OUT)/:/)
 else
 $(INSTALLED_INIT_BOOT_IMAGE_TARGET):
 	$(call pretty,"Target init_boot image: $@")
 	$(MKBOOTIMG) $(INTERNAL_INIT_BOOT_IMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_INIT_ARGS) --output $@
 	$(call assert-max-image-size,$@,$(BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE))
+
+$(call declare-1p-target,$(INSTALLED_INIT_BOOT_IMAGE_TARGET),)
 endif
 
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_INIT_BOOT_IMAGE_TARGET)
+
 else # BUILDING_INIT_BOOT_IMAGE is not true
 
 ifdef BOARD_PREBUILT_INIT_BOOT_IMAGE
@@ -1170,11 +1220,18 @@ $(INSTALLED_INIT_BOOT_IMAGE_TARGET): $(INTERNAL_PREBUILT_INIT_BOOT_IMAGE) $(AVBT
 	    $(call get-partition-size-argument,$(BOARD_INIT_BOOT_IMAGE_PARTITION_SIZE)) \
 	    --partition_name boot $(INTERNAL_AVB_INIT_BOOT_SIGNING_ARGS) \
 	    $(BOARD_AVB_INIT_BOOT_ADD_HASH_FOOTER_ARGS)
+
+$(call declare-1p-container,$(INSTALLED_INIT_BOOT_IMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_INIT_BOOT_IMAGE_TARGET),$(INTERNAL_PREBUILT_INIT_BOOT_IMAGE),$(PRODUCT_OUT)/:/)
 else
 $(INSTALLED_INIT_BOOT_IMAGE_TARGET): $(INTERNAL_PREBUILT_INIT_BOOT_IMAGE)
 	cp $(INTERNAL_PREBUILT_INIT_BOOT_IMAGE) $@
+
+$(call declare-1p-target,$(INSTALLED_INIT_BOOT_IMAGE_TARGET),)
 endif # BOARD_AVB_ENABLE
 
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_INIT_BOOT_IMAGE_TARGET)
+
 else # BOARD_PREBUILT_INIT_BOOT_IMAGE not defined
 INSTALLED_INIT_BOOT_IMAGE_TARGET :=
 endif # BOARD_PREBUILT_INIT_BOOT_IMAGE
@@ -1212,6 +1269,11 @@ $(INSTALLED_VENDOR_RAMDISK_TARGET): $(INTERNAL_VENDOR_RAMDISK_TARGET)
 	@echo "Target vendor ramdisk: $@"
 	$(copy-file-to-target)
 
+$(call declare-1p-container,$(INSTALLED_VENDOR_RAMDISK_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_VENDOR_RAMDISK_TARGET),$(INTERNAL_VENDOR_RAMDISK_TARGET),$(PRODUCT_OUT)/:/)
+
+VENDOR_NOTICE_DEPS += $(INSTALLED_VENDOR_RAMDISK_TARGET)
+
 INSTALLED_FILES_FILE_VENDOR_RAMDISK := $(PRODUCT_OUT)/installed-files-vendor-ramdisk.txt
 INSTALLED_FILES_JSON_VENDOR_RAMDISK := $(INSTALLED_FILES_FILE_VENDOR_RAMDISK:.txt=.json)
 $(INSTALLED_FILES_FILE_VENDOR_RAMDISK): .KATI_IMPLICIT_OUTPUTS := $(INSTALLED_FILES_JSON_VENDOR_RAMDISK)
@@ -1223,6 +1285,8 @@ $(INSTALLED_FILES_FILE_VENDOR_RAMDISK): $(INTERNAL_VENDOR_RAMDISK_FILES) $(FILES
 	$(FILESLIST) $(TARGET_VENDOR_RAMDISK_OUT) > $(@:.txt=.json)
 	$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@
 
+$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_VENDOR_RAMDISK)))
+
 ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG
   INTERNAL_VENDOR_BOOTIMAGE_ARGS += --dtb $(INSTALLED_DTBIMAGE_TARGET)
 endif
@@ -1304,6 +1368,10 @@ $(INSTALLED_VENDOR_BOOTIMAGE_TARGET):
 	$(MKBOOTIMG) $(INTERNAL_VENDOR_BOOTIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --vendor_ramdisk $(INTERNAL_VENDOR_RAMDISK_TARGET) $(INTERNAL_VENDOR_RAMDISK_FRAGMENT_ARGS) --vendor_boot $@
 	$(call assert-max-image-size,$@,$(BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE))
 endif
+
+$(call declare-1p-container,$(INSTALLED_VENDOR_BOOTIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_VENDOR_BOOTIMAGE_TARGET),$(INTERNAL_VENDOR_RAMDISK_TARGET) $(INSTALLED_DTB_IMAGE_TARGET) $(INTERNAL_VENDOR_RAMDISK_FRAGMENT_TARGETS) $(INTERNAL_VENDOR_BOOTCONDIG_TARGET),$(PRODUCT_OUT)/:/)
+VENDOR_NOTICE_DEPS += $(INSTALLED_VENDOR_BOOTIMAGE_TARGET)
 endif # BUILDING_VENDOR_BOOT_IMAGE
 
 # -----------------------------------------------------------------
@@ -1320,6 +1388,54 @@ endif # BUILDING_VENDOR_BOOT_IMAGE
 
 .PHONY: notice_files
 
+# Convert license metadata into xml notice file.
+# $(1) - Output target notice filename
+# $(2) - Product name
+# $(3) - File title
+# $(4) - License metadata file roots
+# $(5) - Prefixes to strip
+#
+define xml-notice-rule
+$(1): PRIVATE_PRODUCT := $(2)
+$(1): PRIVATE_MESSAGE := $(3)
+$(1): $(call corresponding-license-metadata,$(4)) $(XMLNOTICE) $(BUILD_SYSTEM)/Makefile
+	$(XMLNOTICE) -o $$@ -product=$$(PRIVATE_PRODUCT) -title=$$(PRIVATE_MESSAGE) $(foreach prefix, $(5), -strip_prefix=$(prefix)) $(call corresponding-license-metadata,$(4))
+
+notice_files: $(1)
+endef
+
+# Convert license metadata into text notice file.
+# $(1) - Output target notice filename
+# $(2) - Product name
+# $(3) - File title
+# $(4) - License metadata file roots
+# $(5) - Prefixes to strip
+#
+define text-notice-rule
+$(1): PRIVATE_PRODUCT := $(2)
+$(1): PRIVATE_MESSAGE := $(3)
+$(1): $(call corresponding-license-metadata,$(4)) $(TEXTNOTICE) $(BUILD_SYSTEM)/Makefile
+	$(TEXTNOTICE) -o $$@ -product=$$(PRIVATE_PRODUCT) -title=$$(PRIVATE_MESSAGE) $(foreach prefix, $(5), -strip_prefix=$(prefix)) $(call corresponding-license-metadata,$(4))
+
+notice_files: $(1)
+endef
+
+# Conversion license metadata into html notice file.
+# $(1) - Output target notice filename
+# $(2) - Product name
+# $(3) - File title
+# $(4) - License metadata file roots
+# $(5) - Prefixes to strip
+#
+define html-notice-rule
+$(1): PRIVATE_PRODUCT := $(2)
+$(1): PRIVATE_MESSAGE := $(3)
+$(1): $(call corresponding-license-metadata,$(4)) $(HTMLNOTICE) $(BUILD_SYSTEM)/Makefile
+	$(HTMLNOTICE) -o $$@ -product=$$(PRIVATE_PRODUCT) -title=$$(PRIVATE_MESSAGE) $(foreach prefix, $(5), -strip_prefix=$(prefix)) $(call corresponding-license-metadata,$(4))
+
+notice_files: $(1)
+endef
+
 # Create the rule to combine the files into text and html/xml forms
 # $(1) - xml_excluded_system_product_odm_vendor_dlkm_odm_dlkm|
 #        xml_excluded_vendor_product_odm_vendor_dlkm_odm_dlkm|
@@ -1380,60 +1496,42 @@ exclude_target_dirs := apex
 
 # TODO(b/69865032): Make PRODUCT_NOTICE_SPLIT the default behavior.
 ifneq ($(PRODUCT_NOTICE_SPLIT),true)
-target_notice_file_html := $(TARGET_OUT_INTERMEDIATES)/NOTICE.html
+#target_notice_file_html := $(TARGET_OUT_INTERMEDIATES)/NOTICE.html
 target_notice_file_html_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE.html.gz
 installed_notice_html_or_xml_gz := $(TARGET_OUT)/etc/NOTICE.html.gz
-$(eval $(call combine-notice-files, html, \
-	        $(target_notice_file_txt), \
-	        $(target_notice_file_html), \
-	        "Notices for files contained in the filesystem images in this directory:", \
-	        $(TARGET_OUT_NOTICE_FILES), \
-	        $(ALL_DEFAULT_INSTALLED_MODULES) $(kernel_notice_file), \
-	        $(exclude_target_dirs)))
-$(target_notice_file_html_gz): $(target_notice_file_html) | $(MINIGZIP)
-	$(hide) $(MINIGZIP) -9 < $< > $@
-$(installed_notice_html_or_xml_gz): $(target_notice_file_html_gz)
-	$(copy-file-to-target)
 
 $(call declare-0p-target,$(target_notice_file_html_gz))
 $(call declare-0p-target,$(installed_notice_html_or_xml_gz))
 else
-target_notice_file_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE.xml
+# target_notice_file_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE.xml
 target_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE.xml.gz
 installed_notice_html_or_xml_gz := $(TARGET_OUT)/etc/NOTICE.xml.gz
 
 target_vendor_notice_file_txt := $(TARGET_OUT_INTERMEDIATES)/NOTICE_VENDOR.txt
-target_vendor_notice_file_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE_VENDOR.xml
 target_vendor_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE_VENDOR.xml.gz
 installed_vendor_notice_xml_gz := $(TARGET_OUT_VENDOR)/etc/NOTICE.xml.gz
 
 target_product_notice_file_txt := $(TARGET_OUT_INTERMEDIATES)/NOTICE_PRODUCT.txt
-target_product_notice_file_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE_PRODUCT.xml
 target_product_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE_PRODUCT.xml.gz
 installed_product_notice_xml_gz := $(TARGET_OUT_PRODUCT)/etc/NOTICE.xml.gz
 
 target_system_ext_notice_file_txt := $(TARGET_OUT_INTERMEDIATES)/NOTICE_SYSTEM_EXT.txt
-target_system_ext_notice_file_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE_SYSTEM_EXT.xml
 target_system_ext_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE_SYSTEM_EXT.xml.gz
 installed_system_ext_notice_xml_gz := $(TARGET_OUT_SYSTEM_EXT)/etc/NOTICE.xml.gz
 
 target_odm_notice_file_txt := $(TARGET_OUT_INTERMEDIATES)/NOTICE_ODM.txt
-target_odm_notice_file_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE_ODM.xml
 target_odm_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE_ODM.xml.gz
 installed_odm_notice_xml_gz := $(TARGET_OUT_ODM)/etc/NOTICE.xml.gz
 
 target_vendor_dlkm_notice_file_txt := $(TARGET_OUT_INTERMEDIATES)/NOTICE_VENDOR_DLKM.txt
-target_vendor_dlkm_notice_file_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE_VENDOR_DLKM.xml
 target_vendor_dlkm_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE_VENDOR_DLKM.xml.gz
 installed_vendor_dlkm_notice_xml_gz := $(TARGET_OUT_VENDOR_DLKM)/etc/NOTICE.xml.gz
 
 target_odm_dlkm_notice_file_txt := $(TARGET_OUT_INTERMEDIATES)/NOTICE_ODM_DLKM.txt
-target_odm_dlkm_notice_file_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE_ODM_DLKM.xml
 target_odm_dlkm_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE_ODM_DLKM.xml.gz
 installed_odm_dlkm_notice_xml_gz := $(TARGET_OUT_ODM_DLKM)/etc/NOTICE.xml.gz
 
 target_system_dlkm_notice_file_txt := $(TARGET_OUT_INTERMEDIATES)/NOTICE_SYSTEM_DLKM.txt
-target_system_dlkm_notice_file_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE_SYSTEM_DLKM.xml
 target_system_dlkm_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE_SYSTEM_DLKM.xml.gz
 installed_system_dlkm_notice_xml_gz := $(TARGET_OUT_SYSTEM_DLKM)/etc/NOTICE.xml.gz
 
@@ -1508,129 +1606,6 @@ system_xml_directories := xml_system
 system_notice_file_message := "Notices for files contained in the system filesystem image in this directory:"
 endif
 
-$(eval $(call combine-notice-files, $(system_xml_directories), \
-	        $(target_notice_file_txt), \
-	        $(target_notice_file_xml), \
-	        $(system_notice_file_message), \
-	        $(TARGET_OUT_NOTICE_FILES), \
-	        $(license_modules_system), \
-	        $(exclude_target_dirs)))
-$(eval $(call combine-notice-files, xml_excluded_system_product_odm_vendor_dlkm_odm_dlkm, \
-	        $(target_vendor_notice_file_txt), \
-	        $(target_vendor_notice_file_xml), \
-	        "Notices for files contained in all filesystem images except system/system_ext/product/odm/vendor_dlkm/odm_dlkm in this directory:", \
-	        $(TARGET_OUT_NOTICE_FILES), \
-	        $(license_modules_vendor), \
-	        $(exclude_target_dirs)))
-$(eval $(call combine-notice-files, xml_product, \
-	        $(target_product_notice_file_txt), \
-	        $(target_product_notice_file_xml), \
-	        "Notices for files contained in the product filesystem image in this directory:", \
-	        $(TARGET_OUT_NOTICE_FILES), \
-	        $(license_modules_product), \
-	        $(exclude_target_dirs)))
-$(eval $(call combine-notice-files, xml_system_ext, \
-	        $(target_system_ext_notice_file_txt), \
-	        $(target_system_ext_notice_file_xml), \
-	        "Notices for files contained in the system_ext filesystem image in this directory:", \
-	        $(TARGET_OUT_NOTICE_FILES), \
-	        $(license_modules_system_ext), \
-	        $(exclude_target_dirs)))
-$(eval $(call combine-notice-files, xml_odm, \
-	        $(target_odm_notice_file_txt), \
-	        $(target_odm_notice_file_xml), \
-	        "Notices for files contained in the odm filesystem image in this directory:", \
-	        $(TARGET_OUT_NOTICE_FILES), \
-	        $(license_modules_odm), \
-	        $(exclude_target_dirs)))
-$(eval $(call combine-notice-files, xml_vendor_dlkm, \
-	        $(target_vendor_dlkm_notice_file_txt), \
-	        $(target_vendor_dlkm_notice_file_xml), \
-	        "Notices for files contained in the vendor_dlkm filesystem image in this directory:", \
-	        $(TARGET_OUT_NOTICE_FILES), \
-	        $(license_modules_vendor_dlkm), \
-	        $(exclude_target_dirs)))
-$(eval $(call combine-notice-files, xml_odm_dlkm, \
-	        $(target_odm_dlkm_notice_file_txt), \
-	        $(target_odm_dlkm_notice_file_xml), \
-	        "Notices for files contained in the odm_dlkm filesystem image in this directory:", \
-	        $(TARGET_OUT_NOTICE_FILES), \
-	        $(license_modules_odm_dlkm), \
-	        $(exclude_target_dirs)))
-$(eval $(call combine-notice-files, xml_system_dlkm, \
-	        $(target_system_dlkm_notice_file_txt), \
-	        $(target_system_dlkm_notice_file_xml), \
-	        "Notices for files contained in the system_dlkm filesystem image in this directory:", \
-	        $(TARGET_OUT_NOTICE_FILES), \
-	        $(license_modules_system_dlkm), \
-	        $(exclude_target_dirs)))
-
-$(target_notice_file_xml_gz): $(target_notice_file_xml) | $(MINIGZIP)
-	$(hide) $(MINIGZIP) -9 < $< > $@
-$(target_vendor_notice_file_xml_gz): $(target_vendor_notice_file_xml) | $(MINIGZIP)
-	$(hide) $(MINIGZIP) -9 < $< > $@
-$(target_product_notice_file_xml_gz): $(target_product_notice_file_xml) | $(MINIGZIP)
-	$(hide) $(MINIGZIP) -9 < $< > $@
-$(target_system_ext_notice_file_xml_gz): $(target_system_ext_notice_file_xml) | $(MINIGZIP)
-	$(hide) $(MINIGZIP) -9 < $< > $@
-$(target_odm_notice_file_xml_gz): $(target_odm_notice_file_xml) | $(MINIGZIP)
-	$(hide) $(MINIGZIP) -9 < $< > $@
-$(target_vendor_dlkm_notice_file_xml_gz): $(target_vendor_dlkm_notice_file_xml) | $(MINIGZIP)
-	$(hide) $(MINIGZIP) -9 < $< > $@
-$(target_odm_dlkm_notice_file_xml_gz): $(target_odm_dlkm_notice_file_xml) | $(MINIGZIP)
-	$(hide) $(MINIGZIP) -9 < $< > $@
-$(target_system_dlkm_notice_file_xml_gz): $(target_system_dlkm_notice_file_xml) | $(MINIGZIP)
-	$(hide) $(MINIGZIP) -9 < $< > $@
-$(installed_notice_html_or_xml_gz): $(target_notice_file_xml_gz)
-	$(copy-file-to-target)
-$(installed_vendor_notice_xml_gz): $(target_vendor_notice_file_xml_gz)
-	$(copy-file-to-target)
-$(installed_product_notice_xml_gz): $(target_product_notice_file_xml_gz)
-	$(copy-file-to-target)
-$(installed_system_ext_notice_xml_gz): $(target_system_ext_notice_file_xml_gz)
-	$(copy-file-to-target)
-$(installed_odm_notice_xml_gz): $(target_odm_notice_file_xml_gz)
-	$(copy-file-to-target)
-$(installed_vendor_dlkm_notice_xml_gz): $(target_vendor_dlkm_notice_file_xml_gz)
-	$(copy-file-to-target)
-$(installed_odm_dlkm_notice_xml_gz): $(target_odm_dlkm_notice_file_xml_gz)
-	$(copy-file-to-target)
-$(installed_system_dlkm_notice_xml_gz): $(target_system_dlkm_notice_file_xml_gz)
-	$(copy-file-to-target)
-
-$(call declare-0p-target,$(target_notice_file_xml))
-$(call declare-0p-target,$(target_notice_file_xml_gz))
-$(call declare-0p-target,$(target_vendor_notice_file_xml))
-$(call declare-0p-target,$(target_vendor_notice_file_xml_gz))
-$(call declare-0p-target,$(target_product_notice_file_xml))
-$(call declare-0p-target,$(target_product_notice_file_xml_gz))
-$(call declare-0p-target,$(target_system_ext_notice_file_xml))
-$(call declare-0p-target,$(target_system_ext_notice_file_xml_gz))
-$(call declare-0p-target,$(target_odm_notice_file_xml))
-$(call declare-0p-target,$(target_odm_notice_file_xml_gz))
-$(call declare-0p-target,$(target_vendor_dlkm_notice_file_xml))
-$(call declare-0p-target,$(target_vendor_dlkm_notice_file_xml_gz))
-$(call declare-0p-target,$(target_odm_dlkm_notice_file_xml))
-$(call declare-0p-target,$(target_odm_dlkm_notice_file_xml_gz))
-$(call declare-0p-target,$(target_system_dlkm_notice_file_xml))
-$(call declare-0p-target,$(target_system_dlkm_notice_file_xml_gz))
-$(call declare-0p-target,$(installed_notice_html_or_xml_gz))
-$(call declare-0p-target,$(installed_vendor_notice_xml_gz))
-$(call declare-0p-target,$(installed_product_notice_xml_gz))
-$(call declare-0p-target,$(installed_system_ext_notice_xml_gz))
-$(call declare-0p-target,$(installed_odm_notice_xml_gz))
-$(call declare-0p-target,$(installed_vendor_dlkm_notice_xml_gz))
-$(call declare-0p-target,$(installed_odm_dlkm_notice_xml_gz))
-$(call declare-0p-target,$(installed_sysetm_dlkm_notice_xml_gz))
-
-ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)
-ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_notice_xml_gz)
-ALL_DEFAULT_INSTALLED_MODULES += $(installed_product_notice_xml_gz)
-ALL_DEFAULT_INSTALLED_MODULES += $(installed_system_ext_notice_xml_gz)
-ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_notice_xml_gz)
-ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_dlkm_notice_xml_gz)
-ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_dlkm_notice_xml_gz)
-ALL_DEFAULT_INSTALLED_MODULES += $(installed_system_dlkm_notice_xml_gz)
 endif # PRODUCT_NOTICE_SPLIT
 
 ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)
@@ -1642,6 +1617,9 @@ endif  # TARGET_BUILD_APPS
 # then be in the right directory for the find in combine-notice-files to work.
 $(eval $(call copy-one-file,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,$(kernel_notice_file)))
 
+# No matter where it gets copied from, a copied linux kernel is licensed under "GPL 2.0 only"
+$(eval $(call declare-copy-files-license-metadata,,:kernel,SPDX-license-identifier-GPL-2.0-only,notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,))
+
 $(eval $(call copy-one-file,$(BUILD_SYSTEM)/WINPTHREADS_COPYING,$(winpthreads_notice_file)))
 
 
@@ -2007,6 +1985,8 @@ INTERNAL_RECOVERYIMAGE_FILES := $(filter $(TARGET_RECOVERY_OUT)/%, \
 INSTALLED_FILES_FILE_RECOVERY := $(PRODUCT_OUT)/installed-files-recovery.txt
 INSTALLED_FILES_JSON_RECOVERY := $(INSTALLED_FILES_FILE_RECOVERY:.txt=.json)
 
+$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_RECOVERY)))
+
 ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
 INSTALLED_BOOTIMAGE_TARGET := $(BUILT_BOOTIMAGE_TARGET)
 endif
@@ -2420,6 +2400,11 @@ $(foreach b,$(INSTALLED_BOOTIMAGE_TARGET), $(eval $(call add-dependency,$(b),$(c
 $(INSTALLED_BOOTIMAGE_TARGET): $(recoveryimage-deps)
 	$(call pretty,"Target boot image from recovery: $@")
 	$(call build-recoveryimage-target, $@, $(PRODUCT_OUT)/$(subst .img,,$(subst boot,kernel,$(notdir $@))))
+
+$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(recoveryimage-deps),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)
 endif # BOARD_USES_RECOVERY_AS_BOOT
 
 $(INSTALLED_RECOVERYIMAGE_TARGET): $(recoveryimage-deps)
@@ -2433,6 +2418,12 @@ $(RECOVERY_RESOURCE_ZIP): $(INSTALLED_RECOVERYIMAGE_TARGET) | $(ZIPTIME)
 	$(remove-timestamps-from-package)
 endif
 
+
+$(call declare-1p-container,$(INSTALLED_RECOVERYIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_RECOVERYIMAGE_TARGET),$(recoveryimage-deps),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_RECOVERYIMAGE_TARGET)
+
 .PHONY: recoveryimage-nodeps
 recoveryimage-nodeps:
 	@echo "make $@: ignoring dependencies"
@@ -2495,6 +2486,8 @@ $(INSTALLED_FILES_FILE_DEBUG_RAMDISK): $(FILESLIST) $(FILESLIST_UTIL)
 	$(FILESLIST) $(INTERNAL_DEBUG_RAMDISK_SRC_DIRS) > $(@:.txt=.json)
 	$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@
 
+$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_DEBUG_RAMDISK)))
+
 ifdef BUILDING_DEBUG_BOOT_IMAGE
 
 # -----------------------------------------------------------------
@@ -2511,6 +2504,11 @@ $(INSTALLED_DEBUG_RAMDISK_TARGET): $(MKBOOTFS) | $(COMPRESSION_COMMAND_DEPS)
 	$(hide) mkdir -p $(dir $@)
 	$(MKBOOTFS) -d $(TARGET_OUT) $(INTERNAL_DEBUG_RAMDISK_SRC_DIRS) | $(COMPRESSION_COMMAND) > $@
 
+$(call declare-1p-container,$(INSTALLED_DEBUG_RAMDISK_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_DEBUG_RAMDISK_TARGET),$(INSTALLED_RAMDISK_TARGET),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_DEBUG_RAMDISK_TARGET)
+
 .PHONY: ramdisk_debug-nodeps
 ramdisk_debug-nodeps: $(MKBOOTFS) | $(COMPRESSION_COMMAND_DEPS)
 	@echo "make $@: ignoring dependencies"
@@ -2573,6 +2571,11 @@ $(INSTALLED_DEBUG_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INSTALLED_BOOTIMAGE_TARGET)
 	$(call pretty,"Target boot debug image: $@")
 	$(call build-debug-bootimage-target, $@)
 
+$(call declare-1p-container,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),$(INSTALLED_BOOTIMAGE_TARGET),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_DEBUG_BOOTIMAGE_TARGET)
+
 .PHONY: bootimage_debug-nodeps
 bootimage_debug-nodeps: $(MKBOOTIMG) $(AVBTOOL)
 	echo "make $@: ignoring dependencies"
@@ -2617,6 +2620,8 @@ $(INSTALLED_FILES_FILE_VENDOR_DEBUG_RAMDISK): $(FILESLIST) $(FILESLIST_UTIL)
 	$(FILESLIST) $(INTERNAL_DEBUG_VENDOR_RAMDISK_SRC_DIRS) > $(@:.txt=.json)
 	$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@
 
+$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_VENDOR_DEBUG_RAMDISK)))
+
 INTERNAL_VENDOR_DEBUG_RAMDISK_TARGET := $(call intermediates-dir-for,PACKAGING,vendor_boot-debug)/vendor_ramdisk-debug.cpio$(RAMDISK_EXT)
 
 $(INTERNAL_VENDOR_DEBUG_RAMDISK_TARGET): $(INSTALLED_FILES_FILE_VENDOR_DEBUG_RAMDISK)
@@ -2630,6 +2635,11 @@ $(INSTALLED_VENDOR_DEBUG_RAMDISK_TARGET): $(INTERNAL_VENDOR_DEBUG_RAMDISK_TARGET
 	@echo "Target debug vendor ramdisk: $@"
 	$(copy-file-to-target)
 
+$(call declare-1p-container,$(INSTALLED_VENDOR_DEBUG_RAMDISK_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_VENDOR_DEBUG_RAMDISK_TARGET),$(INTERNAL_VENDOR_DEBUG_RAMDISK_TARGET),$(PRODUCT_OUT)/:/)
+
+VENDOR_NOTICE_DEPS += $(INSTALLED_VENDOR_DEBUG_RAMDISK_TARGET)
+
 # -----------------------------------------------------------------
 # vendor_boot-debug.img.
 INSTALLED_VENDOR_DEBUG_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/vendor_boot-debug.img
@@ -2660,6 +2670,11 @@ $(INSTALLED_VENDOR_DEBUG_BOOTIMAGE_TARGET): $(INTERNAL_VENDOR_RAMDISK_FRAGMENT_T
 	$(call assert-max-image-size,$@,$(BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE))
 	$(if $(BOARD_AVB_VENDOR_BOOT_KEY_PATH),$(call test-key-sign-vendor-bootimage,$@))
 
+$(call declare-1p-container,$(INSTALLED_VENDOR_DEBUG_BOOTIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_VENDOR_DEBUG_BOOTIMAGE_TARGET),$(INTERNAL_VENDOR_DEBUG_RAMDISK_TARGET),$(PRODUCT_OUT)/:/)
+
+VENDOR_NOTICE_DEPS += $(INSTALLED_VENDOR_DEBUG_BOOTIMAGE_TARGET)
+
 endif # BUILDING_DEBUG_VENDOR_BOOT_IMAGE
 
 # Appends a few test harness specific properties into the adb_debug.prop.
@@ -2708,6 +2723,11 @@ $(INSTALLED_TEST_HARNESS_RAMDISK_TARGET): $(MKBOOTFS) | $(COMPRESSION_COMMAND_DE
 	$(hide) mkdir -p $(dir $@)
 	$(MKBOOTFS) -d $(TARGET_OUT) $(INTERNAL_TEST_HARNESS_RAMDISK_SRC_DIRS) | $(COMPRESSION_COMMAND) > $@
 
+$(call declare-1p-container,$(INSTALLED_TEST_HARNESS_RAMDISK_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_TEST_HARNESS_RAMDISK_TARGET),$(INTERNAL_TEST_HARNESS_RAMDISK_SRC_DEPS),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_TEST_HARNESS_RAMDISK_TARGET)
+
 .PHONY: ramdisk_test_harness-nodeps
 ramdisk_test_harness-nodeps: $(MKBOOTFS) | $(COMPRESSION_COMMAND_DEPS)
 	@echo "make $@: ignoring dependencies"
@@ -2752,6 +2772,11 @@ $(INSTALLED_TEST_HARNESS_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INSTALLED_DEBUG_BOOTI
 	$(call pretty,"Target boot test harness image: $@")
 	$(call build-boot-test-harness-target,$@)
 
+$(call declare-1p-container,$(INSTALLED_TEST_HARNESS_BOOTIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_TEST_HARNESS_BOOTIMAGE_TARGET),$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_TEST_HARNESS_BOOTIMAGE_TARGET)
+
 .PHONY: bootimage_test_harness-nodeps
 bootimage_test_harness-nodeps: $(MKBOOTIMG) $(AVBTOOL)
 	echo "make $@: ignoring dependencies"
@@ -2783,6 +2808,11 @@ $(INSTALLED_VENDOR_TEST_HARNESS_RAMDISK_TARGET): $(INTERNAL_VENDOR_TEST_HARNESS_
 	@echo "Target test harness vendor ramdisk: $@"
 	$(copy-file-to-target)
 
+$(call declare-1p-container,$(INSTALLED_VENDOR_TEST_HARNESS_RAMDISK_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_VENDOR_TEST_HARNESS_RAMDISK_TARGET),$(INTERNAL_VENDOR_TEST_HARNESS_RAMDISK_TARGET),$(PRODUCT_OUT)/:/)
+
+VENDOR_NOTICE_DEPS += $(INSTALLED_VENDOR_TEST_HARNESS_RAMDISK_TARGET)
+
 # -----------------------------------------------------------------
 # vendor_boot-test-harness.img.
 INSTALLED_VENDOR_TEST_HARNESS_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/vendor_boot-test-harness.img
@@ -2800,6 +2830,11 @@ $(INSTALLED_VENDOR_TEST_HARNESS_BOOTIMAGE_TARGET): $(INTERNAL_VENDOR_RAMDISK_FRA
 	$(call assert-max-image-size,$@,$(BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE))
 	$(if $(BOARD_AVB_VENDOR_BOOT_KEY_PATH),$(call test-key-sign-vendor-bootimage,$@))
 
+$(call declare-1p-container,$(INSTALLED_VENDOR_TEST_HARNESS_BOOTIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_VENDOR_TEST_HARNESS_BOOTIMAGE_TARGET),$(INTERNAL_VENDOR_TEST_HARNESS_RAMDISK_TARGET),$(PRODUCT_OUT)/:/)
+
+VENDOR_NOTICE_DEPS += $(INSTALLED_VENDOR_TEST_HARNESS_BOOTIMAGE_TARGET)
+
 endif # BUILDING_DEBUG_VENDOR_BOOT_IMAGE
 
 endif # BUILDING_DEBUG_BOOT_IMAGE || BUILDING_DEBUG_VENDOR_BOOT_IMAGE
@@ -2960,6 +2995,8 @@ $(INSTALLED_FILES_FILE): $(FULL_SYSTEMIMAGE_DEPS) $(FILESLIST) $(FILESLIST_UTIL)
 	$(FILESLIST) $(TARGET_OUT) > $(@:.txt=.json)
 	$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@
 
+$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE)))
+
 .PHONY: installed-file-list
 installed-file-list: $(INSTALLED_FILES_FILE)
 
@@ -2992,7 +3029,7 @@ $(BUILT_SYSTEMIMAGE): $(FULL_SYSTEMIMAGE_DEPS) $(INSTALLED_FILES_FILE)
 	$(call build-systemimage-target,$@)
 
 $(call declare-1p-container,$(BUILT_SYSTEMIMAGE),system/extras)
-$(call declare-container-license-deps,$(BUILT_SYSTEMIMAGE),$(FULL_SYSTEMIMAGE_DEPS),$(PRODUCT_OUT)/:)
+$(call declare-container-license-deps,$(BUILT_SYSTEMIMAGE),$(FULL_SYSTEMIMAGE_DEPS),$(PRODUCT_OUT)/:/)
 
 INSTALLED_SYSTEMIMAGE_TARGET := $(PRODUCT_OUT)/system.img
 SYSTEMIMAGE_SOURCE_DIR := $(TARGET_OUT)
@@ -3040,8 +3077,7 @@ $(call declare-container-license-deps,$(INSTALLED_SYSTEMIMAGE_TARGET),$(BUILT_SY
 
 systemimage: $(INSTALLED_SYSTEMIMAGE_TARGET)
 
-.PHONY: systemlicense
-systemlicense: $(call license-metadata-dir)/$(INSTALLED_SYSTEMIMAGE_TARGET).meta_lic reportmissinglicenses
+SYSTEM_NOTICE_DEPS += $(INSTALLED_SYSTEMIMAGE_TARGET)
 
 .PHONY: systemimage-nodeps snod
 systemimage-nodeps snod: $(filter-out systemimage-nodeps snod,$(MAKECMDGOALS)) \
@@ -3098,6 +3134,11 @@ INSTALLED_USERDATAIMAGE_TARGET_DEPS := \
 $(INSTALLED_USERDATAIMAGE_TARGET): $(INSTALLED_USERDATAIMAGE_TARGET_DEPS)
 	$(build-userdataimage-target)
 
+$(call declare-1p-container,$(INSTALLED_USERDATAIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_USERDATAIMAGE_TARGET),$(INSTALLED_USERDATAIMAGE_TARGET_DEPS),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_USERDATAIMAGE_TARGET)
+
 .PHONY: userdataimage-nodeps
 userdataimage-nodeps: | $(INTERNAL_USERIMAGES_DEPS)
 	$(build-userdataimage-target)
@@ -3145,6 +3186,11 @@ $(BUILT_BPTJSON_TARGET): $(INSTALLED_BPTIMAGE_TARGET)
 $(INSTALLED_BPTIMAGE_TARGET): $(BPTTOOL) $(BOARD_BPT_INPUT_FILES)
 	$(build-bptimage-target)
 
+$(call declare-1p-container,$(INSTALLED_BPTIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_BPTIMAGE_TARGET),$(BOARD_BPT_INPUT_FILES),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BPTIMAGE_TARGET)
+
 .PHONY: bptimage-nodeps
 bptimage-nodeps:
 	$(build-bptimage-target)
@@ -3178,6 +3224,11 @@ INSTALLED_CACHEIMAGE_TARGET := $(BUILT_CACHEIMAGE_TARGET)
 $(INSTALLED_CACHEIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_CACHEIMAGE_FILES)
 	$(build-cacheimage-target)
 
+$(call declare-1p-container,$(INSTALLED_CACHEIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_CACHEIMAGE_TARGET),$(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_CACHEIMAGE_FILES),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_CACHEIMAGE_TARGET)
+
 .PHONY: cacheimage-nodeps
 cacheimage-nodeps: | $(INTERNAL_USERIMAGES_DEPS)
 	$(build-cacheimage-target)
@@ -3217,6 +3268,8 @@ $(INSTALLED_FILES_FILE_SYSTEMOTHER) : $(INTERNAL_SYSTEMOTHERIMAGE_FILES) $(FILES
 	$(FILESLIST) $(TARGET_OUT_SYSTEM_OTHER) > $(@:.txt=.json)
 	$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@
 
+$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_SYSTEMOTHER)))
+
 # Determines partition size for system_other.img.
 ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true)
 ifneq ($(filter system,$(BOARD_SUPER_PARTITION_BLOCK_DEVICES)),)
@@ -3251,6 +3304,11 @@ ifneq (true,$(SANITIZE_LITE))
 # Only create system_other when not building the second stage of a SANITIZE_LITE build.
 $(INSTALLED_SYSTEMOTHERIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_SYSTEMOTHERIMAGE_FILES) $(INSTALLED_FILES_FILE_SYSTEMOTHER)
 	$(build-systemotherimage-target)
+
+$(call declare-1p-container,$(INSTALLED_SYSTEMOTHERIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_SYSTEMOTHERIMAGE_TARGET),$(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_SYSTEMOTHERIMAGE_FILES),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_SYSTEMOTHERIMAGE_TARGET)
 endif
 
 .PHONY: systemotherimage-nodeps
@@ -3301,6 +3359,8 @@ $(INSTALLED_FILES_FILE_VENDOR) : $(INTERNAL_VENDORIMAGE_FILES) $(FILESLIST) $(FI
 	$(FILESLIST) $(TARGET_OUT_VENDOR) > $(@:.txt=.json)
 	$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@
 
+$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_VENDOR)))
+
 vendorimage_intermediates := \
     $(call intermediates-dir-for,PACKAGING,vendor)
 BUILT_VENDORIMAGE_TARGET := $(PRODUCT_OUT)/vendor.img
@@ -3325,6 +3385,11 @@ $(INSTALLED_VENDORIMAGE_TARGET): \
     $(RECOVERY_FROM_BOOT_PATCH)
 	$(build-vendorimage-target)
 
+VENDOR_NOTICE_DEPS += $(INSTALLED_VENDORIMAGE_TARGET)
+
+$(call declare-1p-container,$(INSTALLED_VENDORIMAGE_TARGET),vendor)
+$(call declare-container-license-deps,$(INSTALLED_VENDORIMAGE_TARGET),$(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_VENDORIMAGE_FILES) $(RECOVERY_FROM_BOOT_PATH),$(PRODUCT_OUT)/:/)
+
 .PHONY: vendorimage-nodeps vnod
 vendorimage-nodeps vnod: | $(INTERNAL_USERIMAGES_DEPS)
 	$(build-vendorimage-target)
@@ -3353,6 +3418,8 @@ $(INSTALLED_FILES_FILE_PRODUCT) : $(INTERNAL_PRODUCTIMAGE_FILES) $(FILESLIST) $(
 	$(FILESLIST) $(TARGET_OUT_PRODUCT) > $(@:.txt=.json)
 	$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@
 
+$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_PRODUCT)))
+
 productimage_intermediates := \
     $(call intermediates-dir-for,PACKAGING,product)
 BUILT_PRODUCTIMAGE_TARGET := $(PRODUCT_OUT)/product.img
@@ -3376,6 +3443,11 @@ $(INSTALLED_PRODUCTIMAGE_TARGET): \
     $(INSTALLED_FILES_FILE_PRODUCT)
 	$(build-productimage-target)
 
+PRODUCT_NOTICE_DEPS += $(INSTALLED_PRODUCTIMAGE_TARGET)
+
+$(call declare-1p-container,$(INSTALLED_PRODUCTIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_PRODUCTIMAGE_TARGET),$(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_PRODUCTIMAGE_FILES) $(INSTALLED_FILES_FILE_PRODUCT),$(PRODUCT_OUT)/:/)
+
 .PHONY: productimage-nodeps pnod
 productimage-nodeps pnod: | $(INTERNAL_USERIMAGES_DEPS)
 	$(build-productimage-target)
@@ -3404,6 +3476,8 @@ $(INSTALLED_FILES_FILE_SYSTEM_EXT) : $(INTERNAL_SYSTEM_EXTIMAGE_FILES) $(FILESLI
 	$(FILESLIST) $(TARGET_OUT_SYSTEM_EXT) > $(@:.txt=.json)
 	$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@
 
+$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_SYSTEM_EXT)))
+
 system_extimage_intermediates := \
     $(call intermediates-dir-for,PACKAGING,system_ext)
 BUILT_SYSTEM_EXTIMAGE_TARGET := $(PRODUCT_OUT)/system_ext.img
@@ -3429,6 +3503,11 @@ $(INSTALLED_SYSTEM_EXTIMAGE_TARGET): \
     $(INSTALLED_FILES_FILE_SYSTEM_EXT)
 	$(build-system_extimage-target)
 
+SYSTEM_EXT_NOTICE_DEPS += $(INSTALLED_SYSTEM_EXTIMAGE_TARGET)
+
+$(call declare-1p-container,$(INSTALLED_SYSTEM_EXTIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_SYSTEM_EXTIMAGE_TARGET),$(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_SYSTEM_EXTIMAGE_FILES) $(INSTALLED_FILES_FILE_SYSTEM_EXT),$(PRODUCT_OUT)/:/)
+
 .PHONY: systemextimage-nodeps senod
 systemextimage-nodeps senod: | $(INTERNAL_USERIMAGES_DEPS)
 	$(build-system_extimage-target)
@@ -3475,6 +3554,8 @@ $(INSTALLED_FILES_FILE_ODM) : $(INTERNAL_ODMIMAGE_FILES) $(FILESLIST) $(FILESLIS
 	$(FILESLIST) $(TARGET_OUT_ODM) > $(@:.txt=.json)
 	$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@
 
+$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_ODM)))
+
 odmimage_intermediates := \
     $(call intermediates-dir-for,PACKAGING,odm)
 BUILT_ODMIMAGE_TARGET := $(PRODUCT_OUT)/odm.img
@@ -3499,6 +3580,11 @@ $(INSTALLED_ODMIMAGE_TARGET): \
     $(INSTALLED_FILES_FILE_ODM)
 	$(build-odmimage-target)
 
+ODM_NOTICE_DEPS += $(INSTALLED_ODMIMAGE_TARGET)
+
+$(call declare-1p-container,$(INSTALLED_ODMIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_ODMIMAGE_TARGET),$(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_ODMIMAGE_FILES) $(INSTALLED_FILES_FILE_ODM),$(PRODUCT_OUT)/:/)
+
 .PHONY: odmimage-nodeps onod
 odmimage-nodeps onod: | $(INTERNAL_USERIMAGES_DEPS)
 	$(build-odmimage-target)
@@ -3527,6 +3613,8 @@ $(INSTALLED_FILES_FILE_VENDOR_DLKM) : $(INTERNAL_VENDOR_DLKMIMAGE_FILES) $(FILES
 	$(FILESLIST) $(TARGET_OUT_VENDOR_DLKM) > $(@:.txt=.json)
 	$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@
 
+$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_VENDOR_DLKM)))
+
 vendor_dlkmimage_intermediates := \
     $(call intermediates-dir-for,PACKAGING,vendor_dlkm)
 BUILT_VENDOR_DLKMIMAGE_TARGET := $(PRODUCT_OUT)/vendor_dlkm.img
@@ -3551,6 +3639,11 @@ $(INSTALLED_VENDOR_DLKMIMAGE_TARGET): \
     $(INSTALLED_FILES_FILE_VENDOR_DLKM)
 	$(build-vendor_dlkmimage-target)
 
+VENDOR_DLKM_NOTICE_DEPS += $(INSTALLED_VENDOR_DLKMIMAGE_TARGET)
+
+$(call declare-1p-container,$(INSTALLED_VENDOR_DLKMIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_VENDOR_DLKMIMAGE_TARGET),$(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_VENDOR_DLKMIMAGE_FILES) $(INSTALLED_FILES_FILE_VENDOR_DLKM),$(PRODUCT_OUT)/:/)
+
 .PHONY: vendor_dlkmimage-nodeps vdnod
 vendor_dlkmimage-nodeps vdnod: | $(INTERNAL_USERIMAGES_DEPS)
 	$(build-vendor_dlkmimage-target)
@@ -3579,6 +3672,8 @@ $(INSTALLED_FILES_FILE_ODM_DLKM) : $(INTERNAL_ODM_DLKMIMAGE_FILES) $(FILESLIST)
 	$(FILESLIST) $(TARGET_OUT_ODM_DLKM) > $(@:.txt=.json)
 	$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@
 
+$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_ODM_DLKM)))
+
 odm_dlkmimage_intermediates := \
     $(call intermediates-dir-for,PACKAGING,odm_dlkm)
 BUILT_ODM_DLKMIMAGE_TARGET := $(PRODUCT_OUT)/odm_dlkm.img
@@ -3603,6 +3698,11 @@ $(INSTALLED_ODM_DLKMIMAGE_TARGET): \
     $(INSTALLED_FILES_FILE_ODM_DLKM)
 	$(build-odm_dlkmimage-target)
 
+ODM_DLKM_NOTICE_DEPS += $(INSTALLED_ODM_DLKMIMAGE_TARGET)
+
+$(call declare-1p-container,$(INSTALLED_ODM_DLKMIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_ODM_DLKMIMAGE_TARGET),$(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_ODM_DLKMIMAGE_FILES) $(INSTALLED_FILES_FILE_ODM_DLKM),$(PRODUCT_OUT)/:/)
+
 .PHONY: odm_dlkmimage-nodeps odnod
 odm_dlkmimage-nodeps odnod: | $(INTERNAL_USERIMAGES_DEPS)
 	$(build-odm_dlkmimage-target)
@@ -3634,6 +3734,8 @@ $(INSTALLED_FILES_FILE_SYSTEM_DLKM): $(INTERNAL_SYSTEM_DLKMIMAGE_FILES) $(FILESL
 	$(FILESLIST) $(TARGET_OUT_SYSTEM_DLKM) > $(@:.txt=.json)
 	$(FILESLIST_UTIL) -c $(@:.txt=.json) > $@
 
+$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_SYSTEM_DLKM)))
+
 system_dlkmimage_intermediates := \
     $(call intermediates-dir-for,PACKAGING,system_dlkm)
 BUILT_SYSTEM_DLKMIMAGE_TARGET := $(PRODUCT_OUT)/system_dlkm.img
@@ -3682,6 +3784,11 @@ $(INSTALLED_DTBOIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE) $(AVBTOOL) $(BOARD_AV
 	    $(call get-partition-size-argument,$(BOARD_DTBOIMG_PARTITION_SIZE)) \
 	    --partition_name dtbo $(INTERNAL_AVB_DTBO_SIGNING_ARGS) \
 	    $(BOARD_AVB_DTBO_ADD_HASH_FOOTER_ARGS)
+
+$(call declare-1p-container,$(INSTALLED_DTBOIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_DTBOIMAGE_TARGET),$(BOARD_PREBUILT_DTBOIMAGE),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_DTBOIMAGE_TARGET)
 else
 $(INSTALLED_DTBOIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE)
 	cp $(BOARD_PREBUILT_DTBOIMAGE) $@
@@ -3711,6 +3818,11 @@ $(INSTALLED_PVMFWIMAGE_TARGET): $(PREBUILT_PVMFWIMAGE_TARGET) $(AVBTOOL) $(BOARD
 	    $(call get-partition-size-argument,$(BOARD_PVMFWIMAGE_PARTITION_SIZE)) \
 	    --partition_name pvmfw $(INTERNAL_AVB_PVMFW_SIGNING_ARGS) \
 	    $(BOARD_AVB_PVMFW_ADD_HASH_FOOTER_ARGS)
+
+$(call declare-1p-container,$(INSTALLED_PVMFWIMAGE_TARGET),)
+$(call declare-container-license-deps,$(INSTALLED_PVMFWIMAGE_TARGET),$(PREBUILT_PVMFWIMAGE_TARGET),$(PRODUCT_OUT)/:/)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_PVMFWIMAGE_TARGET)
 else
 $(eval $(call copy-one-file,$(PREBUILT_PVMFWIMAGE_TARGET),$(INSTALLED_PVMFWIMAGE_TARGET)))
 endif
@@ -3798,6 +3910,8 @@ $(INSTALLED_PRODUCT_SYSTEM_OTHER_AVBKEY_TARGET): $(AVBTOOL) $(BOARD_AVB_SYSTEM_O
 	@mkdir -p $(dir $@)
 	$(AVBTOOL) extract_public_key --key $(BOARD_AVB_SYSTEM_OTHER_KEY_PATH) --output $@
 
+$(eval $(call declare-0p-target,$(INSTALLED_PRODUCT_SYSTEM_OTHER_AVBKEY_TARGET),))
+
 ifndef BOARD_AVB_SYSTEM_OTHER_ROLLBACK_INDEX
 BOARD_AVB_SYSTEM_OTHER_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
 endif
@@ -4204,6 +4318,10 @@ $(INSTALLED_VBMETA_SYSTEMIMAGE_TARGET): \
 	    $(call images-for-partitions,$(BOARD_AVB_VBMETA_SYSTEM)) \
 	    $(BOARD_AVB_VBMETA_SYSTEM_KEY_PATH)
 	$(call build-chained-vbmeta-image,vbmeta_system)
+
+$(call declare-1p-container,$(INSTALLED_VBMETA_SYSTEMIMAGE_TARGET),)
+
+SYSTEM_NOTICE_DEPS += $(INSTALLED_VBMETA_SYSTEMIMAGE_TARGET)
 endif
 endif # BUILDING_SYSTEM_IMAGE
 
@@ -4214,6 +4332,10 @@ $(INSTALLED_VBMETA_VENDORIMAGE_TARGET): \
 	    $(call images-for-partitions,$(BOARD_AVB_VBMETA_VENDOR)) \
 	    $(BOARD_AVB_VBMETA_VENDOR_KEY_PATH)
 	$(call build-chained-vbmeta-image,vbmeta_vendor)
+
+$(call declare-1p-container,$(INSTALLED_VBMETA_VENDORIMAGE_TARGET),)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_VBMETA_VENDORIMAGE_TARGET)
 endif
 
 define build-vbmetaimage-target
@@ -4257,6 +4379,10 @@ $(INSTALLED_VBMETAIMAGE_TARGET): \
 	    $(BOARD_AVB_KEY_PATH)
 	$(build-vbmetaimage-target)
 
+$(call declare-1p-container,$(INSTALLED_VBMETAIMAGE_TARGET),)
+
+UNMOUNTED_NOTICE_DEPS += $(INSTALLED_VBMETAIMAGE_TARGET)
+
 .PHONY: vbmetaimage-nodeps
 vbmetaimage-nodeps: PRIVATE_AVB_VBMETA_SIGNING_ARGS := \
     --algorithm $(BOARD_AVB_ALGORITHM) --key $(BOARD_AVB_KEY_PATH)
@@ -5007,6 +5133,8 @@ ifeq ($(TARGET_FLATTEN_APEX),false)
 	$(hide) echo "target_flatten_apex=false" >> $@
 endif
 
+$(call declare-0p-target,$(INSTALLED_MISC_INFO_TARGET))
+
 .PHONY: misc_info
 misc_info: $(INSTALLED_MISC_INFO_TARGET)
 
@@ -6148,6 +6276,8 @@ $(INSTALLED_SUPERIMAGE_EMPTY_TARGET): $(LPMAKE) $(BUILD_SUPER_IMAGE)
 
 $(call dist-for-goals,dist_files,$(INSTALLED_SUPERIMAGE_EMPTY_TARGET))
 
+$(call declare-0p-target,$(INSTALLED_SUPERIMAGE_EMPTY_TARGET))
+
 endif # BUILDING_SUPER_EMPTY_IMAGE
 
 
@@ -6516,3 +6646,11 @@ $(call dist-for-goals,haiku-rust,$(SOONG_RUST_FUZZ_PACKAGING_ARCH_MODULES))
 # -----------------------------------------------------------------
 # Extract platform fonts used in Layoutlib
 include $(BUILD_SYSTEM)/layoutlib_fonts.mk
+
+
+# -----------------------------------------------------------------
+# OS Licensing
+
+include $(BUILD_SYSTEM)/os_licensing.mk
+
+# When appending new code to this file, please insert above OS Licensing
diff --git a/core/definitions.mk b/core/definitions.mk
index 19b2fc97d2..1af5fe114f 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -580,9 +580,12 @@ endef
 # License metadata targets corresponding to targets in $(1)
 ###########################################################
 define corresponding-license-metadata
-$(strip $(eval _dir := $(call license-metadata-dir)) \
-$(foreach target, $(sort $(1)), $(_dir)/$(target).meta_lic) \
-)
+$(strip $(foreach target, $(sort $(1)), \
+  $(if $(strip $(ALL_MODULES.$(target).META_LIC)), \
+    $(ALL_MODULES.$(target).META_LIC), \
+    $(if $(strip $(ALL_TARGETS.$(target).META_LIC)), \
+      $(ALL_TARGETS.$(target).META_LIC), \
+      $(call license-metadata-dir)/$(target).meta_lic))))
 endef
 
 ###########################################################
@@ -868,9 +871,11 @@ endef
 define report-missing-licenses-rule
 .PHONY: reportmissinglicenses
 reportmissinglicenses: PRIVATE_NON_MODULES:=$(sort $(NON_MODULES_WITHOUT_LICENSE_METADATA))
+reportmissinglicenses: PRIVATE_COPIED_FILES:=$(sort $(filter $(NON_MODULES_WITHOUT_LICENSE_METADATA),$(foreach _pair,$(PRODUCT_COPY_FILES), $(PRODUCT_OUT)/$(call word-colon,2,$(_pair)))))
 reportmissinglicenses:
 	@echo Reporting $$(words $$(PRIVATE_NON_MODULES)) targets without license metadata
 	$$(foreach t,$$(PRIVATE_NON_MODULES),if ! [ -h $$(t) ]; then echo No license metadata for $$(t) >&2; fi;)
+	$$(foreach t,$$(PRIVATE_COPIED_FILES),if ! [ -h $$(t) ]; then echo No license metadata for copied file $$(t) >&2; fi;)
 
 endef
 
diff --git a/core/os_licensing.mk b/core/os_licensing.mk
new file mode 100644
index 0000000000..8ab53a527c
--- /dev/null
+++ b/core/os_licensing.mk
@@ -0,0 +1,171 @@
+.PHONY: systemlicense
+systemlicense: $(call corresponding-license-metadata, $(SYSTEM_NOTICE_DEPS)) reportmissinglicenses
+
+ifneq (,$(SYSTEM_NOTICE_DEPS))
+
+SYSTEM_NOTICE_DEPS += $(UNMOUNTED_NOTICE_DEPS)
+
+ifneq ($(PRODUCT_NOTICE_SPLIT),true)
+$(eval $(call html-notice-rule,$(target_notice_file_html_gz),"System image",$(system_notice_file_message),$(SYSTEM_NOTICE_DEPS),$(SYSTEM_NOTICE_DEPS)))
+
+$(installed_notice_html_or_xml_gz): $(target_notice_file_html_gz)
+	$(copy-file-to-target)
+else
+$(eval $(call xml-notice-rule,$(target_notice_file_xml_gz),"System image",$(system_notice_file_message),$(SYSTEM_NOTICE_DEPS),$(SYSTEM_NOTICE_DEPS)))
+
+$(eval $(call text-notice-rule,$(target_notice_file_txt),"System image",$(system_notice_file_message),$(SYSTEM_NOTICE_DEPS),$(SYSTEM_NOTICE_DEPS)))
+
+$(installed_notice_html_or_xml_gz): $(target_notice_file_xml_gz)
+	$(copy-file-to-target)
+endif
+
+$(call declare-0p-target,$(target_notice_file_xml_gz))
+$(call declare-0p-target,$(installed_notice_html_or_xml_gz))
+ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz)
+endif
+
+.PHONY: vendorlicense
+vendorlicense: $(call corresponding-license-metadata, $(VENDOR_NOTICE_DEPS)) reportmissinglicenses
+
+ifneq (,$(VENDOR_NOTICE_DEPS))
+
+VENDOR_NOTICE_DEPS += $(UNMOUNTED_NOTICE_DEPS)
+
+$(eval $(call text-notice-rule,$(target_vendor_notice_file_txt),"Vendor image", \
+         "Notices for files contained in all filesystem images except system/system_ext/product/odm/vendor_dlkm/odm_dlkm in this directory:", \
+         $(VENDOR_NOTICE_DEPS)))
+
+$(eval $(call xml-notice-rule,$(target_vendor_notice_file_xml_gz),"Vendor image", \
+         "Notices for files contained in all filesystem images except system/system_ext/product/odm/vendor_dlkm/odm_dlkm in this directory:", \
+         $(VENDOR_NOTICE_DEPS)))
+
+$(installed_vendor_notice_xml_gz): $(target_vendor_notice_file_xml_gz)
+	$(copy-file-to-target)
+
+$(call declare-0p-target,$(target_vendor_notice_file_xml_gz))
+$(call declare-0p-target,$(installed_vendor_notice_xml_gz))
+ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_notice_xml_gz)
+endif
+
+.PHONY: odmlicense
+odmlicense: $(call corresponding-license-metadata, $(ODM_NOTICE_DEPS)) reportmissinglicenses
+
+ifneq (,$(ODM_NOTICE_DEPS))
+$(eval $(call text-notice-rule,$(target_odm_notice_file_txt),"ODM filesystem image", \
+         "Notices for files contained in the odm filesystem image in this directory:", \
+         $(ODM_NOTICE_DEPS)))
+
+$(eval $(call xml-notice-rule,$(target_odm_notice_file_xml_gz),"ODM filesystem image", \
+         "Notices for files contained in the odm filesystem image in this directory:", \
+         $(ODM_NOTICE_DEPS)))
+
+$(installed_odm_notice_xml_gz): $(target_odm_notice_file_xml_gz)
+	$(copy-file-to-target)
+
+$(call declare-0p-target,$(target_odm_notice_file_xml_gz))
+$(call declare-0p-target,$(installed_odm_notice_xml_gz))
+ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_notice_xml_gz)
+endif
+
+.PHONY: oemlicense
+oemlicense: $(call corresponding-license-metadata, $(OEM_NOTICE_DEPS)) reportmissinglicenses
+
+.PHONY: productlicense
+productlicense: $(call corresponding-license-metadata, $(PRODUCT_NOTICE_DEPS)) reportmissinglicenses
+
+ifneq (,$(PRODUCT_NOTICE_DEPS))
+$(eval $(call text-notice-rule,$(target_product_notice_file_txt),"Product image", \
+         "Notices for files contained in the product filesystem image in this directory:", \
+         $(PRODUCT_NOTICE_DEPS)))
+
+$(eval $(call xml-notice-rule,$(target_product_notice_file_xml_gz),"Product image", \
+         "Notices for files contained in the product filesystem image in this directory:", \
+         $(PRODUCT_NOTICE_DEPS)))
+
+$(installed_product_notice_xml_gz): $(target_product_notice_file_xml_gz)
+	$(copy-file-to-target)
+
+$(call declare-0p-target,$(target_product_notice_file_xml_gz))
+$(call declare-0p-target,$(installed_product_notice_xml_gz))
+ALL_DEFAULT_INSTALLED_MODULES += $(installed_product_notice_xml_gz)
+endif
+
+.PHONY: systemextlicense
+systemextlicense: $(call corresponding-license-metadata, $(SYSTEM_EXT_NOTICE_DEPS)) reportmissinglicenses
+
+ifneq (,$(SYSTEM_EXT_NOTICE_DEPS))
+$(eval $(call text-notice-rule,$(target_system_ext_notice_file_txt),"System_ext image", \
+         "Notices for files contained in the system_ext filesystem image in this directory:", \
+         $(SYSTEM_EXT_NOTICE_DEPS)))
+
+$(eval $(call xml-notice-rule,$(target_system_ext_notice_file_xml_gz),"System_ext image", \
+         "Notices for files contained in the system_ext filesystem image in this directory:", \
+         $(SYSTEM_EXT_NOTICE_DEPS)))
+
+$(installed_system_ext_notice_xml_gz): $(target_system_ext_notice_file_xml_gz)
+	$(copy-file-to-target)
+
+$(call declare-0p-target,$(target_system_ext_notice_file_xml_gz))
+$(call declare-0p-target,$(installed_system_ext_notice_xml_gz))
+ALL_DEFAULT_INSTALLED_MODULES += $(installed_system_ext_notice_xml_gz)
+endif
+
+.PHONY: vendor_dlkmlicense
+vendor_dlkmlicense: $(call corresponding-license-metadata, $(VENDOR_DLKM_NOTICE_DEPS)) reportmissinglicenses
+
+ifneq (,$(VENDOR_DLKM_NOTICE_DEPS))
+$(eval $(call text-notice-rule,$(target_vendor_dlkm_notice_file_txt),"Vendor_dlkm image", \
+         "Notices for files contained in the vendor_dlkm filesystem image in this directory:", \
+         $(VENDOR_DLKM_NOTICE_DEPS)))
+
+$(eval $(call xml-notice-rule,$(target_vendor_dlkm_notice_file_xml_gz),"Vendor_dlkm image", \
+         "Notices for files contained in the vendor_dlkm filesystem image in this directory:", \
+         $(VENDOR_DLKM_NOTICE_DEPS)))
+
+$(installed_vendor_dlkm_notice_xml_gz): $(target_vendor_dlkm_notice_file_xml_gz)
+	$(copy-file-to-target)
+
+$(call declare-0p-target,$(target_vendor_dlkm_notice_file_xml_gz))
+$(call declare-0p-target,$(installed_vendor_dlkm_notice_xml_gz))
+ALL_DEFAULT_INSTALLED_MODULES += $(installed_vendor_dlkm_notice_xml_gz)
+endif
+
+.PHONY: odm_dlkmlicense
+odm_dlkmlicense: $(call corresponding-license-metadata, $(ODM_DLKM_NOTICE_DEPS)) reportmissinglicenses
+
+ifneq (,$(ODM_DLKM_NOTICE_DEPS))
+$(eval $(call text-notice-rule,$(target_odm_dlkm_notice_file_txt),"ODM_dlkm filesystem image", \
+         "Notices for files contained in the odm_dlkm filesystem image in this directory:", \
+         $(ODM_DLKM_NOTICE_DEPS)))
+
+$(eval $(call xml-notice-rule,$(target_odm_dlkm_notice_file_xml_gz),"ODM_dlkm filesystem image", \
+         "Notices for files contained in the odm_dlkm filesystem image in this directory:", \
+         $(ODM_DLMK_NOTICE_DEPS)))
+
+$(installed_odm_dlkm_notice_xml_gz): $(target_odm_dlkm_notice_file_xml_gz)
+	$(copy-file-to-target)
+
+$(call declare-0p-target,$(target_odm_dlkm_notice_file_xml_gz))
+$(call declare-0p-target,$(installed_odm_dlkm_notice_xml_gz))
+ALL_DEFAULT_INSTALLED_MODULES += $(installed_odm_dlkm_notice_xml_gz)
+endif
+
+.PHONY: system_dlkmlicense
+system_dlkmlicense: $(call corresponding-license-metadata, $(SYSTEM_DLKM_NOTICE_DEPS)) reportmissinglicenses
+
+ifneq (,$(SYSTEM_DLKM_NOTICE_DEPS))
+$(eval $(call text-notice-rule,$(target_system_dlkm_notice_file_txt),"System_dlkm filesystem image", \
+         "Notices for files contained in the system_dlkm filesystem image in this directory:", \
+         $(SYSTEM_DLKM_NOTICE_DEPS)))
+
+$(eval $(call xml-notice-rule,$(target_system_dlkm_notice_file_xml_gz),"System_dlkm filesystem image", \
+         "Notices for files contained in the system_dlkm filesystem image in this directory:", \
+         $(SYSTEM_DLMK_NOTICE_DEPS)))
+
+$(installed_system_dlkm_notice_xml_gz): $(target_system_dlkm_notice_file_xml_gz)
+	$(copy-file-to-target)
+
+$(call declare-0p-target,$(target_system_dlkm_notice_file_xml_gz))
+$(call declare-0p-target,$(installed_sysetm_dlkm_notice_xml_gz))
+ALL_DEFAULT_INSTALLED_MODULES += $(installed_system_dlkm_notice_xml_gz)
+endif
diff --git a/core/sysprop.mk b/core/sysprop.mk
index b9c05fe32d..61c07ba603 100644
--- a/core/sysprop.mk
+++ b/core/sysprop.mk
@@ -321,6 +321,8 @@ $(eval $(call build-properties,\
     $(empty),\
     $(empty)))
 
+$(eval $(call declare-1p-target,$(INSTALLED_BUILD_PROP_TARGET)))
+
 # -----------------------------------------------------------------
 # vendor/build.prop
 #
@@ -359,6 +361,8 @@ $(eval $(call build-properties,\
     $(empty),\
     $(empty)))
 
+$(eval $(call declare-1p-target,$(INSTALLED_VENDOR_BUILD_PROP_TARGET)))
+
 # -----------------------------------------------------------------
 # product/etc/build.prop
 #
@@ -411,6 +415,8 @@ $(eval $(call build-properties,\
     $(_footers_),\
     $(_skip_common_properties)))
 
+$(eval $(call declare-1p-target,$(INSTALLED_PRODUCT_BUILD_PROP_TARGET)))
+
 _skip_common_properties :=
 
 # ----------------------------------------------------------------
@@ -436,6 +442,8 @@ $(eval $(call build-properties,\
     $(empty),\
     $(empty)))
 
+$(eval $(call declare-1p-target,$(INSTALLED_ODM_BUILD_PROP_TARGET)))
+
 # ----------------------------------------------------------------
 # vendor_dlkm/etc/build.prop
 #
@@ -450,6 +458,8 @@ $(eval $(call build-properties,\
     $(empty),\
     $(empty)))
 
+$(eval $(call declare-1p-target,$(INSTALLED_VENDOR_DLKM_BUILD_PROP_TARGET)))
+
 # ----------------------------------------------------------------
 # odm_dlkm/etc/build.prop
 #
@@ -464,6 +474,8 @@ $(eval $(call build-properties,\
     $(empty),\
     $(empty)))
 
+$(eval $(call declare-1p-target,$(INSTALLED_ODM_DLKM_BUILD_PROP_TARGET)))
+
 # ----------------------------------------------------------------
 # system_dlkm/build.prop
 #
@@ -478,6 +490,8 @@ $(eval $(call build-properties,\
     $(empty),\
     $(empty)))
 
+$(eval $(call declare-1p-target,$(INSTALLED_SYSTEM_DLKM_BUILD_PROP_TARGET)))
+
 # -----------------------------------------------------------------
 # system_ext/etc/build.prop
 #
@@ -499,6 +513,8 @@ $(eval $(call build-properties,\
     $(empty),\
     $(empty)))
 
+$(eval $(call declare-1p-target,$(INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET)))
+
 # ----------------------------------------------------------------
 # ramdisk/boot/etc/build.prop
 #
@@ -513,3 +529,5 @@ $(eval $(call build-properties,\
     $(empty),\
     $(empty),\
     $(empty)))
+
+$(eval $(call declare-1p-target,$(INSTALLED_RAMDISK_BUILD_PROP_TARGET)))

From da1e41d1f3d87ad465853c9c40f8811e74155529 Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Wed, 16 Mar 2022 14:27:01 +0000
Subject: [PATCH 296/425] Expand KNOWN_CODENAMES to cover all entries in
 Build.VERSION_CODES.

Bug: 220153433
Test: atest BuildTest
Change-Id: I24d73a846d14a032c1e03679cef10cfeac814bb9
---
 core/version_defaults.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 3f857aacc8..bb4cc4746d 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -85,8 +85,13 @@ PLATFORM_SDK_EXTENSION_VERSION := 1
 PLATFORM_BASE_SDK_EXTENSION_VERSION := 1
 .KATI_READONLY := PLATFORM_BASE_SDK_EXTENSION_VERSION
 
-# This is are all known codenames starting from Q.
-PLATFORM_VERSION_KNOWN_CODENAMES := Q R S Sv2 Tiramisu
+# This are all known codenames.
+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 \
+Q R S Sv2 Tiramisu
+
 # Convert from space separated list to comma separated
 PLATFORM_VERSION_KNOWN_CODENAMES := \
   $(call normalize-comma-list,$(PLATFORM_VERSION_KNOWN_CODENAMES))

From e271d92159eabbd1b27fd4ce13fa6cedeeb15bf4 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 16 Mar 2022 17:49:02 +0000
Subject: [PATCH 297/425] Version bump to TP1A.220316.004 [core/build_id.mk]

Change-Id: I6f923f5fe059d5191ac9adb478c10068c73394d0
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index cdd05f0001..b91313f9bd 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=TP1A.220316.003
+BUILD_ID=TP1A.220316.004

From 278cdbc75e2425307f43071e4c882f1b3a7f2047 Mon Sep 17 00:00:00 2001
From: Yi-yo Chiang <yochiang@google.com>
Date: Thu, 17 Mar 2022 05:13:02 +0000
Subject: [PATCH 298/425] Roll-forward the VNDK snapshot list of GSI to 32

Bug: 216414337
Test: Presubmit
Change-Id: Ic6cec82357cec8f4ad7bee62a4eaf2f7685b730f
---
 target/product/gsi_release.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
index b1266eed94..74501cd1f1 100644
--- a/target/product/gsi_release.mk
+++ b/target/product/gsi_release.mk
@@ -68,6 +68,7 @@ PRODUCT_EXTRA_VNDK_VERSIONS := \
     29 \
     30 \
     31 \
+    32 \
 
 # Do not build non-GSI partition images.
 PRODUCT_BUILD_CACHE_IMAGE := false

From 9351a0be4716aee75bb64e0f4772a2f4e8919fc2 Mon Sep 17 00:00:00 2001
From: Jeffrey Vander Stoep <jeffv@google.com>
Date: Thu, 17 Mar 2022 10:34:23 +0000
Subject: [PATCH 299/425] Revert "Remove sepolicy module from system image."

This reverts commit 4a829c540736333c0d8a0c615ed487b05fcdb763.

Reason for revert: b/224844224

Change-Id: I6e9a74dffd5832807e498251899c580599f31b95
---
 target/product/base_system.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 83ca2248ae..2ad9ac6506 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -69,6 +69,7 @@ PRODUCT_PACKAGES += \
     com.android.neuralnetworks \
     com.android.scheduling \
     com.android.sdkext \
+    com.android.sepolicy \
     com.android.tethering \
     com.android.tzdata \
     com.android.uwb \
@@ -372,6 +373,7 @@ PRODUCT_SYSTEM_PROPERTIES += persist.traced.enable=1
 PRODUCT_PACKAGES_DEBUG := \
     adb_keys \
     arping \
+    com.android.sepolicy.cert-debug.der \
     dmuserd \
     idlcli \
     init-debug.rc \

From 02f023ca04df0e11e7f6d95cd40582013f57c62f Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 17 Mar 2022 12:46:58 +0000
Subject: [PATCH 300/425] Version bump to TP1A.220317.002 [core/build_id.mk]

Change-Id: I3ff7487d019701669d7bb00110dac17cf854fc1a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index cae7100903..91ec75c8c6 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=TP1A.220317.001
+BUILD_ID=TP1A.220317.002

From 7eb29abbdec095be20d096ebf97b8360feba777e Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 21 Mar 2022 23:25:22 +0000
Subject: [PATCH 301/425] Version bump to TP1A.220321.002 [core/build_id.mk]

Change-Id: Ice7dca12b1961431eea1a83626d5c81795b37069
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 4f39c9e66e..9130189b31 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=TP1A.220321.001
+BUILD_ID=TP1A.220321.002

From e4fff4957d5b20a5ca11861f8d5417688ff96f10 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 22 Mar 2022 01:55:25 +0000
Subject: [PATCH 302/425] Version bump to TP1A.220322.002 [core/build_id.mk]

Change-Id: Ib66dd5a6b2d20b2d3081af688241bf9e40c13531
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 863125cf09..61ed3c683c 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=TP1A.220322.001
+BUILD_ID=TP1A.220322.002

From 5be591a6f6130de7cd0788b1d40807f014595264 Mon Sep 17 00:00:00 2001
From: Etienne Ruffieux <eruffieux@google.com>
Date: Fri, 4 Mar 2022 13:22:23 +0000
Subject: [PATCH 303/425] Removing audio defaults from platform

Audio defaults have a lot of dependencies, and to reduce
the number of libs exposed in platform we need to remove
these audio defaults.

Bug: 220306859
Test: atest
Tag: #feature
Change-Id: Iee2e347e6dceec4232e408145e97024476744455
---
 target/product/full_base.mk      | 6 ------
 target/product/generic_system.mk | 5 -----
 2 files changed, 11 deletions(-)

diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index a8e1e913f7..39c66da318 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -28,12 +28,6 @@ PRODUCT_PACKAGES += \
     PhotoTable \
     preinstalled-packages-platform-full-base.xml
 
-# Bluetooth:
-#   audio.a2dp.default is a system module. Generic system image includes
-#   audio.a2dp.default to support A2DP if board has the capability.
-PRODUCT_PACKAGES += \
-    audio.a2dp.default
-
 # Net:
 #   Vendors can use the platform-provided network configuration utilities (ip,
 #   iptable, etc.) to configure the Linux networking stack, but these utilities
diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk
index f13c9db4d1..1a639ef717 100644
--- a/target/product/generic_system.mk
+++ b/target/product/generic_system.mk
@@ -52,11 +52,6 @@ PRODUCT_PACKAGES += \
     cppreopts.sh \
     otapreopt_script \
 
-# Bluetooth libraries
-PRODUCT_PACKAGES += \
-    audio.a2dp.default \
-    audio.hearing_aid.default \
-
 # For ringtones that rely on forward lock encryption
 PRODUCT_PACKAGES += libfwdlockengine
 

From dd5ba7adffc3cf0d4aefd746682db8651bd595a8 Mon Sep 17 00:00:00 2001
From: Iavor-Valentin Iftime <valiiftime@google.com>
Date: Tue, 22 Mar 2022 13:51:07 +0000
Subject: [PATCH 304/425] Rebuild and copy recovery patch files when using
 vendor_otatools

  Rebuild recovery and copy recovery patch/install files when building vendor images using vendor otatools. Fixes ota_from_target_files failure.

Bug: 220126689
Bug: 186097910

Test: sign_target_files_apks \
        --vendor_otatools=otatools_vendor_dir \
	--vendor_partitions=vendor,odm \
	merged-target_files.zip \
	signed-target_files.zip

Change-Id: I4a415417e0d7b1bcd548292ec8f3a12570ec65f0
(cherry picked from commit 246a5c069a217d830a64e89e1a36f2ae7501f2af)
Merged-In: I4a415417e0d7b1bcd548292ec8f3a12570ec65f0
---
 tools/releasetools/sign_target_files_apks.py | 21 +++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
index e044328815..fc6afb1c56 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -1278,6 +1278,9 @@ def BuildVendorPartitions(output_zip_path):
   vendor_tempdir = common.UnzipTemp(output_zip_path, [
       "META/*",
       "SYSTEM/build.prop",
+      "RECOVERY/*",
+      "BOOT/*",
+      "OTA/",
   ] + ["{}/*".format(p.upper()) for p in OPTIONS.vendor_partitions])
 
   # Disable various partitions that build based on misc_info fields.
@@ -1286,9 +1289,12 @@ def BuildVendorPartitions(output_zip_path):
   # otatools if necessary.
   vendor_misc_info_path = os.path.join(vendor_tempdir, "META/misc_info.txt")
   vendor_misc_info = common.LoadDictionaryFromFile(vendor_misc_info_path)
-  vendor_misc_info["no_boot"] = "true"  # boot
-  vendor_misc_info["vendor_boot"] = "false"  # vendor_boot
-  vendor_misc_info["no_recovery"] = "true"  # recovery
+  # Ignore if not rebuilding recovery
+  if not OPTIONS.rebuild_recovery:
+    vendor_misc_info["no_boot"] = "true"  # boot
+    vendor_misc_info["vendor_boot"] = "false"  # vendor_boot
+    vendor_misc_info["no_recovery"] = "true"  # recovery
+
   vendor_misc_info["board_bpt_enable"] = "false"  # partition-table
   vendor_misc_info["has_dtbo"] = "false"  # dtbo
   vendor_misc_info["has_pvmfw"] = "false"  # pvmfw
@@ -1334,6 +1340,9 @@ def BuildVendorPartitions(output_zip_path):
       "--verbose",
       vendor_tempdir,
   ]
+  if OPTIONS.rebuild_recovery:
+    cmd.insert(4, "--rebuild_recovery")
+
   common.RunAndCheckOutput(cmd, verbose=True)
 
   logger.info("Writing vendor partitions to output archive.")
@@ -1345,6 +1354,12 @@ def BuildVendorPartitions(output_zip_path):
       map_file_path = "IMAGES/{}.map".format(p)
       common.ZipWrite(output_zip, os.path.join(vendor_tempdir, img_file_path), img_file_path)
       common.ZipWrite(output_zip, os.path.join(vendor_tempdir, map_file_path), map_file_path)
+    # copy recovery patch & install.sh
+    if OPTIONS.rebuild_recovery:
+      recovery_patch_path = "VENDOR/recovery-from-boot.p"
+      recovery_sh_path = "VENDOR/bin/install-recovery.sh"
+      common.ZipWrite(output_zip, os.path.join(vendor_tempdir, recovery_patch_path), recovery_patch_path)
+      common.ZipWrite(output_zip, os.path.join(vendor_tempdir, recovery_sh_path), recovery_sh_path)
 
 
 def main(argv):

From 975ddf653b1727cb21b60687c93217b85076156e Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 23 Mar 2022 07:17:08 +0000
Subject: [PATCH 305/425] Version bump to TP1A.220323.002 [core/build_id.mk]

Change-Id: Ie8c4882b59550e0f0a5ddea8b60ec175c3811157
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 1cdb8f0820..de4f43a5e1 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=TP1A.220323.001
+BUILD_ID=TP1A.220323.002

From 6a17459edce2049060ae1c61ca49f83f9fc2f69d Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 23 Mar 2022 17:47:09 +0000
Subject: [PATCH 306/425] Version bump to TP1A.220323.003 [core/build_id.mk]

Change-Id: Idef7a159bc43f422f6c0bda637d02c95477bd677
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index de4f43a5e1..1f362386ac 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=TP1A.220323.002
+BUILD_ID=TP1A.220323.003

From 023d0a6875fee822092515a6c812cd7181defbc4 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 24 Mar 2022 05:40:57 +0000
Subject: [PATCH 307/425] Version bump to TP1A.220324.002 [core/build_id.mk]

Change-Id: Id808ea6fdc7476a90764c668604d7b94edcc3a1a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index c6c5ffc046..ee7bd1a3d4 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=TP1A.220324.001
+BUILD_ID=TP1A.220324.002

From c13709be928b41fc9a97001c25b9a1c8f030303e Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 25 Mar 2022 21:35:13 +0000
Subject: [PATCH 308/425] Version bump to TP1A.220325.002 [core/build_id.mk]

Change-Id: I54df698bc0de887596a31bcc9f8f61be17759b5d
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index b2ad381da6..e73672e005 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=TP1A.220325.001
+BUILD_ID=TP1A.220325.002

From 21bd25c44dba1ff4bab718444035db9262b4b544 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 28 Mar 2022 16:05:05 +0000
Subject: [PATCH 309/425] Version bump to TP1A.220328.002 [core/build_id.mk]

Change-Id: Ie7df2867907b24dddaffa47002f8a562f982470b
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 656281491c..94b4aeba6e 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=TP1A.220328.001
+BUILD_ID=TP1A.220328.002

From b7e93acc1b8341ca358a0d446158e4c9ebe1f9bc Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 29 Mar 2022 19:15:01 +0000
Subject: [PATCH 310/425] Version bump to TP1A.220329.002 [core/build_id.mk]

Change-Id: If6e0d756a8a468fe5ebf9c5e8a931a5f62bd2355
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 90cade3aff..a43ba5c9a2 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=TP1A.220329.001
+BUILD_ID=TP1A.220329.002

From 71b315fb2f2f8a180fe03ca2e1a843f501f6f10d Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 30 Mar 2022 02:21:12 +0000
Subject: [PATCH 311/425] Version bump to TP1A.220330.002 [core/build_id.mk]

Change-Id: I8576dd56ac64be746eb82809f40358c476640ee0
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index c1e6ff6885..d025c4bafc 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=TP1A.220330.001
+BUILD_ID=TP1A.220330.002

From 5f0ce9a427fb79aaad75b60b1c929b44749311f1 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 30 Mar 2022 03:39:11 +0000
Subject: [PATCH 312/425] Version bump to TP1A.220330.003 [core/build_id.mk]

Change-Id: Ieea4420a1c909e2f6d70702d88977757573436df
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index d025c4bafc..1131a20fb0 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=TP1A.220330.002
+BUILD_ID=TP1A.220330.003

From a2411e4b6895572acd36b41f8384fe8f8b8c2e5a Mon Sep 17 00:00:00 2001
From: Roopa Sattiraju <sattiraju@google.com>
Date: Wed, 30 Mar 2022 12:51:27 -0700
Subject: [PATCH 313/425] Copy com_google_android_bluetooth_services certs for
 sepolicy

BUG: 226403247
Test: TH
Change-Id: I6cf4e9fa1f2e5a2e628f10b1e734b2a8c8df61fc
---
 target/product/security/bluetooth.pk8      | Bin 0 -> 2374 bytes
 target/product/security/bluetooth.x509.pem |  36 +++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 target/product/security/bluetooth.pk8
 create mode 100644 target/product/security/bluetooth.x509.pem

diff --git a/target/product/security/bluetooth.pk8 b/target/product/security/bluetooth.pk8
new file mode 100644
index 0000000000000000000000000000000000000000..c6ea434b5dc82479c82f41b27a147c041be4b96a
GIT binary patch
literal 2374
zcmV-M3Ay$#f(b$b0RS)!1_>&LNQU<f0RaI800e>wEHHuzC;|Zh0)heo0I^wW_L?(M
z5eAjNF7b^3eT)yYldfv>ar{dc({_`NU>8yJjxYzXt2Gx4gk!_S5WMBO-s@UtNGSG;
z13xogR7dTYY*zdQ0{C@?Xt2<HCJx>BoILZA?;1peW<*5R=Z5%sseKIw-liugEPj)w
zMD*cqE{KC*YsMX3sa7gRMB{|fN)M<4cT?RmWfB+9F%gEDTJ+=*KRsq0{FJ=f+aK_J
z)@BJH6}q!<)TjM52iUQphrr7tuJrPRZ+A^L7tIhw%mcPsP-4TRbhQfnWo}mp&sd|N
z640gMQ$|+6<?)1PYv0PvcewqXn`svXrZ-t2dB5+ZN9xguZfnqTxkP7tmTuUt6Kqzd
zyC~v>i)(9UN;=U^JU6a_0*nevna`z^@KC5QN@uH+_G%1GIA9v@Dc5w|-jm-A-7%N)
zt6vfTuj>4+Ge{bco`d#tINo~#n^NQl@<7lgoLeMwmNttoP`FEt+RQ_k$m5&$f)k!b
zLO^Rr-+3|3sj@t>8Q--<<Lmm#HS$QXb2@llI?iqcfarx%ZX?b7Y`9r}$GMn_=Z+$<
zvSBe^Brk#|Tf+8A3qNP^g!qX_RzDsETj7s#E7`L91PRH>*#!|RT;YnoP`I?aWw0%W
zi6Rk9N$Tju<~QvV;{OU#wk{?#*oD?aCoS-uVSJWZ$H`{g^#TI{009Dm0st`&y@_t?
z7g!K%NU>qvQSWJ4#-ZvoXc%^72e?)%N6pD)z_Yy(!;AT8;Odt4$Afd;QLXKX+T59l
zYPf+pV*A_D9Kws`xHU8?zWyUS>AY2pj)WRef2(Px-odlYA8vVOFR}HAF9=l%tPpbx
z!HIqS2M`o*)3Utb&ln|O7=&Upk@;N@Yi~PZ3)t=gY%KKNIeKy!&9tKRrvd`oqvy_)
zCe+~ZQBd)ZMtyDLoKgv1N`qC9T-3j+e|(;jTaJbbBxL3K0!|L3bkJOFCz+qdum?O$
zH?lm+M=T~^MTyrSd&Al5E}$AJ{`kp1w=P~yXRwB<a@G1>@fiH}b7k7axtBI;<;k*6
zP#4JD9Cd^<Q5KLvdx4nE>8i-%>0SR<1T+G0;emyUOo<tJj%Sgvt?YI8qC63;<P{_d
z^0agqBon>^cWy0~4T<+kO$lt?_cc7v*oo4BzBn4wzy27#eL!ukft``o8{D}T5p1`;
z64*8i@uhiL&KN!4cVO8?(cdJLzZ%}L@Xy*io*%ui$HXM%d9=lCYBE!D?x;841Pywt
z|0~<jKY-wqKzmz98M2I~boAq?t6#qXgPKNHz0}$|2SG;Rml0V>VBL*>!gSo=WF=R$
z$`VMF^@bVB8Amp2*RkQ2r0Y$4LO_@zS-}z8r0w^eDH5()Q$YfP0RaH)5vE?Sc*L$?
zVj^=2Yg!D!kb1hJi?G%BA&4UH6yUp39=U0!S@0#*mWP1JQ!J$F;pwFN`mM7(-;NMV
z%^75&{22unIMiGJ-)O|otgJBK1UREoIV(ZUY2n(zRYJi}IJCuAGsJ`tREIS6iRH)`
zMx6j&R7mfDw7t^8g9Rnm<6@qTK{*@ugtz&`VtWNGpZ-=E2K=z_@y)&v(&<`Hu0RxU
znES~F&mcP!J0g|be=K}&4n&<;rQvjM%RD>D3tBN-r)g_Rh>0bAIEd*GC08CV#rS!n
zUFrbk7ZuY0^C2(L1_^+el<oWBjtXOLUWtc5*wzn2hJCpGE{53xf&l>lz*3yNF#NME
zz#$q^aSF-ftDj!`LB0=J=NrJ-nga%wqV<?emi|UHc+Whu<=^$Gu84*o$wI~mzZcO^
z>yY_1?3*0s`)I*N*pQ#BtzD7E2Z;y!WF)g-%tNW}5SK$#(wTX($~1N6wmaL}O1EhG
zez6{CvxMSE5g*wNX{-HGJ4*L~eAKO;Ld0$D_kF67aLM6flYHXZaF<qHAr2LOOGx|F
zJQ@8`dVSvH$=<H<4jaXvH+X0lia1Vh9<YfNH4z`m??1IZ`1(*dWvV;6hUiRVZMZ0U
zhJRGAP*pR%3v(}i`C7I@hTjOWS6|d{Uc0-|sln=*T3)M3>BbFx0)hbn0Ov6k<xn8T
zMjU{jN?9K7j^vh+i)@=O@hwyFmVDgKhQ*TabjW|LPw-H_o#PEb0JcNVWmBD+HJV*I
zEj@oc>M%9SZw}{E8d8bEdQ}9!k`X6*EP&q{Jrrgr+3Qn_&-1+wRN>_U1#nczA(n!f
zb`VHEgjd~VoS{hJN}^I+T}Ff(Ryp!<a<M|%Mw1Ntd;`VT`3wW9zrzTey%LV>7!^kf
z+_|+Wi6hYexVuTi!cMY*r_aBFbuyPKD78PW+QT;q`l8QX&%&`I*MdGa-$8%CMF94C
zH10@{UX}g0((mvrMLrH&iUeeSd79Z*)h`DK+gvBV<Sh1X^cRR!X##=)005hUF**8T
zT7RS4AZ>{HFhu8o_DnO}dW|<yIh^Y2hiFDzPsyH5{C7Y&QQaj1@}WV0BJ_~RZCIr%
zofOe!XdN;%Ix34FDJdWG(J0Ra+1W-uhc&*#?nhSRUxXj#FN<crvZ&tIjD7&zW$7G&
zF=1N|+=k4drdFSVApf^=T4N)QdXqU^zXmw=o9xdq&AH5ZaK%J?w(;s1biCO8ier>~
zZzL^r)?nJI?2r<w{K@T}hb=a(C4J*Xq$V}0i7d^$3i%9scM^0z@|~xa{<PF#0b^uT
zgl3LfXCGSCiU3kU(Iwh?e&tLl3*K4CBL2CX6GL?XSFxyI<R9PXMFN5W04;>cEF)za
zj|p%}Ed58x(*_x#0{o8srh0Gj@cjn=Mhiu$xHeN_z?`v2{h&(ZqDmhZx!FaG3A+8q
zr*gQJa{5SIT11Yzp<CZv2UVvnG5;z9Qo^?zz@;8eM^wj2!_J%ylov4-W==H2Hav##
z*82y88H`kwBv@G5lql?`0}o(5{%H;T3T`WkGX>~#pQFl8t3i{L+`5>LSg^C~r*ZY^
zi4#pFqZ8D7aED&pe-@cJ)tyAg;I9!XJ4T?m6@N{zoyTz+WsP$4%Y7LlpX&Wrhw0h9
sI(qPS8m&9O7X!{rw?9$f$}D3rV>)4S@|*m1TNHbk<SzpXQYTM$5LIu8ZU6uP

literal 0
HcmV?d00001

diff --git a/target/product/security/bluetooth.x509.pem b/target/product/security/bluetooth.x509.pem
new file mode 100644
index 0000000000..396d7c9f43
--- /dev/null
+++ b/target/product/security/bluetooth.x509.pem
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIGOzCCBCOgAwIBAgIUEiZapaWZVSter06CJMf2kHi8PIswDQYJKoZIhvcNAQEL
+BQAwgasxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH
+DA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRy
+b2lkMScwJQYDVQQDDB5jb20uYW5kcm9pZC5ibHVldG9vdGguc2VydmljZXMxIjAg
+BgkqhkiG9w0BCQEWE2FuZHJvaWRAYW5kcm9pZC5jb20wIBcNMjIwMzE1MDAzNjAz
+WhgPNDc2MDAyMDkwMDM2MDNaMIGrMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2Fs
+aWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4GA1UECgwHQW5kcm9p
+ZDEQMA4GA1UECwwHQW5kcm9pZDEnMCUGA1UEAwweY29tLmFuZHJvaWQuYmx1ZXRv
+b3RoLnNlcnZpY2VzMSIwIAYJKoZIhvcNAQkBFhNhbmRyb2lkQGFuZHJvaWQuY29t
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsVlq9pozUREGlb8u8Y0A
+fYwPs5OuavNx/EsX03aTjmAXUfSOMAewqzUXDIRjw8UQvOW63utaZ0go9osDPzNf
+VEftmGxW/AUC+HWGaLDQfCYO3ficPPOS7xpEhGZERNbnhvh5qX0NBt6mJygsfpOm
+RPThbi6Ig2Brxh1eqVYqRkTjhNFKD6gCd1PdMmUSF88xEYaZWvTkET89Zh38lLza
+2x/wfNZmCSAVurNw1Kf9NQfYsaGHwMsjrvTyhG93TTYXzRBFzAO2WlBiw6R0tQr8
+ZW5XCM9Yo6AS0KXiU0ZWwOXxhGdr38rNd7j9nZtpFwWmN1kgeb/vpEfq0Ylua9By
+uURnfJZu2K4TbFamuyjihItra2ZKOtFNPDeuggKMCkuZz6WU8FCoMEpnq5P2agxN
+OGAa7ynXdNzek98N3TGX8qtfEgCv6vyuM0gakJ6D9nM43nsCm1LkB/JA0CacWyRz
+ljaLL1C4S43azEOYyOOb94ITnkZCQGtH33kxzamyPLIZ37VF4+v6yTXySLBzOnhe
+Os5uBIDohVJuI838bLhZf8e5mIrnjiKwsmExXiQvgidbwvZKCz9n8YT4iUhWPx4F
+W+GPcivZsvsECcnJ2QURK1zhir5QuLS7ZbAth4kiEUxJ6ujF5jftE+L/ClK2LiY0
+2IXWRCct8J1hfJZZx8lm3PUCAwEAAaNTMFEwHQYDVR0OBBYEFO5CgtQzKbTEd/Q9
+rxK14a9BBwFZMB8GA1UdIwQYMBaAFO5CgtQzKbTEd/Q9rxK14a9BBwFZMA8GA1Ud
+EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGrGS1zmaoARVq7qhoY+xzSc
+1I/Tzf6vG6aHBC+CcIoSM2oqr6TGH+ADHAY6jhu/qzv1ij3gtoInAkBtkWvYsCIV
+eISPj8Qomcd8EIeW77p+ArKzS4HY5m1c/O4D/5rkl6c0exFq4Pdw9V8xyM98QtLd
+oj4xzzXUTPOIwkROHkj8otcML28m/MC0l/4b+flHnPqKFuLBjhxi9b/ZfwaXfjkx
+TcXpM3nPH8zN7kaJpS1fPW1IJyxJYvT022uK+afpezTmyS/50aOncUGjDJRw8CcO
+B88O8lpizDD3tD7P6jVOpRRJS4SnkVErbIn1xdWER6ubhnnycH7UmDVIx+vNd/t6
+YDa377au8Za+LnbDPfV1+Og+RaJSEIjJgfYyqnjBxGdRGN21VbqJdRzo/eO4ZFd2
+mGVtMosVr0jw4O8r60o9oMMWBTbFpxOI929QdcV+X1Lz8A8BZz0faXfZ2Z9usctu
+W2FtZge3tsJ07z7kuhNdbnm2yQVfd0FqiJsapUjlhgcdFVoDWPuqOfWAoG31ble6
+eiNnxfjiCckPWyciIE6lw97nvavGjlUacH5qVG86hOWU7xyBgeQ0PH4e+Nxr50yU
+A0GMxni1gefZFG8qEPdNRuDT1QdqDGh/8Ea11GEUMXdAxk0UzqyAtLDr6MbwK6lV
+mqmeueFdogdjvQ3mXe94
+-----END CERTIFICATE-----

From 7d31be765b802de8ab7d59ffc65418cb16937dc5 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Wed, 23 Mar 2022 16:46:52 +0900
Subject: [PATCH 314/425] Update VNDK libraries list after the API freeze for
 TM

Bug: 225941299
Test: m
Change-Id: I13c91e2fbaef79c5016f32d4cdc7cce8f262894e
---
 target/product/gsi/current.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 599d8f9602..ae80b37e2a 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -31,10 +31,10 @@ VNDK-SP: android.hardware.graphics.mapper@2.1.so
 VNDK-SP: android.hardware.graphics.mapper@3.0.so
 VNDK-SP: android.hardware.graphics.mapper@4.0.so
 VNDK-SP: android.hardware.renderscript@1.0.so
-VNDK-SP: android.hidl.safe_union@1.0.so
 VNDK-SP: android.hidl.memory.token@1.0.so
 VNDK-SP: android.hidl.memory@1.0-impl.so
 VNDK-SP: android.hidl.memory@1.0.so
+VNDK-SP: android.hidl.safe_union@1.0.so
 VNDK-SP: libRSCpuRef.so
 VNDK-SP: libRSDriver.so
 VNDK-SP: libRS_internal.so
@@ -73,7 +73,7 @@ VNDK-core: android.hardware.configstore@1.1.so
 VNDK-core: android.hardware.confirmationui-support-lib.so
 VNDK-core: android.hardware.drm-V1-ndk.so
 VNDK-core: android.hardware.dumpstate-V1-ndk.so
-VNDK-core: android.hardware.gnss-V1-ndk.so
+VNDK-core: android.hardware.gnss-V2-ndk.so
 VNDK-core: android.hardware.graphics.allocator@2.0.so
 VNDK-core: android.hardware.graphics.allocator@3.0.so
 VNDK-core: android.hardware.graphics.allocator@4.0.so
@@ -81,7 +81,7 @@ VNDK-core: android.hardware.graphics.bufferqueue@1.0.so
 VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
 VNDK-core: android.hardware.health-V1-ndk.so
 VNDK-core: android.hardware.health.storage-V1-ndk.so
-VNDK-core: android.hardware.identity-V3-ndk.so
+VNDK-core: android.hardware.identity-V4-ndk.so
 VNDK-core: android.hardware.ir-V1-ndk.so
 VNDK-core: android.hardware.keymaster-V3-ndk.so
 VNDK-core: android.hardware.light-V1-ndk.so
@@ -104,7 +104,7 @@ VNDK-core: android.hardware.radio.sim-V1-ndk.so
 VNDK-core: android.hardware.radio.voice-V1-ndk.so
 VNDK-core: android.hardware.rebootescrow-V1-ndk.so
 VNDK-core: android.hardware.security.dice-V1-ndk.so
-VNDK-core: android.hardware.security.keymint-V1-ndk.so
+VNDK-core: android.hardware.security.keymint-V2-ndk.so
 VNDK-core: android.hardware.security.secureclock-V1-ndk.so
 VNDK-core: android.hardware.security.sharedsecret-V1-ndk.so
 VNDK-core: android.hardware.sensors-V1-ndk.so
@@ -121,7 +121,7 @@ VNDK-core: android.hidl.token@1.0-utils.so
 VNDK-core: android.hidl.token@1.0.so
 VNDK-core: android.media.audio.common.types-V1-ndk.so
 VNDK-core: android.media.soundtrigger.types-V1-ndk.so
-VNDK-core: android.system.keystore2-V1-ndk.so
+VNDK-core: android.system.keystore2-V2-ndk.so
 VNDK-core: android.system.suspend-V1-ndk.so
 VNDK-core: android.system.suspend@1.0.so
 VNDK-core: libaudioroute.so

From 91a6a8f1541e3fa5305fcb491f7f0b9f56668a17 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 31 Mar 2022 23:39:11 +0000
Subject: [PATCH 315/425] Version bump to TP1A.220331.002 [core/build_id.mk]

Change-Id: Ifd9f9a5835c04e11043bd090e029924c83102b18
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 9fcac9e35d..7d225eedab 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=TP1A.220331.001
+BUILD_ID=TP1A.220331.002

From ef15c8e52a61383c3542d7055a2b0a5c9333804d Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 1 Apr 2022 01:41:16 +0000
Subject: [PATCH 316/425] Version bump to TP1A.220401.002 [core/build_id.mk]

Change-Id: Id6f16c26bb378f1f7f03133901a65bfa844b67ac
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index a3c37cd773..e7ac7936e0 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=TP1A.220401.001
+BUILD_ID=TP1A.220401.002

From 9dcfea86b410aaa3207db6969a40cff919dae6a1 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 1 Apr 2022 15:47:18 +0000
Subject: [PATCH 317/425] Version bump to TP1A.220401.003 [core/build_id.mk]

Change-Id: I6d9fd8b48def9ff4f53cefeec2296fde9662486b
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index e7ac7936e0..2b0ac02711 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=TP1A.220401.002
+BUILD_ID=TP1A.220401.003

From ee052ac0e5922c5a9672cfcfcae4a6945eff30c9 Mon Sep 17 00:00:00 2001
From: Steve Berbary <sberbary@google.com>
Date: Wed, 6 Apr 2022 05:02:37 +0000
Subject: [PATCH 318/425] Update Security String to 2022-06-05

Bug: 228265025
Change-Id: Iac5d1f2b0c48bf5ff7dc89d00d49944e764cec5c
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index a0897449cf..0daae6bdcb 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -240,7 +240,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-05-05
+    PLATFORM_SECURITY_PATCH := 2022-06-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH
 

From ff8d7d7825077604dec6ad7b9036ce1795b0756c Mon Sep 17 00:00:00 2001
From: Steve Berbary <sberbary@google.com>
Date: Wed, 6 Apr 2022 05:07:59 +0000
Subject: [PATCH 319/425] Update Security String to 2022-06-01

Bug: 228265025
Change-Id: Iac5d1f2b0c48bf5ff7dc89d00d49944e764cec5c
Merged-In: Iac5d1f2b0c48bf5ff7dc89d00d49944e764cec5c
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 6b12e1270e..0a3350a03b 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -250,7 +250,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-05-01
+      PLATFORM_SECURITY_PATCH := 2022-06-01
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH
 

From b42ddf95d18a45a7e70b64f752b7d8a6ad579cd3 Mon Sep 17 00:00:00 2001
From: Albert Martin <albertmartin@google.com>
Date: Fri, 1 Apr 2022 19:59:40 +0000
Subject: [PATCH 320/425] Add flag to globally override updateable apexes'
 min_sdk_version

Override all mainline updateable apexes' min_sdk_version to same version to get a single shared native lib version on DCLA.

Test: Run "vendor/google/build/go/mainline_go_modules_arm.sh" and inspect built apexes
Bug: 212609891
Change-Id: I8edf09ca3c91ee52e9c2138c71d9b155b4448f66
---
 core/soong_config.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 916dfbb7f2..32675f2a5f 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -227,6 +227,8 @@ $(call add_json_list, ManifestPackageNameOverrides,      $(PRODUCT_MANIFEST_PACK
 $(call add_json_list, PackageNameOverrides,              $(PRODUCT_PACKAGE_NAME_OVERRIDES))
 $(call add_json_list, CertificateOverrides,              $(PRODUCT_CERTIFICATE_OVERRIDES))
 
+$(call add_json_str, ApexGlobalMinSdkVersionOverride,    $(APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE))
+
 $(call add_json_bool, EnforceSystemCertificate,          $(filter true,$(ENFORCE_SYSTEM_CERTIFICATE)))
 $(call add_json_list, EnforceSystemCertificateAllowList, $(ENFORCE_SYSTEM_CERTIFICATE_ALLOW_LIST))
 

From e9d876c1033eea2232c7146c36e49adcb35eea12 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 8 Apr 2022 19:15:16 +0000
Subject: [PATCH 321/425] Version bump to TP1A.220408.002 [core/build_id.mk]

Change-Id: I3048ce0621770ee7ca998054b393b609d5774575
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 37cd86d45f..05e796233f 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=TP1A.220408.001
+BUILD_ID=TP1A.220408.002

From 98febe223d4a1811f2e6afcd14a40f68fc11d26c Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 11 Apr 2022 02:07:10 +0000
Subject: [PATCH 322/425] Version bump to TP1A.220411.002 [core/build_id.mk]

Change-Id: Iccaff363777159c257d65b14cd9443f8b25da109
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 2582f660ce..3ebdf62940 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=TP1A.220411.001
+BUILD_ID=TP1A.220411.002

From 5e9086d9e1635ea0f35afbc3f3f078d5c4b3dfb9 Mon Sep 17 00:00:00 2001
From: Jeff Hamilton <jham@google.com>
Date: Fri, 8 Apr 2022 14:21:00 +0000
Subject: [PATCH 323/425] DO NOT MERGE: Change the build ID to M_2022_05.

This manual step will ensure all modules
built with this CL will work around
the APK-in-APEX cache issue for the
M-2022-05 release.

Bug: 226559955
Test: build com.google.android.permission, check names with deapexer
Change-Id: Ide67340df79d7ac6d1d2bb09b2dfad42ba757ba1
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 84429d27d3..52ccf822df 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=SC
+BUILD_ID=M_2022_05

From 0c33170c9c448ae85dd0352f83d00f197e82a802 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 11 Apr 2022 19:19:29 +0000
Subject: [PATCH 324/425] Version bump to TP1A.220411.003 [core/build_id.mk]

Change-Id: I85f91106eac8a60389f0592bb64bf1b808c22688
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 3ebdf62940..156fb34b79 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=TP1A.220411.002
+BUILD_ID=TP1A.220411.003

From 97191b2095db9eed64677fdcf56eb1858dd40929 Mon Sep 17 00:00:00 2001
From: Yurii Zubrytskyi <zyy@google.com>
Date: Mon, 4 Apr 2022 16:35:14 -0700
Subject: [PATCH 325/425] platform/build/make - T is now 33

Bug: 225745567
Test: Build
Change-Id: If115998c2ef9ef58329faa937e11d673f5585aab
---
 core/config.mk            |   2 +-
 core/version_defaults.mk  |   8 +-
 target/product/gsi/33.txt | 254 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 259 insertions(+), 5 deletions(-)
 create mode 100644 target/product/gsi/33.txt

diff --git a/core/config.mk b/core/config.mk
index bd3d1a083b..ccad33bde9 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -836,7 +836,7 @@ BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE))
 # is made which breaks compatibility with the previous platform sepolicy version,
 # not just on every increase in PLATFORM_SDK_VERSION.  The minor version should
 # be reset to 0 on every bump of the PLATFORM_SDK_VERSION.
-sepolicy_major_vers := 32
+sepolicy_major_vers := 33
 sepolicy_minor_vers := 0
 
 ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 5a99550d26..4e3f2a8654 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -48,7 +48,7 @@ MAX_PLATFORM_VERSION := TP1A
 # The last stable version name of the platform that was released.  During
 # development, this stays at that previous version, while the codename indicates
 # further work based on the previous version.
-PLATFORM_VERSION_LAST_STABLE := 12
+PLATFORM_VERSION_LAST_STABLE := 13
 .KATI_READONLY := PLATFORM_VERSION_LAST_STABLE
 
 # These are the current development codenames, if the build is not a final
@@ -73,16 +73,16 @@ ifndef PLATFORM_SDK_VERSION
   # When you increment the PLATFORM_SDK_VERSION please ensure you also
   # clear out the following text file of all older PLATFORM_VERSION's:
   # cts/tests/tests/os/assets/platform_versions.txt
-  PLATFORM_SDK_VERSION := 32
+  PLATFORM_SDK_VERSION := 33
 endif
 .KATI_READONLY := PLATFORM_SDK_VERSION
 
 # This is the sdk extension version of this tree.
-PLATFORM_SDK_EXTENSION_VERSION := 2
+PLATFORM_SDK_EXTENSION_VERSION := 3
 .KATI_READONLY := PLATFORM_SDK_EXTENSION_VERSION
 
 # This is the sdk extension version that PLATFORM_SDK_VERSION ships with.
-PLATFORM_BASE_SDK_EXTENSION_VERSION := 2
+PLATFORM_BASE_SDK_EXTENSION_VERSION := 3
 .KATI_READONLY := PLATFORM_BASE_SDK_EXTENSION_VERSION
 
 # This are all known codenames.
diff --git a/target/product/gsi/33.txt b/target/product/gsi/33.txt
new file mode 100644
index 0000000000..ae80b37e2a
--- /dev/null
+++ b/target/product/gsi/33.txt
@@ -0,0 +1,254 @@
+LLNDK: libEGL.so
+LLNDK: libGLESv1_CM.so
+LLNDK: libGLESv2.so
+LLNDK: libGLESv3.so
+LLNDK: libRS.so
+LLNDK: libandroid_net.so
+LLNDK: libbinder_ndk.so
+LLNDK: libc.so
+LLNDK: libcgrouprc.so
+LLNDK: libdl.so
+LLNDK: libft2.so
+LLNDK: liblog.so
+LLNDK: libm.so
+LLNDK: libmediandk.so
+LLNDK: libnativewindow.so
+LLNDK: libneuralnetworks.so
+LLNDK: libselinux.so
+LLNDK: libsync.so
+LLNDK: libvndksupport.so
+LLNDK: libvulkan.so
+VNDK-SP: android.hardware.common-V2-ndk.so
+VNDK-SP: android.hardware.common.fmq-V1-ndk.so
+VNDK-SP: android.hardware.graphics.allocator-V1-ndk.so
+VNDK-SP: android.hardware.graphics.common-V3-ndk.so
+VNDK-SP: android.hardware.graphics.common@1.0.so
+VNDK-SP: android.hardware.graphics.common@1.1.so
+VNDK-SP: android.hardware.graphics.common@1.2.so
+VNDK-SP: android.hardware.graphics.composer3-V1-ndk.so
+VNDK-SP: android.hardware.graphics.mapper@2.0.so
+VNDK-SP: android.hardware.graphics.mapper@2.1.so
+VNDK-SP: android.hardware.graphics.mapper@3.0.so
+VNDK-SP: android.hardware.graphics.mapper@4.0.so
+VNDK-SP: android.hardware.renderscript@1.0.so
+VNDK-SP: android.hidl.memory.token@1.0.so
+VNDK-SP: android.hidl.memory@1.0-impl.so
+VNDK-SP: android.hidl.memory@1.0.so
+VNDK-SP: android.hidl.safe_union@1.0.so
+VNDK-SP: libRSCpuRef.so
+VNDK-SP: libRSDriver.so
+VNDK-SP: libRS_internal.so
+VNDK-SP: libbacktrace.so
+VNDK-SP: libbase.so
+VNDK-SP: libbcinfo.so
+VNDK-SP: libblas.so
+VNDK-SP: libc++.so
+VNDK-SP: libcompiler_rt.so
+VNDK-SP: libcutils.so
+VNDK-SP: libdmabufheap.so
+VNDK-SP: libgralloctypes.so
+VNDK-SP: libhardware.so
+VNDK-SP: libhidlbase.so
+VNDK-SP: libhidlmemory.so
+VNDK-SP: libion.so
+VNDK-SP: libjsoncpp.so
+VNDK-SP: liblzma.so
+VNDK-SP: libprocessgroup.so
+VNDK-SP: libunwindstack.so
+VNDK-SP: libutils.so
+VNDK-SP: libutilscallstack.so
+VNDK-SP: libz.so
+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.camera.common-V1-ndk.so
+VNDK-core: android.hardware.camera.device-V1-ndk.so
+VNDK-core: android.hardware.camera.metadata-V1-ndk.so
+VNDK-core: android.hardware.camera.provider-V1-ndk.so
+VNDK-core: android.hardware.configstore-utils.so
+VNDK-core: android.hardware.configstore@1.0.so
+VNDK-core: android.hardware.configstore@1.1.so
+VNDK-core: android.hardware.confirmationui-support-lib.so
+VNDK-core: android.hardware.drm-V1-ndk.so
+VNDK-core: android.hardware.dumpstate-V1-ndk.so
+VNDK-core: android.hardware.gnss-V2-ndk.so
+VNDK-core: android.hardware.graphics.allocator@2.0.so
+VNDK-core: android.hardware.graphics.allocator@3.0.so
+VNDK-core: android.hardware.graphics.allocator@4.0.so
+VNDK-core: android.hardware.graphics.bufferqueue@1.0.so
+VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
+VNDK-core: android.hardware.health-V1-ndk.so
+VNDK-core: android.hardware.health.storage-V1-ndk.so
+VNDK-core: android.hardware.identity-V4-ndk.so
+VNDK-core: android.hardware.ir-V1-ndk.so
+VNDK-core: android.hardware.keymaster-V3-ndk.so
+VNDK-core: android.hardware.light-V1-ndk.so
+VNDK-core: android.hardware.media.bufferpool@2.0.so
+VNDK-core: android.hardware.media.omx@1.0.so
+VNDK-core: android.hardware.media@1.0.so
+VNDK-core: android.hardware.memtrack-V1-ndk.so
+VNDK-core: android.hardware.memtrack@1.0.so
+VNDK-core: android.hardware.nfc-V1-ndk.so
+VNDK-core: android.hardware.oemlock-V1-ndk.so
+VNDK-core: android.hardware.power-V2-ndk.so
+VNDK-core: android.hardware.power.stats-V1-ndk.so
+VNDK-core: android.hardware.radio-V1-ndk.so
+VNDK-core: android.hardware.radio.config-V1-ndk.so
+VNDK-core: android.hardware.radio.data-V1-ndk.so
+VNDK-core: android.hardware.radio.messaging-V1-ndk.so
+VNDK-core: android.hardware.radio.modem-V1-ndk.so
+VNDK-core: android.hardware.radio.network-V1-ndk.so
+VNDK-core: android.hardware.radio.sim-V1-ndk.so
+VNDK-core: android.hardware.radio.voice-V1-ndk.so
+VNDK-core: android.hardware.rebootescrow-V1-ndk.so
+VNDK-core: android.hardware.security.dice-V1-ndk.so
+VNDK-core: android.hardware.security.keymint-V2-ndk.so
+VNDK-core: android.hardware.security.secureclock-V1-ndk.so
+VNDK-core: android.hardware.security.sharedsecret-V1-ndk.so
+VNDK-core: android.hardware.sensors-V1-ndk.so
+VNDK-core: android.hardware.soundtrigger3-V1-ndk.so
+VNDK-core: android.hardware.soundtrigger@2.0-core.so
+VNDK-core: android.hardware.soundtrigger@2.0.so
+VNDK-core: android.hardware.usb-V1-ndk.so
+VNDK-core: android.hardware.uwb-V1-ndk.so
+VNDK-core: android.hardware.vibrator-V2-ndk.so
+VNDK-core: android.hardware.weaver-V1-ndk.so
+VNDK-core: android.hardware.wifi.hostapd-V1-ndk.so
+VNDK-core: android.hardware.wifi.supplicant-V1-ndk.so
+VNDK-core: android.hidl.token@1.0-utils.so
+VNDK-core: android.hidl.token@1.0.so
+VNDK-core: android.media.audio.common.types-V1-ndk.so
+VNDK-core: android.media.soundtrigger.types-V1-ndk.so
+VNDK-core: android.system.keystore2-V2-ndk.so
+VNDK-core: android.system.suspend-V1-ndk.so
+VNDK-core: android.system.suspend@1.0.so
+VNDK-core: libaudioroute.so
+VNDK-core: libaudioutils.so
+VNDK-core: libbinder.so
+VNDK-core: libbufferqueueconverter.so
+VNDK-core: libcamera_metadata.so
+VNDK-core: libcap.so
+VNDK-core: libcn-cbor.so
+VNDK-core: libcodec2.so
+VNDK-core: libcrypto.so
+VNDK-core: libcrypto_utils.so
+VNDK-core: libcurl.so
+VNDK-core: libdiskconfig.so
+VNDK-core: libdumpstateutil.so
+VNDK-core: libevent.so
+VNDK-core: libexif.so
+VNDK-core: libexpat.so
+VNDK-core: libfmq.so
+VNDK-core: libgatekeeper.so
+VNDK-core: libgui.so
+VNDK-core: libhardware_legacy.so
+VNDK-core: libhidlallocatorutils.so
+VNDK-core: libjpeg.so
+VNDK-core: libldacBT_abr.so
+VNDK-core: libldacBT_enc.so
+VNDK-core: liblz4.so
+VNDK-core: libmedia_helper.so
+VNDK-core: libmedia_omx.so
+VNDK-core: libmemtrack.so
+VNDK-core: libminijail.so
+VNDK-core: libmkbootimg_abi_check.so
+VNDK-core: libnetutils.so
+VNDK-core: libnl.so
+VNDK-core: libpcre2.so
+VNDK-core: libpiex.so
+VNDK-core: libpng.so
+VNDK-core: libpower.so
+VNDK-core: libprocinfo.so
+VNDK-core: libradio_metadata.so
+VNDK-core: libspeexresampler.so
+VNDK-core: libsqlite.so
+VNDK-core: libssl.so
+VNDK-core: libstagefright_bufferpool@2.0.so
+VNDK-core: libstagefright_bufferqueue_helper.so
+VNDK-core: libstagefright_foundation.so
+VNDK-core: libstagefright_omx.so
+VNDK-core: libstagefright_omx_utils.so
+VNDK-core: libstagefright_xmlparser.so
+VNDK-core: libsysutils.so
+VNDK-core: libtinyalsa.so
+VNDK-core: libtinyxml2.so
+VNDK-core: libui.so
+VNDK-core: libusbhost.so
+VNDK-core: libwifi-system-iface.so
+VNDK-core: libxml2.so
+VNDK-core: libyuv.so
+VNDK-core: libziparchive.so
+VNDK-private: libbacktrace.so
+VNDK-private: libblas.so
+VNDK-private: libcompiler_rt.so
+VNDK-private: libft2.so
+VNDK-private: libgui.so
+VNDK-product: android.hardware.audio.common@2.0.so
+VNDK-product: android.hardware.configstore@1.0.so
+VNDK-product: android.hardware.configstore@1.1.so
+VNDK-product: android.hardware.graphics.allocator@2.0.so
+VNDK-product: android.hardware.graphics.allocator@3.0.so
+VNDK-product: android.hardware.graphics.allocator@4.0.so
+VNDK-product: android.hardware.graphics.bufferqueue@1.0.so
+VNDK-product: android.hardware.graphics.bufferqueue@2.0.so
+VNDK-product: android.hardware.graphics.common@1.0.so
+VNDK-product: android.hardware.graphics.common@1.1.so
+VNDK-product: android.hardware.graphics.common@1.2.so
+VNDK-product: android.hardware.graphics.mapper@2.0.so
+VNDK-product: android.hardware.graphics.mapper@2.1.so
+VNDK-product: android.hardware.graphics.mapper@3.0.so
+VNDK-product: android.hardware.graphics.mapper@4.0.so
+VNDK-product: android.hardware.media.bufferpool@2.0.so
+VNDK-product: android.hardware.media.omx@1.0.so
+VNDK-product: android.hardware.media@1.0.so
+VNDK-product: android.hardware.memtrack@1.0.so
+VNDK-product: android.hardware.renderscript@1.0.so
+VNDK-product: android.hardware.soundtrigger@2.0.so
+VNDK-product: android.hidl.memory.token@1.0.so
+VNDK-product: android.hidl.memory@1.0.so
+VNDK-product: android.hidl.safe_union@1.0.so
+VNDK-product: android.hidl.token@1.0.so
+VNDK-product: android.system.suspend@1.0.so
+VNDK-product: libaudioutils.so
+VNDK-product: libbacktrace.so
+VNDK-product: libbase.so
+VNDK-product: libc++.so
+VNDK-product: libcamera_metadata.so
+VNDK-product: libcap.so
+VNDK-product: libcompiler_rt.so
+VNDK-product: libcrypto.so
+VNDK-product: libcurl.so
+VNDK-product: libcutils.so
+VNDK-product: libevent.so
+VNDK-product: libexpat.so
+VNDK-product: libfmq.so
+VNDK-product: libhidlbase.so
+VNDK-product: libhidlmemory.so
+VNDK-product: libion.so
+VNDK-product: libjpeg.so
+VNDK-product: libjsoncpp.so
+VNDK-product: libldacBT_abr.so
+VNDK-product: libldacBT_enc.so
+VNDK-product: liblz4.so
+VNDK-product: liblzma.so
+VNDK-product: libminijail.so
+VNDK-product: libnl.so
+VNDK-product: libpcre2.so
+VNDK-product: libpiex.so
+VNDK-product: libpng.so
+VNDK-product: libprocessgroup.so
+VNDK-product: libprocinfo.so
+VNDK-product: libspeexresampler.so
+VNDK-product: libssl.so
+VNDK-product: libtinyalsa.so
+VNDK-product: libtinyxml2.so
+VNDK-product: libunwindstack.so
+VNDK-product: libutils.so
+VNDK-product: libutilscallstack.so
+VNDK-product: libwifi-system-iface.so
+VNDK-product: libxml2.so
+VNDK-product: libyuv.so
+VNDK-product: libz.so
+VNDK-product: libziparchive.so

From 69e6d821064b1299c6cbfa94c24c89c649d83f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Melisa=20Carranza=20Z=C3=BA=C3=B1iga?= <melisacz@google.com>
Date: Tue, 12 Apr 2022 23:22:11 +0000
Subject: [PATCH 326/425] Revert "Merge "Adding sepolicy sign params to
 sign_target_files_apks." am: fb042449e0 am: bd8c313275 am: a2db49becd"

This reverts commit 6e6c22c70e48e9d4fe830fe0c5b9c47618bd116a.

Reason for revert: Updateable SEPolicy is punted.

Change-Id: I99524d13811028a4036aa85c74cf10974fe08165
---
 tools/releasetools/common.py                  |  1 -
 tools/releasetools/sign_apex.py               |  3 +-
 tools/releasetools/sign_target_files_apks.py  | 90 +++----------------
 .../test_sign_target_files_apks.py            | 80 ++---------------
 4 files changed, 16 insertions(+), 158 deletions(-)

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 2f46576fc7..bf9fa6ccf9 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -97,7 +97,6 @@ class Options(object):
     self.stash_threshold = 0.8
     self.logfile = None
     self.host_tools = {}
-    self.sepolicy_name = 'sepolicy.apex'
 
 
 OPTIONS = Options()
diff --git a/tools/releasetools/sign_apex.py b/tools/releasetools/sign_apex.py
index a68f1eca4a..722359b2d2 100755
--- a/tools/releasetools/sign_apex.py
+++ b/tools/releasetools/sign_apex.py
@@ -61,7 +61,6 @@ import apex_utils
 import common
 
 logger = logging.getLogger(__name__)
-OPTIONS = common.OPTIONS
 
 
 def SignApexFile(avbtool, apex_file, payload_key, container_key, no_hashtree,
@@ -82,7 +81,7 @@ def SignApexFile(avbtool, apex_file, payload_key, container_key, no_hashtree,
       apk_keys=apk_keys,
       signing_args=signing_args,
       sign_tool=sign_tool,
-      is_sepolicy=apex_file.endswith(OPTIONS.sepolicy_name),
+      is_sepolicy=apex_file.endswith("sepolicy.apex"),
       sepolicy_key=sepolicy_key,
       sepolicy_cert=sepolicy_cert,
       fsverity_tool=fsverity_tool)
diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
index 5f46ae06c9..fc6afb1c56 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -137,15 +137,6 @@ Usage:  sign_target_files_apks [flags] input_target_files output_target_files
   --android_jar_path <path>
       Path to the android.jar to repack the apex file.
 
-  --sepolicy_key <key>
-      Optional flag that specifies the sepolicy signing key, defaults to payload_key for the sepolicy.apex.
-
-  --sepolicy_cert <cert>
-      Optional flag that specifies the sepolicy signing cert.
-
-  --fsverity_tool <path>
-      Optional flag that specifies the path to fsverity tool to sign SEPolicy, defaults to fsverity.
-
   --allow_gsi_debug_sepolicy
       Allow the existence of the file 'userdebug_plat_sepolicy.cil' under
       (/system/system_ext|/system_ext)/etc/selinux.
@@ -205,9 +196,6 @@ OPTIONS.gki_signing_extra_args = None
 OPTIONS.android_jar_path = None
 OPTIONS.vendor_partitions = set()
 OPTIONS.vendor_otatools = None
-OPTIONS.sepolicy_key = None
-OPTIONS.sepolicy_cert = None
-OPTIONS.fsverity_tool = None
 OPTIONS.allow_gsi_debug_sepolicy = False
 
 
@@ -246,8 +234,6 @@ ALLOWED_VENDOR_PARTITIONS = set(["vendor", "odm"])
 def IsApexFile(filename):
   return filename.endswith(".apex") or filename.endswith(".capex")
 
-def IsSepolicyApex(filename):
-  return filename.endswith(OPTIONS.sepolicy_name)
 
 def GetApexFilename(filename):
   name = os.path.basename(filename)
@@ -270,24 +256,6 @@ def GetApkCerts(certmap):
 
   return certmap
 
-def GetSepolicyKeys(keys_info):
-  """Gets SEPolicy signing keys applying overrides from command line options.
-
-  Args:
-    keys_info: A dict that maps from the SEPolicy APEX filename to a tuple of
-    (sepolicy_key, sepolicy_cert, fsverity_tool).
-
-  Returns:
-    A dict that contains the updated APEX key mapping, which should be used for
-    the current signing.
-  """
-  for name in keys_info:
-      (sepolicy_key, sepolicy_cert, fsverity_tool) = keys_info[name]
-      sepolicy_key = OPTIONS.sepolicy_key if OPTIONS.sepolicy_key else sepolicy_key
-      sepolicy_cert = OPTIONS.sepolicy_cert if OPTIONS.sepolicy_cert else sepolicy_cert
-      fsverity_tool = OPTIONS.fsverity_tool if OPTIONS.fsverity_tool else fsverity_tool
-      keys_info[name] = (sepolicy_key, sepolicy_cert, fsverity_tool)
-  return keys_info
 
 def GetApexKeys(keys_info, key_map):
   """Gets APEX payload and container signing keys by applying the mapping rules.
@@ -550,7 +518,7 @@ def IsBuildPropFile(filename):
 def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
                        apk_keys, apex_keys, key_passwords,
                        platform_api_level, codename_to_api_level_map,
-                       compressed_extension, sepolicy_keys):
+                       compressed_extension):
   # maxsize measures the maximum filename length, including the ones to be
   # skipped.
   try:
@@ -618,17 +586,6 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
         print("           : %-*s payload   (%s)" % (
             maxsize, name, payload_key))
 
-        sepolicy_key = None
-        sepolicy_cert = None
-        fsverity_tool = None
-
-        if IsSepolicyApex(name):
-          (sepolicy_key, sepolicy_cert, fsverity_tool) = sepolicy_keys[name]
-          print("           : %-*s sepolicy key   (%s)" % (
-            maxsize, name, sepolicy_key))
-          print("           : %-*s sepolicy cert  (%s)" % (
-            maxsize, name, sepolicy_cert))
-
         signed_apex = apex_utils.SignApex(
             misc_info['avb_avbtool'],
             data,
@@ -639,11 +596,7 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
             codename_to_api_level_map,
             no_hashtree=None,  # Let apex_util determine if hash tree is needed
             signing_args=OPTIONS.avb_extra_args.get('apex'),
-            sign_tool=sign_tool,
-            is_sepolicy=IsSepolicyApex(name),
-            sepolicy_key=sepolicy_key,
-            sepolicy_cert=sepolicy_cert,
-            fsverity_tool=fsverity_tool)
+            sign_tool=sign_tool)
         common.ZipWrite(output_tf_zip, signed_apex, filename)
 
       else:
@@ -1253,24 +1206,20 @@ def GetCodenameToApiLevelMap(input_tf_zip):
 def ReadApexKeysInfo(tf_zip):
   """Parses the APEX keys info from a given target-files zip.
 
-  Given a target-files ZipFile, parses the META/apexkeys.txt entry and returns
-  two dicts, the first one contains the mapping from APEX names
-  (e.g. com.android.tzdata) to a tuple of (payload_key, container_key,
-  sign_tool). The second one maps the sepolicy APEX name to a tuple containing
-  (sepolicy_key, sepolicy_cert, fsverity_tool).
+  Given a target-files ZipFile, parses the META/apexkeys.txt entry and returns a
+  dict that contains the mapping from APEX names (e.g. com.android.tzdata) to a
+  tuple of (payload_key, container_key, sign_tool).
 
   Args:
     tf_zip: The input target_files ZipFile (already open).
 
   Returns:
-    name : (payload_key, container_key, sign_tool)
+    (payload_key, container_key, sign_tool):
       - payload_key contains the path to the payload signing key
       - container_key contains the path to the container signing key
       - sign_tool is an apex-specific signing tool for its payload contents
-    name : (sepolicy_key, sepolicy_cert, fsverity_tool)
   """
   keys = {}
-  sepolicy_keys = {}
   for line in tf_zip.read('META/apexkeys.txt').decode().split('\n'):
     line = line.strip()
     if not line:
@@ -1281,9 +1230,6 @@ def ReadApexKeysInfo(tf_zip):
         r'private_key="(?P<PAYLOAD_PRIVATE_KEY>.*)"\s+'
         r'container_certificate="(?P<CONTAINER_CERT>.*)"\s+'
         r'container_private_key="(?P<CONTAINER_PRIVATE_KEY>.*?)"'
-        r'(\s+sepolicy_key="(?P<SEPOLICY_KEY>.*?)")?'
-        r'(\s+sepolicy_certificate="(?P<SEPOLICY_CERT>.*?)")?'
-        r'(\s+fsverity_tool="(?P<FSVERITY_TOOL>.*?)")?'
         r'(\s+partition="(?P<PARTITION>.*?)")?'
         r'(\s+sign_tool="(?P<SIGN_TOOL>.*?)")?$',
         line)
@@ -1312,18 +1258,12 @@ def ReadApexKeysInfo(tf_zip):
             container_private_key, OPTIONS.private_key_suffix):
       container_key = container_cert[:-len(OPTIONS.public_key_suffix)]
     else:
-      raise ValueError("Failed to parse container keys: \n{} **** {}".format(container_cert, container_private_key))
+      raise ValueError("Failed to parse container keys: \n{}".format(line))
 
     sign_tool = matches.group("SIGN_TOOL")
     keys[name] = (payload_private_key, container_key, sign_tool)
 
-    if IsSepolicyApex(name):
-      sepolicy_key = matches.group('SEPOLICY_KEY')
-      sepolicy_cert = matches.group('SEPOLICY_CERT')
-      fsverity_tool = matches.group('FSVERITY_TOOL')
-      sepolicy_keys[name] = (sepolicy_key, sepolicy_cert, fsverity_tool)
-
-  return keys, sepolicy_keys
+  return keys
 
 
 def BuildVendorPartitions(output_zip_path):
@@ -1541,12 +1481,6 @@ def main(argv):
       OPTIONS.vendor_otatools = a
     elif o == "--vendor_partitions":
       OPTIONS.vendor_partitions = set(a.split(","))
-    elif o == '--sepolicy_key':
-      OPTIONS.sepolicy_key = a
-    elif o == '--sepolicy_cert':
-      OPTIONS.sepolicy_cert = a
-    elif o == '--fsverity_tool':
-      OPTIONS.fsverity_tool = a
     elif o == "--allow_gsi_debug_sepolicy":
       OPTIONS.allow_gsi_debug_sepolicy = True
     else:
@@ -1604,9 +1538,6 @@ def main(argv):
           "gki_signing_extra_args=",
           "vendor_partitions=",
           "vendor_otatools=",
-          "sepolicy_key=",
-          "sepolicy_cert=",
-          "fsverity_tool=",
           "allow_gsi_debug_sepolicy",
       ],
       extra_option_handler=option_handler)
@@ -1629,9 +1560,8 @@ def main(argv):
   apk_keys_info, compressed_extension = common.ReadApkCerts(input_zip)
   apk_keys = GetApkCerts(apk_keys_info)
 
-  apex_keys_info, sepolicy_keys_info = ReadApexKeysInfo(input_zip)
+  apex_keys_info = ReadApexKeysInfo(input_zip)
   apex_keys = GetApexKeys(apex_keys_info, apk_keys)
-  sepolicy_keys = GetSepolicyKeys(sepolicy_keys_info)
 
   # TODO(xunchang) check for the apks inside the apex files, and abort early if
   # the keys are not available.
@@ -1649,7 +1579,7 @@ def main(argv):
   ProcessTargetFiles(input_zip, output_zip, misc_info,
                      apk_keys, apex_keys, key_passwords,
                      platform_api_level, codename_to_api_level_map,
-                     compressed_extension, sepolicy_keys)
+                     compressed_extension)
 
   common.ZipClose(input_zip)
   common.ZipClose(output_zip)
diff --git a/tools/releasetools/test_sign_target_files_apks.py b/tools/releasetools/test_sign_target_files_apks.py
index 144a3cd460..0f13add290 100644
--- a/tools/releasetools/test_sign_target_files_apks.py
+++ b/tools/releasetools/test_sign_target_files_apks.py
@@ -476,7 +476,7 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
       target_files_zip.writestr('META/apexkeys.txt', self.APEX_KEYS_TXT)
 
     with zipfile.ZipFile(target_files, allowZip64=True) as target_files_zip:
-      keys_info, sepolicy_keys_info = ReadApexKeysInfo(target_files_zip)
+      keys_info = ReadApexKeysInfo(target_files_zip)
 
     self.assertEqual({
         'apex.apexd_test.apex': (
@@ -486,7 +486,6 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
             'system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem',
             'build/make/target/product/security/testkey', None),
         }, keys_info)
-    self.assertEqual({}, sepolicy_keys_info)
 
   def test_ReadApexKeysInfo_mismatchingContainerKeys(self):
     # Mismatching payload public / private keys.
@@ -516,7 +515,7 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
       target_files_zip.writestr('META/apexkeys.txt', apex_keys)
 
     with zipfile.ZipFile(target_files, allowZip64=True) as target_files_zip:
-      keys_info, sepolicy_keys_info = ReadApexKeysInfo(target_files_zip)
+      keys_info = ReadApexKeysInfo(target_files_zip)
 
     self.assertEqual({
         'apex.apexd_test.apex': (
@@ -526,7 +525,6 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
             'system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem',
             'build/make/target/product/security/testkey', None),
         }, keys_info)
-    self.assertEqual({}, sepolicy_keys_info)
 
   def test_ReadApexKeysInfo_missingPayloadPublicKey(self):
     # Invalid lines will be skipped.
@@ -540,7 +538,7 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
       target_files_zip.writestr('META/apexkeys.txt', apex_keys)
 
     with zipfile.ZipFile(target_files, allowZip64=True) as target_files_zip:
-      keys_info, sepolicy_keys_info = ReadApexKeysInfo(target_files_zip)
+      keys_info = ReadApexKeysInfo(target_files_zip)
 
     self.assertEqual({
         'apex.apexd_test.apex': (
@@ -550,7 +548,6 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
             'system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem',
             'build/make/target/product/security/testkey', None),
         }, keys_info)
-    self.assertEqual({}, sepolicy_keys_info)
 
   def test_ReadApexKeysInfo_presignedKeys(self):
     apex_keys = self.APEX_KEYS_TXT + (
@@ -564,7 +561,7 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
       target_files_zip.writestr('META/apexkeys.txt', apex_keys)
 
     with zipfile.ZipFile(target_files, allowZip64=True) as target_files_zip:
-      keys_info, sepolicy_keys_info = ReadApexKeysInfo(target_files_zip)
+      keys_info = ReadApexKeysInfo(target_files_zip)
 
     self.assertEqual({
         'apex.apexd_test.apex': (
@@ -574,7 +571,6 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
             'system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem',
             'build/make/target/product/security/testkey', None),
         }, keys_info)
-    self.assertEqual({}, sepolicy_keys_info)
 
   def test_ReadApexKeysInfo_presignedKeys(self):
     apex_keys = self.APEX_KEYS_TXT + (
@@ -588,7 +584,7 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
       target_files_zip.writestr('META/apexkeys.txt', apex_keys)
 
     with zipfile.ZipFile(target_files, allowZip64=True) as target_files_zip:
-      keys_info, sepolicy_keys_info = ReadApexKeysInfo(target_files_zip)
+      keys_info = ReadApexKeysInfo(target_files_zip)
 
     self.assertEqual({
         'apex.apexd_test.apex': (
@@ -598,72 +594,6 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
             'system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem',
             'build/make/target/product/security/testkey', None),
         }, keys_info)
-    self.assertEqual({}, sepolicy_keys_info)
-
-  def test_ReadApexKeysInfo_withSepolicyKeys(self):
-    apex_keys = self.APEX_KEYS_TXT + (
-        'name="sepolicy.apex" '
-        'public_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.avbpubkey" '
-        'private_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem" '
-        'container_certificate="build/make/target/product/security/testkey.x509.pem" '
-        'container_private_key="build/make/target/product/security/testkey.pk8" '
-        'sepolicy_key="build/make/target/product/security/testkey.key" '
-        'sepolicy_certificate="build/make/target/product/security/testkey.x509.pem" '
-        'fsverity_tool="fsverity"')
-    target_files = common.MakeTempFile(suffix='.zip')
-    with zipfile.ZipFile(target_files, 'w', allowZip64=True) as target_files_zip:
-      target_files_zip.writestr('META/apexkeys.txt', apex_keys)
-
-    with zipfile.ZipFile(target_files, allowZip64=True) as target_files_zip:
-      keys_info, sepolicy_keys_info = ReadApexKeysInfo(target_files_zip)
-
-    self.assertEqual({
-        'apex.apexd_test.apex': (
-            'system/apex/apexd/apexd_testdata/com.android.apex.test_package.pem',
-            'build/make/target/product/security/testkey', None),
-        'apex.apexd_test_different_app.apex': (
-            'system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem',
-            'build/make/target/product/security/testkey', None),
-        'sepolicy.apex': (
-            'system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem',
-            'build/make/target/product/security/testkey', None),
-        }, keys_info)
-    self.assertEqual({'sepolicy.apex': (
-            'build/make/target/product/security/testkey.key',
-            'build/make/target/product/security/testkey.x509.pem',
-            'fsverity'),
-        }, sepolicy_keys_info)
-
-  def test_ReadApexKeysInfo_withSepolicyApex(self):
-    apex_keys = self.APEX_KEYS_TXT + (
-        'name="sepolicy.apex" '
-        'public_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.avbpubkey" '
-        'private_key="system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem" '
-        'container_certificate="build/make/target/product/security/testkey.x509.pem" '
-        'container_private_key="build/make/target/product/security/testkey.pk8" ')
-    target_files = common.MakeTempFile(suffix='.zip')
-    with zipfile.ZipFile(target_files, 'w', allowZip64=True) as target_files_zip:
-      target_files_zip.writestr('META/apexkeys.txt', apex_keys)
-
-    with zipfile.ZipFile(target_files, allowZip64=True) as target_files_zip:
-      keys_info, sepolicy_keys_info = ReadApexKeysInfo(target_files_zip)
-
-    self.assertEqual({
-        'apex.apexd_test.apex': (
-            'system/apex/apexd/apexd_testdata/com.android.apex.test_package.pem',
-            'build/make/target/product/security/testkey', None),
-        'apex.apexd_test_different_app.apex': (
-            'system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem',
-            'build/make/target/product/security/testkey', None),
-        'sepolicy.apex': (
-            'system/apex/apexd/apexd_testdata/com.android.apex.test_package_2.pem',
-            'build/make/target/product/security/testkey', None),
-        }, keys_info)
-    self.assertEqual({'sepolicy.apex': (
-            None,
-            None,
-            None),
-        }, sepolicy_keys_info)
 
   def test_ReplaceGkiSigningKey(self):
     common.OPTIONS.gki_signing_key = 'release_gki_key'

From 96afaa200106f958f8623a44d040b9d58177e57e Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 13 Apr 2022 00:27:06 +0000
Subject: [PATCH 327/425] Version bump to TP1A.220412.002 [core/build_id.mk]

Change-Id: Ie413d967d8e5b715a36882d631e9c40c589cb5be
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 1724d69b50..c1217a84f7 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=TP1A.220412.001
+BUILD_ID=TP1A.220412.002

From b0202fb4ec4b4bb4ba54f8b6b18295d25f60f3e9 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 13 Apr 2022 02:27:18 +0000
Subject: [PATCH 328/425] Version bump to TP1A.220413.002 [core/build_id.mk]

Change-Id: I4e8878eef1505c29d7b3a039e03943555ea2f69a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 39eabaa2ca..3ae93646d7 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=TP1A.220413.001
+BUILD_ID=TP1A.220413.002

From 61e1dd0da5380642e3a642eef8a5c4009fb11257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Melisa=20Carranza=20Z=C3=BA=C3=B1iga?= <melisacz@google.com>
Date: Wed, 13 Apr 2022 16:23:45 +0000
Subject: [PATCH 329/425] Revert "Merge "Adding flags and logic to sign
 updateable SEPolicy in APEX" am: 77c1dfa6d9 am: 5a0d81a0be am: 54e08307dc"

This reverts commit 8fe9e3a2c72db9d23b60678b530a501dc29ff4dd.

Reason for revert: Updateable SEPolicy is punted.

Change-Id: I28ae2afbb1083e215f4e0a27a9164133cd73dd76
---
 tools/releasetools/apex_utils.py          | 100 ++++------------------
 tools/releasetools/sign_apex.py           |  32 +------
 tools/releasetools/test_sign_apex.py      |  18 ----
 tools/releasetools/testdata/sepolicy.apex | Bin 303104 -> 0 bytes
 4 files changed, 18 insertions(+), 132 deletions(-)
 delete mode 100644 tools/releasetools/testdata/sepolicy.apex

diff --git a/tools/releasetools/apex_utils.py b/tools/releasetools/apex_utils.py
index 69d6c137f1..2a39f656df 100644
--- a/tools/releasetools/apex_utils.py
+++ b/tools/releasetools/apex_utils.py
@@ -54,7 +54,7 @@ class ApexSigningError(Exception):
 class ApexApkSigner(object):
   """Class to sign the apk files and other files in an apex payload image and repack the apex"""
 
-  def __init__(self, apex_path, key_passwords, codename_to_api_level_map, avbtool=None, sign_tool=None, fsverity_tool=None):
+  def __init__(self, apex_path, key_passwords, codename_to_api_level_map, avbtool=None, sign_tool=None):
     self.apex_path = apex_path
     if not key_passwords:
       self.key_passwords = dict()
@@ -65,9 +65,8 @@ class ApexApkSigner(object):
         OPTIONS.search_path, "bin", "debugfs_static")
     self.avbtool = avbtool if avbtool else "avbtool"
     self.sign_tool = sign_tool
-    self.fsverity_tool = fsverity_tool if fsverity_tool else "fsverity"
 
-  def ProcessApexFile(self, apk_keys, payload_key, signing_args=None, is_sepolicy=False, sepolicy_key=None, sepolicy_cert=None):
+  def ProcessApexFile(self, apk_keys, payload_key, signing_args=None):
     """Scans and signs the payload files and repack the apex
 
     Args:
@@ -85,14 +84,10 @@ class ApexApkSigner(object):
                 self.debugfs_path, 'list', self.apex_path]
     entries_names = common.RunAndCheckOutput(list_cmd).split()
     apk_entries = [name for name in entries_names if name.endswith('.apk')]
-    sepolicy_entries = []
-    if is_sepolicy:
-      sepolicy_entries = [name for name in entries_names if
-          name.startswith('./etc/SEPolicy') and name.endswith('.zip')]
 
     # No need to sign and repack, return the original apex path.
-    if not apk_entries and not sepolicy_entries and self.sign_tool is None:
-      logger.info('No payload (apk or zip) file to sign in %s', self.apex_path)
+    if not apk_entries and self.sign_tool is None:
+      logger.info('No apk file to sign in %s', self.apex_path)
       return self.apex_path
 
     for entry in apk_entries:
@@ -106,16 +101,15 @@ class ApexApkSigner(object):
         logger.warning('Apk path does not contain the intended directory name:'
                        ' %s', entry)
 
-    payload_dir, has_signed_content = self.ExtractApexPayloadAndSignContents(apk_entries,
-        apk_keys, payload_key, sepolicy_entries, sepolicy_key, sepolicy_cert, signing_args)
+    payload_dir, has_signed_content = self.ExtractApexPayloadAndSignContents(
+        apk_entries, apk_keys, payload_key, signing_args)
     if not has_signed_content:
       logger.info('No contents has been signed in %s', self.apex_path)
       return self.apex_path
 
     return self.RepackApexPayload(payload_dir, payload_key, signing_args)
 
-  def ExtractApexPayloadAndSignContents(self, apk_entries, apk_keys, payload_key,
-  sepolicy_entries, sepolicy_key, sepolicy_cert, signing_args):
+  def ExtractApexPayloadAndSignContents(self, apk_entries, apk_keys, payload_key, signing_args):
     """Extracts the payload image and signs the containing apk files."""
     if not os.path.exists(self.debugfs_path):
       raise ApexSigningError(
@@ -147,11 +141,6 @@ class ApexApkSigner(object):
           codename_to_api_level_map=self.codename_to_api_level_map)
       has_signed_content = True
 
-    for entry in sepolicy_entries:
-      sepolicy_key = sepolicy_key if sepolicy_key else payload_key
-      self.SignSePolicy(payload_dir, entry, sepolicy_key, sepolicy_cert)
-      has_signed_content = True
-
     if self.sign_tool:
       logger.info('Signing payload contents in apex %s with %s', self.apex_path, self.sign_tool)
       # Pass avbtool to the custom signing tool
@@ -165,36 +154,6 @@ class ApexApkSigner(object):
 
     return payload_dir, has_signed_content
 
-  def SignSePolicy(self, payload_dir, sepolicy_zip, sepolicy_key, sepolicy_cert):
-    sepolicy_sig = sepolicy_zip + '.sig'
-    sepolicy_fsv_sig = sepolicy_zip + '.fsv_sig'
-
-    policy_zip_path = os.path.join(payload_dir, sepolicy_zip)
-    sig_out_path = os.path.join(payload_dir, sepolicy_sig)
-    sig_old = sig_out_path + '.old'
-    if os.path.exists(sig_out_path):
-      os.rename(sig_out_path, sig_old)
-    sign_cmd = ['openssl', 'dgst', '-sign', sepolicy_key, '-keyform', 'PEM', '-sha256',
-        '-out', sig_out_path, '-binary', policy_zip_path]
-    common.RunAndCheckOutput(sign_cmd)
-    if os.path.exists(sig_old):
-      os.remove(sig_old)
-
-    if not sepolicy_cert:
-      logger.info('No cert provided for SEPolicy, skipping fsverity sign')
-      return
-
-    fsv_sig_out_path = os.path.join(payload_dir, sepolicy_fsv_sig)
-    fsv_sig_old = fsv_sig_out_path + '.old'
-    if os.path.exists(fsv_sig_out_path):
-      os.rename(fsv_sig_out_path, fsv_sig_old)
-
-    fsverity_cmd = [self.fsverity_tool, 'sign', policy_zip_path, fsv_sig_out_path,
-        '--key=' + sepolicy_key, '--cert=' + sepolicy_cert]
-    common.RunAndCheckOutput(fsverity_cmd)
-    if os.path.exists(fsv_sig_old):
-      os.remove(fsv_sig_old)
-
   def RepackApexPayload(self, payload_dir, payload_key, signing_args=None):
     """Rebuilds the apex file with the updated payload directory."""
     apex_dir = common.MakeTempDir()
@@ -365,9 +324,7 @@ def ParseApexPayloadInfo(avbtool, payload_path):
 
 def SignUncompressedApex(avbtool, apex_file, payload_key, container_key,
                          container_pw, apk_keys, codename_to_api_level_map,
-                         no_hashtree, signing_args=None, sign_tool=None,
-                         is_sepolicy=False, sepolicy_key=None, sepolicy_cert=None,
-                         fsverity_tool=None):
+                         no_hashtree, signing_args=None, sign_tool=None):
   """Signs the current uncompressed APEX with the given payload/container keys.
 
   Args:
@@ -380,10 +337,6 @@ def SignUncompressedApex(avbtool, apex_file, payload_key, container_key,
     no_hashtree: Don't include hashtree in the signed APEX.
     signing_args: Additional args to be passed to the payload signer.
     sign_tool: A tool to sign the contents of the APEX.
-    is_sepolicy: Indicates if the apex is a sepolicy.apex
-    sepolicy_key: Key to sign a sepolicy zip.
-    sepolicy_cert: Cert to sign a sepolicy zip.
-    fsverity_tool: fsverity path to sign sepolicy zip.
 
   Returns:
     The path to the signed APEX file.
@@ -392,9 +345,8 @@ def SignUncompressedApex(avbtool, apex_file, payload_key, container_key,
   # the apex file after signing.
   apk_signer = ApexApkSigner(apex_file, container_pw,
                              codename_to_api_level_map,
-                             avbtool, sign_tool, fsverity_tool)
-  apex_file = apk_signer.ProcessApexFile(
-      apk_keys, payload_key, signing_args, is_sepolicy, sepolicy_key, sepolicy_cert)
+                             avbtool, sign_tool)
+  apex_file = apk_signer.ProcessApexFile(apk_keys, payload_key, signing_args)
 
   # 2a. Extract and sign the APEX_PAYLOAD_IMAGE entry with the given
   # payload_key.
@@ -448,9 +400,7 @@ def SignUncompressedApex(avbtool, apex_file, payload_key, container_key,
 
 def SignCompressedApex(avbtool, apex_file, payload_key, container_key,
                        container_pw, apk_keys, codename_to_api_level_map,
-                       no_hashtree, signing_args=None, sign_tool=None,
-                       is_sepolicy=False, sepolicy_key=None, sepolicy_cert=None,
-                       fsverity_tool=None):
+                       no_hashtree, signing_args=None, sign_tool=None):
   """Signs the current compressed APEX with the given payload/container keys.
 
   Args:
@@ -462,10 +412,6 @@ def SignCompressedApex(avbtool, apex_file, payload_key, container_key,
     codename_to_api_level_map: A dict that maps from codename to API level.
     no_hashtree: Don't include hashtree in the signed APEX.
     signing_args: Additional args to be passed to the payload signer.
-    is_sepolicy: Indicates if the apex is a sepolicy.apex
-    sepolicy_key: Key to sign a sepolicy zip.
-    sepolicy_cert: Cert to sign a sepolicy zip.
-    fsverity_tool: fsverity path to sign sepolicy zip.
 
   Returns:
     The path to the signed APEX file.
@@ -492,11 +438,7 @@ def SignCompressedApex(avbtool, apex_file, payload_key, container_key,
       codename_to_api_level_map,
       no_hashtree,
       signing_args,
-      sign_tool,
-      is_sepolicy,
-      sepolicy_key,
-      sepolicy_cert,
-      fsverity_tool)
+      sign_tool)
 
   # 3. Compress signed original apex.
   compressed_apex_file = common.MakeTempFile(prefix='apex-container-',
@@ -524,8 +466,7 @@ def SignCompressedApex(avbtool, apex_file, payload_key, container_key,
 
 def SignApex(avbtool, apex_data, payload_key, container_key, container_pw,
              apk_keys, codename_to_api_level_map,
-             no_hashtree, signing_args=None, sign_tool=None,
-             is_sepolicy=False, sepolicy_key=None, sepolicy_cert=None, fsverity_tool=None):
+             no_hashtree, signing_args=None, sign_tool=None):
   """Signs the current APEX with the given payload/container keys.
 
   Args:
@@ -537,9 +478,6 @@ def SignApex(avbtool, apex_data, payload_key, container_key, container_pw,
     codename_to_api_level_map: A dict that maps from codename to API level.
     no_hashtree: Don't include hashtree in the signed APEX.
     signing_args: Additional args to be passed to the payload signer.
-    sepolicy_key: Key to sign a sepolicy zip.
-    sepolicy_cert: Cert to sign a sepolicy zip.
-    fsverity_tool: fsverity path to sign sepolicy zip.
 
   Returns:
     The path to the signed APEX file.
@@ -565,11 +503,7 @@ def SignApex(avbtool, apex_data, payload_key, container_key, container_pw,
           no_hashtree=no_hashtree,
           apk_keys=apk_keys,
           signing_args=signing_args,
-          sign_tool=sign_tool,
-          is_sepolicy=is_sepolicy,
-          sepolicy_key=sepolicy_key,
-          sepolicy_cert=sepolicy_cert,
-          fsverity_tool=fsverity_tool)
+          sign_tool=sign_tool)
     elif apex_type == 'COMPRESSED':
       return SignCompressedApex(
           avbtool,
@@ -581,11 +515,7 @@ def SignApex(avbtool, apex_data, payload_key, container_key, container_pw,
           no_hashtree=no_hashtree,
           apk_keys=apk_keys,
           signing_args=signing_args,
-          sign_tool=sign_tool,
-          is_sepolicy=is_sepolicy,
-          sepolicy_key=sepolicy_key,
-          sepolicy_cert=sepolicy_cert,
-          fsverity_tool=fsverity_tool)
+          sign_tool=sign_tool)
     else:
       # TODO(b/172912232): support signing compressed apex
       raise ApexInfoError('Unsupported apex type {}'.format(apex_type))
diff --git a/tools/releasetools/sign_apex.py b/tools/releasetools/sign_apex.py
index 01ee80b25b..66f5e0513a 100755
--- a/tools/releasetools/sign_apex.py
+++ b/tools/releasetools/sign_apex.py
@@ -42,15 +42,6 @@ Usage:  sign_apex [flags] input_apex_file output_apex_file
 
   --sign_tool <sign_tool>
       Optional flag that specifies a custom signing tool for the contents of the apex.
-
-  --sepolicy_key <key>
-      Optional flag that specifies the sepolicy signing key, defaults to payload_key.
-
-  --sepolicy_cert <cert>
-      Optional flag that specifies the sepolicy signing cert.
-
-  --fsverity_tool <path>
-      Optional flag that specifies the path to fsverity tool to sign SEPolicy, defaults to fsverity.
 """
 
 import logging
@@ -64,8 +55,7 @@ logger = logging.getLogger(__name__)
 
 
 def SignApexFile(avbtool, apex_file, payload_key, container_key, no_hashtree,
-                 apk_keys=None, signing_args=None, codename_to_api_level_map=None, sign_tool=None,
-                 sepolicy_key=None, sepolicy_cert=None, fsverity_tool=None):
+                 apk_keys=None, signing_args=None, codename_to_api_level_map=None, sign_tool=None):
   """Signs the given apex file."""
   with open(apex_file, 'rb') as input_fp:
     apex_data = input_fp.read()
@@ -80,11 +70,7 @@ def SignApexFile(avbtool, apex_file, payload_key, container_key, no_hashtree,
       no_hashtree=no_hashtree,
       apk_keys=apk_keys,
       signing_args=signing_args,
-      sign_tool=sign_tool,
-      is_sepolicy=apex_file.endswith("sepolicy.apex"),
-      sepolicy_key=sepolicy_key,
-      sepolicy_cert=sepolicy_cert,
-      fsverity_tool=fsverity_tool)
+      sign_tool=sign_tool)
 
 
 def main(argv):
@@ -120,12 +106,6 @@ def main(argv):
         options['extra_apks'].update({n: key})
     elif o == '--sign_tool':
       options['sign_tool'] = a
-    elif o == '--sepolicy_key':
-      options['sepolicy_key'] = a
-    elif o == '--sepolicy_cert':
-      options['sepolicy_cert'] = a
-    elif o == '--fsverity_tool':
-      options['fsverity_tool'] = a
     else:
       return False
     return True
@@ -141,9 +121,6 @@ def main(argv):
           'payload_key=',
           'extra_apks=',
           'sign_tool=',
-          'sepolicy_key=',
-          'sepolicy_cert=',
-          'fsverity_tool='
       ],
       extra_option_handler=option_handler)
 
@@ -164,10 +141,7 @@ def main(argv):
       signing_args=options.get('payload_extra_args'),
       codename_to_api_level_map=options.get(
           'codename_to_api_level_map', {}),
-      sign_tool=options.get('sign_tool', None),
-      sepolicy_key=options.get('sepolicy_key', None),
-      sepolicy_cert=options.get('sepolicy_cert', None),
-      fsverity_tool=options.get('fsverity_tool', None))
+      sign_tool=options.get('sign_tool', None))
   shutil.copyfile(signed_apex, args[1])
   logger.info("done.")
 
diff --git a/tools/releasetools/test_sign_apex.py b/tools/releasetools/test_sign_apex.py
index c344e22058..8470f202c5 100644
--- a/tools/releasetools/test_sign_apex.py
+++ b/tools/releasetools/test_sign_apex.py
@@ -71,21 +71,3 @@ class SignApexTest(test_utils.ReleaseToolsTestCase):
         False,
         codename_to_api_level_map={'S': 31, 'Tiramisu' : 32})
     self.assertTrue(os.path.exists(signed_apex))
-
-  @test_utils.SkipIfExternalToolsUnavailable()
-  def test_SignApexWithSepolicy(self):
-    test_apex = os.path.join(self.testdata_dir, 'sepolicy.apex')
-    payload_key = os.path.join(self.testdata_dir, 'testkey_RSA4096.key')
-    container_key = os.path.join(self.testdata_dir, 'testkey')
-    sepolicy_key = os.path.join(self.testdata_dir, 'testkey_RSA4096.key')
-    sepolicy_cert = os.path.join(self.testdata_dir, 'testkey.x509.pem')
-    signed_test_apex = sign_apex.SignApexFile(
-        'avbtool',
-        test_apex,
-        payload_key,
-        container_key,
-        False,
-        None,
-        sepolicy_key=sepolicy_key,
-        sepolicy_cert=sepolicy_cert)
-    self.assertTrue(os.path.exists(signed_test_apex))
diff --git a/tools/releasetools/testdata/sepolicy.apex b/tools/releasetools/testdata/sepolicy.apex
deleted file mode 100644
index f7d267d08d11f9c6e197278aa3f1431621116e94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 303104
zcmeI*2|N{F<3I3wx%MUd(kh`%T>DZXQkE>CqD0pg+4rTzQY4j<P*G%wN@OWzZ<lOE
zCE7&U3N2I;|9h2h<@<e}-}C!Fzu)tGf6w=GyvEF&nKN_F`^=r0J9p-cu|7SCl|W!7
zP{V9h+rr#zf(VH~>$nK_rcgZW1FStLfiCV8J1HmE&7;)>g2JQfDb$Gw5P$##AOHaf
zKmY;|fB*y_009U<00Izzz@J`#b|FvwdoIa8<(7^*OzQ|C-@1tleneUvVQkE_pGcq$
ze;Xf<{B4+xHcFi^kJ{6uc3U+FgzfyIZO4bLTGQ2zw5Q*rGp0uW%fsY6(DKgyJr_Th
z<9{k+A_S4&OeQZ=cX9;AApijgKmY;|fB*y_@GlUco#WF}JL+%#1lsvOZTLqxSMy^S
zLlA%f1Rwwb2tWV=5P$##AOHaf{9hFq3m(sT$QS|yAOHafKmY;|fB*y_009U<00Izz
z00bZa0SG_<0uX=z1Rwwb2tWV=|7Qgz?pvTe|2ol4#QhceZ<ck@|50m(UG$`HjUs;k
z&-$J?{*1(g3C)UOV&tFbi%d#OTkfxcu7`<HV?1i=_X*ziE>3Q~0l&`ncgB2G-EFqm
z+xl30sd@)```Ei$J2<)6t9t+Zy!YQpj!6)J00bZa0SNqu2~;kl7D(gAx!;fT4?2R#
zcv;7rh9*ot|DioE$~Zp#pZg~=Dfy4}PfYmVJ^y(_EB{2}HWRC)_8XY!{>$?}YP;G0
zbP$=egnxDU(?h%HIcb$SDRj{j|I6}^xAQY8-G6sfWKx2ENBQ}Gedu{SNB>CqC)y60
zRD}Q5sK}(b{~hK3*3i?h8Tm)b&+%)L|F1ETNvZxF<+q-c2ioXAQhv@qNcZ235}B0X
zUtNCM^Z)DwBApbq|81C#PKr80`)u<OSm|8cy?qusxcj=<eQPU=oj^}#?_)c@%dDEh
zMI3)afGfq#$-&;+N6N!yQgJW}0SG_<0uX=z1Rwwb2tWV=5P-m+K!El=|L5=jAEtc!
z{{JV)8nOTZ2tWV=5P$##AOHafKmY;|fWZHxz#rWI^gp?HEDHh<fB*y_009U<00Izz
z00bZafj@x&zW@ITDgjx500bZa0SG_<0uX=z1Rwwb2>dS#;QRmoGB6eo0SG_<0uX=z
z1Rwwb2tWV=5cu~B(Au#4`T2i#!nf!DX>B_S5vCALwT<0foNNOZ$;n9tIe8FhZ61mc
z1SiK!Ie7b7dpm6=OrcIcKZW;q(`nNXAOHafKmY;|fB*y_009U<00I#B_Xrs4)06nV
zuX?t!)vJY4%G5Dh$3yMLTlc5EEY8~2-Oa~7z{gwK&fZV@`wQr#$0z$x8~$hc`4w~a
z9^+RGtZ5S_-ZaPh>w3PgaJ(llu^taEcMp3npTOVN^|#aTPNea+r+9cwO29n+;*#04
zGW-^}sYBzr_5PkaDO)EOvFc^4^t0I+8onmIkRCMSxmTzcJWYn!{pQZ|SLdv_?<u8D
z+jG8q`mnQ8%o`QQdAHh*U6&1fZa@Dho6q+4IlO9b_AWa8wYg8=!h_ynCIVq>%vhg^
zIby)z%xdb|tf<|$0{l^aXym`<$J>!2tDs1#yh2<qLn1YNSt}Pte%YKd#xu&Rv^KNO
zfL~9BFPbp7_2{tl8`YZQ>lS)^*m=V;$)Yv#nc&2_lOntit5TP|?6-AO2dLp!3w~<M
z_jP;uIobZG+h4tJDqLPnd&42EW0^=ot5aG>txqByAN}9na;OQ$LwYE!H@>=Gwxh}E
zzs>#aKW&Sc2<f4Y)WPxef3SW0num!rv_5SMnF#5jNz}pbMgDbr`L=+G8v42JXj{xg
zNDr;04t`(2x2>DD{Y;c$BKgn!6Ed_#q=#;#zSiT{<lm}$VhP_?^!sZ17EfEkqaRC{
zTxq`|Os=*ci(sd|-(x%zv<fuVXBdBd6BB`nP)S|3GVSFb2oQh(1Rwwb2tWV=5P-mc
zv;aAbo|}<nL4;1kM-CzrT}l`|9XX6{l#WQ0nL_4ZWZ4v<L$s$S(GeL4WVRnO5@o{Z
z9#Ln!Po0q*dX5}=ScZ+v!brb{#K=px##Dxv%uO3%W@pu+xHvhud$~DLWCX~3v`8j)
z4g=~71$`(^ZX#=)?EPi9$egrzR(7UkZgyVoPIeP9Y`=@4{}Cff7WpkdEJOib%D1!{
z-}_Rw?yhuv{?!ZGq7w(gt9`oNqjr{@;gxrYn_MhvDZiJWNG&BPjE-Q}KgH0<)AHbx
zHJYoOy)W<>dTaXASzoiR-6j3S|7ED?P>L}}TA_JOdGYgSTI+N}!?X_xwV#~twTU=`
zZKHrD7hCmwjinNonJK9yXB+rAUav6!vMD%RwOd0VCFs_fhJ<#52MhMz<ytDisidjS
zF`YhFVrXuP-#fX0EcxMg-4@&&F$&@%Up(rVb5xpz0{o&DN<=X}jP^f#L!efnH-qV=
zC9{t1LsNy2)}70vG}^aZ4UJ#*d@ASSgp8E?%~yIF`|g(VZ44Tm68Y%CqoqSZ^()J6
zK02v(mtHIEUiny8%K<$xdh@~SDIsoC6}VVD)~BhLRWEQ(+an-TTHj?$@*XJ;v@$q$
zV!PRA3&Gua&)>=$FWr;ikuRIQYuSs1a-O{xPMy8Dp}i$eV3v+s-5jGv<526Pt8VZ~
ziwVw2Xzp0Ads_8vw8FO8V=6~Y?wgP_`5!*$S!!A1R(PH6kdjcuzRVo+qLHHT(Wma+
zUe#$E>uwjNS3iDLF=}#P_NDs!N=vk*OA0e?UN_kK?kRn@w>}@!o9C}z_beS#?-q_N
znUUI|{$$-H)|Z>E#E7-!Uaz?HyvIq6_2k2oAyw-s+=tt@6kWbO)Vb9~quOY}VR@GT
z_AzIdW18hg%VdTaXO!(`UR3#T^}E#6z_-d`Hyn>XmVR?#zeA$VC9_I9Zhh;4)eG*j
zuRWymAN`3(;UEA32tWV=5P$##AOL~Cs=yS1!u!P?4*4<1joyr~?;%Z@Nq9R);`*Xj
z))imwH!ZJ>X3<;!;+9;j2We5m$MeVR`dWOn#C%S;3@mM$l5m}TXTBR950B*>!F#LU
zs3tmmXtQG2<9XyllkzFfBZ)`0?)H*++tWBej3^;%do7g_i4h`Mo^ibKvSs(vJ!#X^
zTsi`8%B`PEw6UmB$S=!}JQUQ)##qOE;K>~V%R9}57GcMu3YQxc$!d($)LD_Q_T0Zb
z$RG70*YN&^ZeEFxz1<d}H=9nDoZQSZmG_>Ls%a^GT=W_LP0kly+C=Z05qXZUCoodE
z?!C`O8%=4>{?a+8WX#j~H|Rbm>FUZn4tESVB6nFUqoMPfoYE^#&0fO}p#&9@yP3N8
zp^p^3Eo$$LFL%F?k>9~%(Y0AO>7mfz%fhrmm3yVy8`EY#ky;|ZD3x2|{Kfm5X4jwJ
zm)fUj+h5tDG}4x{`kH(9K|kg2H_?)1dXCrGE~mSPWUWZLYoA>fBi>NSICUi2g|jf>
zeCoWX<~uVrpXonrzxqj>vF-uG`{=HqrjqWeC)olotCVF1av4`}54@e08ojeJe9hLA
z+B3|Hj=dgvcw-^G(Sd56OEXg?+k_>^2cjMdR-{NDb}emwS2M?Nb)-^nZ1`BO?;Vjo
zQL(3j8*S@MRtjpWq&f3*zB6(;Fwi%D#hHMl$gmZmkCX*v*Zfttdz2dj5P$##AOHaf
zKmY;|fWTi(fK{0KJGs=vZ|1+<9Z$PYn2YG8p-6UcP$J9N$fzjE$}8B~*^tR(85t#8
zc^gF)83!8$B?kpXMT&~DgRQKsgRO#tikyv&ot(UiqN0t1gPfh*UyT#xg#ZK~009U<
z00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa
z0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z
z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=
z5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHaf
zKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_
z009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz
z00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<
z0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb
z2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##
zAOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|
zfB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<
z00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa
z0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z
z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=
z5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHaf
zKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_
z009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz
z00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<
z0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb
z2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##
zAOHafKmY;|fB*y_009U<00Mt{fq<794<$aveAO%Cu1vdi<-OwLOrElLF$*qnNuT6=
zxtIG4Nr|s`h}l(KykWF0W#{^}bB9!`hT0Wt{n`4m83`BFP0}xZY@WI9=6)sLK1=JC
z&dk%BrapDPQ1zCqQgcS4V@g*<hW~+F%MWUl%)IHAU#DL?w{iQT;k=~e=0`kfoc=Sf
zdrbA&aNp_1S2g0m0{^8NoNYE2gs-*fpMHFPny;rok<!V97gaY%@T#3Upr~!~ILbnj
zq_w#z)Y0jQiY2f1`I_3+GGU*UUvIXbJdw7a<(Q=+<;g5#O%KlHmN{(#?;m#Q%RhNJ
zFX9kKS(l+>T<saVJ7xZ*9-kSWb~vc<6&+pl&rT2Psh`UfpMQ=eMC{G!@PKsv^u+0V
z2Igf(tT^i0U$rHPErfaK^Wj%lN<X|@Ec@_zvbDlAWdYM<1Eu}sx8&1C_xexuFPU2u
z5@mLpc;`vF%MLkNlOn}VoqN+x#6L~q)n;84-6$KoeqC}{z0_LSX}h@ZaVC8-JGd`-
zhVbxN0c~A6wdw1e-RK%KG$@s;tjz`6O1ca*iMby-wzX#she~TKQZw}1v&o+R1y^#$
z3$L67Iax<;x1V(Lw3*JOc0YMm`DILp54I0{KCplI&)h%$=}$nAK?pzq0uX=z1peg$
z%hqa=sVgP^STUW(w_yfapYGf6Z~sNU4}I@XOeQLSizhLE>yM}XKI_lDiTQrSQT%Lt
z+}&M7WTa%JXc_re2dz(Q=q`ziRT00`SG3kU=)OMpWmoj7p4^H)@jfyodW0>jEHHO&
z;*!)UHJ>_bg4G=6ElyDN3R0!4Y5K$!KKwRdLvoV*vajdO94?yn=aDNj?kWXtTp;>U
z^#1BJ%h(9d0=a}EJh2kXqEhr26|DwHYNBhl493o^8CETdFGvZFj=L&xbJdl7S7+OP
zobkTE&-=vm7~wq;+SzWGFDy2@f00;TH9bY4VE-Qf#YT<B0)5_DX6eDD4}<8NX11vu
z<5`}$AhX>yc#wS1cF?k-Mf281(_=<X8tU188HS1q2Q!9d@0f4?U=8b&qHcYMh<5&R
zv3uSs?W!BTxYcKdsRZ=M8c7P-8y=joR7f>sL~Yl0w+<#BLA!$sXD5nkW|8Ceu3Gfg
zV&fyTsU7uVzQG+=;|8L2BuZUOMDM6?SllqboZTgLDP8+o-=b3fxgV@%MYfh^-mmYy
za9Lid;+R^lilJ_A-#Y!Fq`i5AI-dHZ{W^DCZnP9>JPvtk9VQSQdiUlYR;A*us^{kN
zbuTvQS;@5Tk`7H(Ez9ds=Xshp&o3{)@l`Hc?KANdulVGBAzw{A9V^QDOdf?5BqT=4
znTFP`P1{@1_a>{3>*eQ|FWIsO3nC8->9N?iE57J!@-Q?|zt!l{v86*_H(S}RMf+;5
zeC&I}xZ?@JtG_%gJ5~Mc{YlQJ^x{Dkb@~0<XDyM9-muQ?(#l(NhJyJc>Yl%-^^Gpx
z$9DhqKe#<ke15v9^M4zrANZDZqEFzWj!$&IU#hnwMOH!a_wkcrM5yDm?w<;V+BLfI
zE-NnwdEeTl;b^ws`qnd<hte|^KQURkUrRbL{==c8bLThE>#A@wd#cKnMlO}{86Dn}
z+`W>&GH$`V9??Ho`NT)}`{$p)NAa)^kaD&UB-pyUN>SYGyxg7aq`d7t++Cb(1IHJ@
zMUd%NSbQisWWH<lp;OCae9n;Kc{h;_O(S<CTdb@$dyuLp`jH{#d4|r%>d3}vfeq@%
z<4fx$=C#!pI(&9cnR~VD_SSfTa!GQ1!{UNq=Ge@0s)-q;vp<RZ%-hYgVy^tnYbk<H
z8O!r7OEp&1ww(-7uKY}qkXpM%r=uq*X8H+sDLs4NG@JIk)T(@6tz_kg*Bson=$4e|
zO+B1%I&ywt8K<;q$&NLiN977rxP&;LRW9yp(7EG3eaCTDfi#Xdr{J`+QpbBqnI@|C
zUvgBRNREA0<cabws6FhzHqpsvYFK*%m-xNB_g6V}FDTUYYjpZWZ8!bIRp@q*k9#*G
zhe1VN-Ym9}K%=VMvO&(&4j<y>x(7VVH*;@xWLwl~Wb~xPw=KeXTS86Z?N2L|tu8n$
zQOm#AY<nQ`h>%@bxv;}P-OGhTjpAm4z8m)mJy#cIAN87PV_8MGvhv80JGYx&h%$!G
zunvD>*Sy4lIpo=FcbAkD=jcwN=Qg$BSN`|X?s5l9ojID_7|Jy_)w!XRp*zT;(p)Ag
zu#v2~IYBREo$jHCWSRQ;(Rc6isvQtnwS_I|#@&p71-_f-1wFJle6-2t>qz&`t0%Oy
zl25JaQms&b6_s^=Z*9R)<Ef-4@$)T~Yur6y$ey=mzuFh}BVosipOPbv=*Zh$-p_NB
zWlsF7g*)V3<WIRrv#W}6tcpGE()sahJNI3Y+pV>yOt!I~dbVqK^OUAJ5n?+?&N<xs
zvL$EU{VWhLm|H%4f!Fk@spg8EON+L>6~50u{4%Cw=RNN?`>g%s+PxJNl-VTg^A(R+
zChdBaqQ|{NB+uMX*pX5(J?tfSMEHrh{hd2IYd>3PZYsWZTd&>M<-EkwprLX$7bRz{
zE5~+U@m;n=QGlC1?WC>SmQCW9Y8jWFkQBKfb}F9~v-4?kc*@6?_?|g>w@nIa3yUvk
z>ofa_T8$)2ZjCtMv4I>TV!32nzyl?cXGdj3dvW0I2LDFo9?@b~G5$@%hQwN_BEAl#
z)%ATrO}gvN?DIZk?#j13vOz`Nrn9s4tux!n&0T|Z!hDqObFCYvCB+l+D2!R_k3~J*
za6T(uZ^u-Xp!sq#=So&3b!3N0SrK+~FLxStPzV?<aE_5GxwGZ<gRV0nZ92pQ@^waU
z8ng6fR)}aNF-NvKTPxg~Rzu&sFC^-^*`DQ(hFcc-U6hehow{LD{-Y?77p-w+qnY;H
zvW!BBZk$)>EJUVcnmA0|xP7PozS#Yn7qf&{ypMM&wq2)iikMm8A(c5ZI4v*lPFI{R
zv2b?Voasp)Q_1HwH}gH>pV#ToDn=xRPvbH;Y?Cb=S<Rt#qlL?T(V{I2KONvBL|bOG
zgg71duzFY)!qh9Qz5LLggq0<8A8&sUIrZ`%>`M>@0SG_<0uX=z1Rwwb2tWV=5P$##
zAOHafKmY;|_{$4Wf4_I2B24`LNFYr7-bk9DVGfxX`lG(FK0S$*Kp6ksZni3$u_Et0
z>TI-*lh8E9%ii1F*UQ%4TZ-c4ZL9F8VaoVVn18e&#6bW85P$##AOHafKmY;|fB*y_
z@TV1^Be0Ku+oxraNSIFj`zcVbDol*it`qPPn3-u83TCVRG!KE7I<oBB4Za2xHzx;s
zZy%`uSC_chdMT}Cd^ancE=VoXlVoOD$g@XXKaa;xRB^eaiyNQonK!j%;;)zN3J+g7
zz&^85D}eDW-H5}g!D4xegmqt1f71Koa+!^#bTc?~RumN1>+%mi@a$Pad{D{h7`k|X
z-Kuh-km5awOH2ozvy_H1$TO`m&05~N<?I>L)Rj$UGmdY69YJkMV8nN1ZAtoB_f^ul
zshoOwb$P1W^KbcHJ$;(_72UJ`)s4ZCJr7)07j*Y9sa6UuE-`$Z@%oLX=$Z4bm(KL6
zFIUnmGK@QDSg>ZDtja>i<A?4JsVGT_hLuP-@A>T89HUrRZ5Wx==3IPwv}rgyuZM5y
zHd`Cs&B6V09;}P9<pl3~7VUX%SjG0_aK?Op-mQD(WNp1JUMf1i{z84}Xly~ku{Rls
znyL1if;mdu3{nEi?S)P2gyrZ(xdiv=hO7$T!c)JhKYQ61fpZ*V2VcBd;CaGM@N42s
z!_V|H6W%`7h)R5KN#xs@P%T(iQR83bt#xAB?T(iBjuH=tF7|Hi8d7|<^-e~R+|ea>
zUYZWaX}biEWyhb(>-*C8E;N^7qR`Y>5d2oU%*9GguCs56LGtHdg0Vgmb7-5`SOK-(
z&8gRq{&t=7Q0ts_hqtwjuak?NwUe8JyOf8`{)4r8*EIOTSM!PKC*<T5+|zWprykcZ
zYk9GB&((0QQ@0J|To18aZoJ2;7TVucpzPWx%CEm!X0LaJig*3xky7qbzt-Iqn_u<b
zC28><R$Fv?lfd-_+R009apzZRAG~dOL+90T!8H0pWpc@|8n^MsCGOsVAKwg}P)R;m
z7d*%R+ygb6if2p>yI$Cnn@+PPxE0)1H}hn_W_ye&{pQNNF^}iVYy~5>ANL#HD;cg5
zpYHS2-nUPta!FH6^{tJHa(Q1WhnHp+?57u~znu_hwuRr<!e&()+cHYnQ8BCTB~3@q
zQ5NWlt#+y*&a+dFvwbbQ_*ver8$sUXJ^Po5f4OgHq?*6&_~7gJbr*WCwtEaP#;gdl
zoTk$;efBDGZk_`k#GDcd`_<+~PTAM$WMT?E_uA`KX*65fOv~<UlCoMeUrxK==I1l=
z{h!$dPYu%3s^Z+9K7V~`RfJQYviaLpL3^ZNyeeELK71ZF3|C}0caqr|jD6oUT}X&@
zIiwuWyT&F_diDj5Fb22!t@T9*tb4|qZ%yqszxa0JSH0~U>K@vTF%$PUo41;s+0D)E
z{oW>({Vd0t^j`Ml=~gEnNqVj3ruXWYM$6W%BXwdH)RkIOyT6?+wux+c_}Wk(10XV!
zK7OG+|A2e`anC>Q`TuL*^H1B0bh75vb5M^l%zyVdL)*C-Xqzotq-(fBT1(r+Ov-eH
z>)qRKFEqFqpD*U=f8M@NsGWg{Y{JP%PjSj^c6-I6aLHh5d$^mw&HE3O)a7zfoog4Y
z*&eL>GS)PDfnlDIO|?#p5h+93f3aND>Tp}nmTmI8X04dn7<N4@*qU7ZVRKQtx^U_+
zna{xMYBmqCTGvZjLQ^h0v{QzEi$%tIDIv-F$K~c#aaXQvNL1Nw8q(C*KqqkE2`8Vr
z(_Ih67qe#G;$8MtoW1zC+bvDu6U@oH*4$rJOSaV~Gu!UgE(vODnP1<WdUD`Ywm(Oh
z-+F;N_hpI2rx*9BO)amTHFhuS`r!M}SpAVz@6x*xc3;dc=h9`R_-u<4O?}IebFo?_
zygNuuacyz>`oX)3UsvsY+g*~h{rHG_!qJGkB@A~x$Toi6*W)a;>SxjGJXsXBYNq9j
z?Yt`0?nN)-vo7<^>x+He<d-X%d|ahU&tvJjx`ElPyM#!4&vTmW=Q29fm)ks-rL*|4
z*XP+c3=-M79VG>K@-RN!cA~Ce=j$2otr~aMWm&jyuj>8U$8ON*H8y*`14HJ@n&HTN
z+YS5I&WZYvs@m<T@}BYJ*$-Cnxqb(A>=p<P*6JM2oX5~^k+MCjpH}UG0o+F}Q;%sm
zfA^Ti{kv*6F<mC-Xw!Q0=IQ&d?hYMKh&k@GjJMTmr^Lk@tM=`S7-1}RNn&xGx$kt1
z<f?ty?2M0@!}qZrGk+i?pO;N`v^jA;<mjH5J$qs)UQds0f1NDUzw^T~e%XAwK?OsZ
z4#nqoww(49UI$hVMLtC?lBe>n%SpW6vW@TdzLVwUxWT?$Bkc9n((=z4f#Q3P2C`C)
zo_-lY$GA<zQ;OnutMqW{NDbc+W~B&bInCv_HHdwThAU*+mPcNqKm0(yu3q6FZ>Pd}
zGFdiXo-D7ZD6^NRQ$bOItR%nNi|K4Zq7eT<dLbd18iReM>>8e&rzBRah;WV-x9FSE
zzV^|lp@4fk6P3)~ysmpy8o&KR^1017_AXsm=U|;vwW039l1|}gZlgy}#f-VP#O3<z
z7`^&nvHh*s;Js4nY+pXj+aCU5)PQlrLe4zp{`d0_HMb3|SzY*M=MBw@I;}5~Jzs{7
z_pAGUihpdoGd5Sk+I+{S=!cyI@uvh%zceO}#v9M<^QNv;+o1Szf88siMQriu$Fq)k
zU28emxZsJUk-B!5hE-1EE#^I6#*R#@AF%Yi9OwOUfHRI+cgoG$GxM*Ge(A4OKE1ln
z^NVxPT4s0Ksy$CKoBh?irYHz3IkdEQ>u8zM=3&|7WOJXBxta!)sIN7t>!-yBYs=Yh
zewtiXXLCj3?eLBKyB1?s)p9bj(rzQR4WAk{1cZw7w@KPaiq4E-r(En&b?YUynkO9A
z$!S}1e~x2A0FPL1&Aotz6i;jVwF+$0HZO8YQqwWj<TZ(ICkARC3BMn5H0G`P`cYfP
zjHok%jX_pS(>?7t4qx(c9t^tKm6Jbj@MY>=PS>~Vc(}g?_fD7F+%zg){OplRloy|D
z^31xDlIU<s@~N|&yFZ>Rc4g~*Q1fK&$+YK1GUfyNT^w<)l%nLvtG$k7ZD<+FwLK%*
z9u>Udp|*-R>DDM&#%|4OuU?t0>1q5Qy{i=-^)gx*8SY42Q1&UMJUhMWiS0WR-6Egh
ztYF*GBKa%p=kD@%=V+f^urbj=g?}br#VkATFI}BC7t}NLC%k=qPMSOS?7M_Q-_g|T
zR)^y|+gnFG+|8z~tlb>^L@DZkrO``Acdo4uk{)w;bVpt(dAU2^Zi#e)r*?Ku!WLDz
z%dOWMu3Fejv$adlmN^^ZQO<6CP2#3^rKA_D`FUY^sj2BQQEMYa6UwqwPGszfp=?jC
zpZnR{d3|kqy!}&q%S>6L%=Y&Cg@c{muO#IKnLCo__S@c`6SHG=6Xl_0S*PlZ>bI{?
z3!0uWQI86!zO=FY^6QSXfqimYPIMMWweHwdkt(6meX)3WU9VDxtA9Y<{A|`Gr6r}B
z!E=m0Yg#-@n>x$NZiZ@pb#F#k^ib{?%V_Nl4xTUkcR2H#U5wd$S6$5itZ?mppV(0a
zXEnhhaf{3fm82p{adVXS`m+xU5=gU>YiifWy(|B06j}9PAUIe0Qmcgb^jGWTE#%s>
z1|2B<MWJ6CdHFvGe~y>CE>vW2`mxa0{agJHtqWJ`tSJ&dxp&J0{Y$fkzB-9oC8jI)
z-YBSa?G~J6X%{f~DBWLR{9BUfqf3R6)FW3h<KH_6=KFa!X0XgqcZIg8nUui_*E(JI
zFbzUPTgjfWD<$0XrLuIVggw8+e&JfGmy<c;3}FE#vk2>Fr<@v3eHeaO8#^Uv{vMCj
zL(^+m4`me8#fn_q@Fu=ZJmA66%-MHzm@5{X)N?Gc4+}J!x_>L1*Ko7LjNMER+Ka0$
zw3=8l-n}olG~M1Zzwq(y7?QblOuc_1xAWkL)>f6Arz6u&woTJbTUGV-)V4=&d!H_y
zTCJ0BwqC82A~-wa?2!0NtNPlu*%#*<i>p0<YpwFRd?eZV29sm4Td18Xr-b>|jVIph
zZDiUxb^67)c~g=UE;SECKWVpC`lwu6YAka5bayK8$m^bPS2@zQo_F3I1ioX9>B|o<
z@ijUS6zg(<XNjWCwX)ALuMAA2_j%L~_Vh85H*U;ak+Uu#$o+kS*QFkt!A~z_gGJlR
zMiT8VRk=x4hCj~}bv(1FwAHO)h0@x5lP1eq_lM;z(&P!ITucJtJ?XnnMJ5b<I9)#e
z^(n<B;*1UTP&0R;kpgOMAV2^D5P$##AOHafKmY;|fB*#kngXAud@HvG)3^TA-7KEU
z)M0sQ_lbIiLy{Uzdm4bA`b}Dd+Hc^C+bX^xt|k7^K%sSO$KJ0mI&V(Pj9<i`s-3~`
zb&TmeHBC0PBZrZ)$YJycQ|Rf4baX6)ShwtQrgy|=WDZ7_1ra(CA32Cb1_lB-^so#Y
znT3&l4T+JLZjGr7FPWP*!pzI6MR9R*aQAX^qR0r4`Dl?$yc`DZzHUAgCpVF`PWJvX
zTx9BX|1~65UZ(FiAWX!t{Vs<7M~o<0<hMMq5CwR@w@#)p(MlP$#WM0tK@PGqSyons
zEF&i;uee^2LymgMRz~Uj=$|#)VMLLifr$(R`Y<8~wK9mzbYVmy;X$l0>FG^2vAj38
zY@R=A7FScNb?Ke)VvKQLR#$0Ot#f05TPAC!%PY>3DMuA7#vZBppVsQ^TB>h%sbe&?
z@zvV5FE(dQtH>u`2)IhpDqrO#bZN!lZ2pJ=<&%bcu9hnYN0-+hsJ_-Rvz>gqC$=H;
z+GD-<#-bd?%uKS+LlOl0wlK(9ygGIGwPeA&T`B1fRY8ZF7t64yZdQ_#w&SUEbJcun
zF7#}aKD36tX?cswlWUj6%!PG`1>$zRMiozw+@9yJ(>l0$iy23#Syf3j)8!W{*T`{S
zcRu#f{pstPXs6Dq)Q0E)36aC<N4>T$A&q(+opJP8Vvcf3zF=_Lj15~xyJyi6>C-|-
z$f2LfGpHNR3{H{&iBHFZuy*NO$rU-=5e(@*!r3g<`?$%Ww`tSokV3DJL(4<{aGsN)
z$I?R+{-j$%*iWB0c3M$*NepCqB5~~J&4c>+qi!BVLQrn}zFy<&%NSM*HME?~C2olF
zTR%6GKlN&%ktiSkSW6u}%leA+MIV`%y<9|`US4y1l0zbt&)1e@*1x*r;>jJ^$IFEz
zMGW&yxj(FF7Q48%wd1j<M$97Lh|$Qn8N{s73pwjGH<@nyBrn4tCc0vu;tR<IR-X?)
znDLOjrQ`Nc+_bbS(ldnlp4^-@)uv_9r@2G)qZykPOPX<%Z6hWr7Uv(+^t>YY%w$RH
zjrXBJy3hMhv6lt=2<`|n5?-qHL6phM!EKen&bG4k5zO1(8!dW0`-OJ3%fj;luXfso
z7~i{2?#sNoWx8&oAFKJ<;HhCXv3qr7l(odlNW@_t0afF5oQ?+U)cqRmz9x=={&IS1
zpBC7u`#WZ8N89hwp03(^NW@3Hbq9$xYq4g3_U$p}9o*a6stnzYx|&8?6Z#FOSw9mC
zVpW-u^!41k&!*i43+QBa&kJ2=Kq+VNd*c_7$W}+6A60+6uf@E0RP%X`F?(p{rE88e
zOjy1$T>qf1u>MUx?`_fb-R}uQ=6#RCH{@{g>~z&#uueB*p4zQ1RovQaDb^|Pnu(DI
zL>KcnBr@>de0(j3u=3ezzP<!kIhI0S>umXrIp&N?N?-f>Ij30p6n?N}$T__-hvyoh
z*OE=C&vv!A!sj_*&I7lmY%^P!Uec8k-l}vgIPQz{oVv9+SGIYRmMWjvcs!2ntEb-w
z)#0~GvxI$G@)nyXcPMU~7P~1`jA}sLjbQikU+i8cj-!>1rUMhl(E%JsaU8{Q6vxs3
z@Z+cu^-wuBHWo}feohQeK8{}QE!199wu~}OTTUWoo78rW#7nQ2-?wKA=aXpS%5hHZ
z3ZKVNFldz2cVquvX*EtY+qmgAmgl&}D&OT6c#(t{tM0IslKt0hn#)iVIpmZ|X%k2=
zKSdwdu+y!ldH!7b0@G_VgKP%n-d(jHS-6Pdb<y1_imcSZC5P=RrITOuui!MjO#i}f
z{hg$D+CoZq`YD65Pb^sH77DYs3MUrkW{0y%ktJj~MHatH^)X45St>hS!XR|;fa5l6
z&lkI<R=9D;5|p+w^JN+PFL<bYyv;`Y@U^4a`dUjhwzjF!A8F$}xBO{W^s7(Wr?d%u
zyQEIWZ7kk)?{d({JK?MRBGXz}_J@ezIQoyBrt8qoyQsn6-b?e_5dQx&0u$f!ml^Ae
zm^y71(R6XQbrzAAHP$E6vC{u&0l=2}DIkbYPgtlO7vbLbs{;f=N+@mZ<2M?6Py$`t
zDRxp$uA4`z2?T{l)o2yqpQ#$8g#ZK~009U<00Izz00bZa0SNrd1;(!j5Pn<_nA{@Z
zPZ=VU2xuShCl3rl00Izz00bZa0SG_<0uX=z1pdzo(5?sY5q`A%_jCJjw3h#Vgn1gI
zKWYbX@&bNt)r{7R+>bC_lk^9T%1uuHbMs@g=7D~MOs((fe`*PBa_XO(9ilZ+_9Lh*
z|DO6=gJqKw{@ifQudCgqL;77CMUzwi++GB&aho4utKQ_))TVAGC;z!A16rdJKZ2&w
zPsx93V!~LTf!Z_$fxtrjdpMgq;6Wnra{fq%AqYSK0uX=z1Rwwb2tWV=5crD;{67s4
B@BaV*


From 0d76292be2b528d35c3e674ed7d190e49abeafed Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 14 Apr 2022 00:57:07 +0000
Subject: [PATCH 330/425] Version bump to TP1A.220413.003 [core/build_id.mk]

Change-Id: I7506f5309e906d8540c36f11e810f44cfa818b56
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 3ae93646d7..a0190ceaf6 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=TP1A.220413.002
+BUILD_ID=TP1A.220413.003

From 5bb6e227ebfbe84a3bcd6053627f76aa9f049088 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 14 Apr 2022 01:55:02 +0000
Subject: [PATCH 331/425] Version bump to TP1A.220414.002 [core/build_id.mk]

Change-Id: I5c2d8307a2ebc4df6101a8760e4b3df0aa658008
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 5a8223808a..b0b72eea01 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=TP1A.220414.001
+BUILD_ID=TP1A.220414.002

From bbe4842e31ba921026ba6f93be92b0948317da8e Mon Sep 17 00:00:00 2001
From: Hongguang <hgchen@google.com>
Date: Wed, 13 Apr 2022 16:41:05 -0700
Subject: [PATCH 332/425] Filter out TV GSI build targets

Bug: 228179256
Bug: 226020975
Test: lunch gsi_tv_arm-userdebug and gsi_tv_arm64-userdebug
Change-Id: Idee55259d5f24638895afd6eaf76cdf854e5807f
---
 core/product_config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/product_config.mk b/core/product_config.mk
index 939a02206a..6f37d9e3a0 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -457,7 +457,7 @@ endif
 
 # Show a warning wall of text if non-compliance-GSI products set this option.
 ifdef PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT
-  ifeq (,$(filter gsi_arm gsi_arm64 gsi_x86 gsi_x86_64 gsi_car_arm64 gsi_car_x86_64,$(PRODUCT_NAME)))
+  ifeq (,$(filter gsi_arm gsi_arm64 gsi_x86 gsi_x86_64 gsi_car_arm64 gsi_car_x86_64 gsi_tv_arm gsi_tv_arm64,$(PRODUCT_NAME)))
     $(warning PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT is set but \
       PRODUCT_NAME ($(PRODUCT_NAME)) doesn't look like a GSI for compliance \
       testing. This is a special configuration for compliance GSI, so do make \

From ae590a3b0288d4fb0d6d47cb8ac7eda3546e2832 Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Thu, 14 Apr 2022 09:31:48 +0100
Subject: [PATCH 333/425] Remove sepolicy module from system image.

Attempt #2. Previous attempt didn't remove precompiled sepolicy from
system image, which lead to 1s boot time regression. This is not being removed in the topic.

Include merged-in tag, to skip git_master revert.

Bug: 199914227
Test: presubmit and manual verification
Merged-In: Iafe242c8c7122174788215a02e03c8903316a223
Change-Id: Idea61f53411c541b06d74883711d633b822316d6
---
 target/product/base_system.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 2ad9ac6506..83ca2248ae 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -69,7 +69,6 @@ PRODUCT_PACKAGES += \
     com.android.neuralnetworks \
     com.android.scheduling \
     com.android.sdkext \
-    com.android.sepolicy \
     com.android.tethering \
     com.android.tzdata \
     com.android.uwb \
@@ -373,7 +372,6 @@ PRODUCT_SYSTEM_PROPERTIES += persist.traced.enable=1
 PRODUCT_PACKAGES_DEBUG := \
     adb_keys \
     arping \
-    com.android.sepolicy.cert-debug.der \
     dmuserd \
     idlcli \
     init-debug.rc \

From 8f5c96e17d5e52ba4095bd79f2d7f1c64e66519d Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 14 Apr 2022 23:19:08 +0000
Subject: [PATCH 334/425] Version bump to TP1A.220414.003 [core/build_id.mk]

Change-Id: Ifad586eed52b9e93bef59103a5077f3e28bbf89f
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index b0b72eea01..04d010f093 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=TP1A.220414.002
+BUILD_ID=TP1A.220414.003

From b667103464d20279826059372abea0c654e5121f Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 15 Apr 2022 19:19:15 +0000
Subject: [PATCH 335/425] Version bump to TP1A.220415.002 [core/build_id.mk]

Change-Id: Id1af74a142c75b0d4fe926ebf64b0578769ef4d1
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 9984008745..1adcccfa49 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=TP1A.220415.001
+BUILD_ID=TP1A.220415.002

From 5b9ae525370273e3d33fbb1bc96b04c18378597c Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Sat, 16 Apr 2022 00:49:04 +0000
Subject: [PATCH 336/425] Version bump to TP1A.220415.003 [core/build_id.mk]

Change-Id: Ie8a4157f32d490cb90b16509fea6083ab061b7d4
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 1adcccfa49..bed316cfd7 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=TP1A.220415.002
+BUILD_ID=TP1A.220415.003

From f432892e68237646c7000d63c80788782aa19d72 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 21 Apr 2022 04:39:37 +0000
Subject: [PATCH 337/425] Version bump to TP1A.220421.002 [core/build_id.mk]

Change-Id: Ib9bdffec29c0ee5d0fd65543d5a644917d1f7785
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index fa350b8f17..aa31019056 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=TP1A.220421.001
+BUILD_ID=TP1A.220421.002

From 42d6b602e63a96e1e8e090c67b8ad25fef949c02 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 22 Apr 2022 16:11:10 +0000
Subject: [PATCH 338/425] Version bump to TP1A.220422.002 [core/build_id.mk]

Change-Id: If8dc9b03d513a8a6abce1421ff23815b682fc065
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 6f50cb8f9a..fe42f2bc11 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=TP1A.220422.001
+BUILD_ID=TP1A.220422.002

From 7fd1802cbd961283ea7a5b487d33ef69626a9722 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 24 Feb 2022 13:40:46 -0800
Subject: [PATCH 339/425] Update PLATFORM_VERSION to UP1A

Update PLATFORM_VERSION to UP1A.  The codename is now UpsideDownCake.

Bug: 219519679
Test: m checkbuild
Change-Id: I61db64b279e4e64c9be33095bf98b3bbdb0e19d8
(cherry picked from commit 29919e3b66bc570bcd1bf05fd75831a302405383)
Merged-In: I61db64b279e4e64c9be33095bf98b3bbdb0e19d8
---
 core/version_defaults.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 4e3f2a8654..92e9474f18 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -40,10 +40,10 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE
   include $(INTERNAL_BUILD_ID_MAKEFILE)
 endif
 
-DEFAULT_PLATFORM_VERSION := TP1A
+DEFAULT_PLATFORM_VERSION := UP1A
 .KATI_READONLY := DEFAULT_PLATFORM_VERSION
 MIN_PLATFORM_VERSION := TP1A
-MAX_PLATFORM_VERSION := TP1A
+MAX_PLATFORM_VERSION := UP1A
 
 # The last stable version name of the platform that was released.  During
 # development, this stays at that previous version, while the codename indicates
@@ -54,6 +54,7 @@ PLATFORM_VERSION_LAST_STABLE := 13
 # These are the current development codenames, if the build is not a final
 # release build.  If this is a final release build, it is simply "REL".
 PLATFORM_VERSION_CODENAME.TP1A := Tiramisu
+PLATFORM_VERSION_CODENAME.UP1A := UpsideDownCake
 
 # This is the user-visible version.  In a final release build it should
 # be empty to use PLATFORM_VERSION as the user-visible version.  For
@@ -90,7 +91,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 \
-Q R S Sv2 Tiramisu
+Q R S Sv2 Tiramisu UpsideDownCake
 
 # Convert from space separated list to comma separated
 PLATFORM_VERSION_KNOWN_CODENAMES := \

From 88c08b1a129de8b0633d2304d15714fe91a30137 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Mon, 25 Apr 2022 19:41:09 +0000
Subject: [PATCH 340/425] Version bump to TP1A.220425.002 [core/build_id.mk]

Change-Id: I7fdf79b55795198f627fb0195222dd72e51f3c33
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index a5412e0de6..ac3f2e1b42 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=TP1A.220425.001
+BUILD_ID=TP1A.220425.002

From 3c5551d7e26d9851e13e635d6494bd5b22dd88bc Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 26 Apr 2022 01:53:19 +0000
Subject: [PATCH 341/425] Version bump to TP1A.220426.002 [core/build_id.mk]

Change-Id: Ie18fa8ca42d0fe9daf3d8657ec3190f9ccff0082
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 039b99da0b..29c624891b 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=TP1A.220426.001
+BUILD_ID=TP1A.220426.002

From 0b2eb8f45e65c06b7619cc4b4e59016f5a67d127 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Thu, 28 Apr 2022 10:37:33 +0900
Subject: [PATCH 342/425] Updated vndk list

The recent freeze of android.hardware.[light|power] is reflected.

Bug: 17983786
Test: m nothing
Change-Id: I72ad4891b6afc30ccfc7ac87a1e86fb77827bedb
---
 target/product/gsi/current.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index ae80b37e2a..22a2547ee0 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -84,7 +84,7 @@ VNDK-core: android.hardware.health.storage-V1-ndk.so
 VNDK-core: android.hardware.identity-V4-ndk.so
 VNDK-core: android.hardware.ir-V1-ndk.so
 VNDK-core: android.hardware.keymaster-V3-ndk.so
-VNDK-core: android.hardware.light-V1-ndk.so
+VNDK-core: android.hardware.light-V2-ndk.so
 VNDK-core: android.hardware.media.bufferpool@2.0.so
 VNDK-core: android.hardware.media.omx@1.0.so
 VNDK-core: android.hardware.media@1.0.so
@@ -92,7 +92,7 @@ VNDK-core: android.hardware.memtrack-V1-ndk.so
 VNDK-core: android.hardware.memtrack@1.0.so
 VNDK-core: android.hardware.nfc-V1-ndk.so
 VNDK-core: android.hardware.oemlock-V1-ndk.so
-VNDK-core: android.hardware.power-V2-ndk.so
+VNDK-core: android.hardware.power-V3-ndk.so
 VNDK-core: android.hardware.power.stats-V1-ndk.so
 VNDK-core: android.hardware.radio-V1-ndk.so
 VNDK-core: android.hardware.radio.config-V1-ndk.so

From a84dc6cb63793270f948540483e67771ecc56a08 Mon Sep 17 00:00:00 2001
From: Yurii Zubrytskyi <zyy@google.com>
Date: Mon, 4 Apr 2022 16:35:14 -0700
Subject: [PATCH 343/425] platform/build/make - T is now 33 #2

update the api surface after some late fixes

Bug: 225745567
Test: Build
Change-Id: I5f14776ddb1d042c77ec4ea0fab0e25b4a89a4a1
---
 target/product/gsi/33.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/product/gsi/33.txt b/target/product/gsi/33.txt
index ae80b37e2a..22a2547ee0 100644
--- a/target/product/gsi/33.txt
+++ b/target/product/gsi/33.txt
@@ -84,7 +84,7 @@ VNDK-core: android.hardware.health.storage-V1-ndk.so
 VNDK-core: android.hardware.identity-V4-ndk.so
 VNDK-core: android.hardware.ir-V1-ndk.so
 VNDK-core: android.hardware.keymaster-V3-ndk.so
-VNDK-core: android.hardware.light-V1-ndk.so
+VNDK-core: android.hardware.light-V2-ndk.so
 VNDK-core: android.hardware.media.bufferpool@2.0.so
 VNDK-core: android.hardware.media.omx@1.0.so
 VNDK-core: android.hardware.media@1.0.so
@@ -92,7 +92,7 @@ VNDK-core: android.hardware.memtrack-V1-ndk.so
 VNDK-core: android.hardware.memtrack@1.0.so
 VNDK-core: android.hardware.nfc-V1-ndk.so
 VNDK-core: android.hardware.oemlock-V1-ndk.so
-VNDK-core: android.hardware.power-V2-ndk.so
+VNDK-core: android.hardware.power-V3-ndk.so
 VNDK-core: android.hardware.power.stats-V1-ndk.so
 VNDK-core: android.hardware.radio-V1-ndk.so
 VNDK-core: android.hardware.radio.config-V1-ndk.so

From 788648f63fecdd9997df47bec0ab2174fc862c1b Mon Sep 17 00:00:00 2001
From: Inseob Kim <inseob@google.com>
Date: Mon, 25 Apr 2022 18:20:36 +0900
Subject: [PATCH 344/425] Add PLATFORM_VERSION_LAST_STABLE to soong config

Bug: 189164487
Test: build
Change-Id: Iec36d22af80225f6da848bae1e02d263ff957df8
Merged-In: Iec36d22af80225f6da848bae1e02d263ff957df8
(cherry picked from commit a59b4dcd332a894e2223bf06256ccb43668901e6)
---
 core/soong_config.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 32675f2a5f..d03b687464 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -33,6 +33,7 @@ $(call add_json_csv,  Platform_version_active_codenames, $(PLATFORM_VERSION_ALL_
 $(call add_json_str,  Platform_security_patch,           $(PLATFORM_SECURITY_PATCH))
 $(call add_json_str,  Platform_preview_sdk_version,      $(PLATFORM_PREVIEW_SDK_VERSION))
 $(call add_json_str,  Platform_base_os,                  $(PLATFORM_BASE_OS))
+$(call add_json_str,  Platform_version_last_stable,      $(PLATFORM_VERSION_LAST_STABLE))
 
 $(call add_json_str,  Platform_min_supported_target_sdk_version, $(PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION))
 

From f1687f984845151b45b8e0e5c346a96f47ca6408 Mon Sep 17 00:00:00 2001
From: Yurii Zubrytskyi <zyy@google.com>
Date: Thu, 14 Apr 2022 11:36:04 -0700
Subject: [PATCH 345/425] RESTRICT AUTOMERGE platform/build/make - Tiramisu is
 now REL

Bug: 225745567
Test: Build
Change-Id: I9efa0b919e15bb2f55054ae0d59f53f572ba87cd
Merged-In: I61db64b279e4e64c9be33095bf98b3bbdb0e19d8
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 4e3f2a8654..fede388be0 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -53,7 +53,7 @@ PLATFORM_VERSION_LAST_STABLE := 13
 
 # These are the current development codenames, if the build is not a final
 # release build.  If this is a final release build, it is simply "REL".
-PLATFORM_VERSION_CODENAME.TP1A := Tiramisu
+PLATFORM_VERSION_CODENAME.TP1A := REL
 
 # This is the user-visible version.  In a final release build it should
 # be empty to use PLATFORM_VERSION as the user-visible version.  For

From 0348587a14bcdbb2f3f5a050e4673de1a70b48b7 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 6 May 2022 21:33:18 +0000
Subject: [PATCH 346/425] Version bump to TP1A.220506.002 [core/build_id.mk]

Change-Id: I04288eaae212913f59adcd3a31d1ef220026abed
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 27be54c4b5..dbdd1d3a00 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=TP1A.220506.001
+BUILD_ID=TP1A.220506.002

From f4406ca129874eecb6748b2dd9159ea7da7d71d6 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <zhangkelvin@google.com>
Date: Mon, 2 May 2022 12:19:45 -0700
Subject: [PATCH 347/425] Merge identical key/val pairs in dynamic partition
 info

We might add new values to dynamic_partition_info.txt, so some kind of
generic fallback mechanism is needed. If keys are different, we need to
decided on a case-by-case basis which side takes precedence. For
example, Virtual AB requires vendor support, so vendor side takes
precedence. VABC on T+ devices are implemented entirely in system, so
system/framework side takes precedence.

Bug: 230876542
Test: th
Change-Id: I67747368547d3ef3e29ad64f8f818ef4c5896246
(cherry picked from commit 6a683ce02b42bbb5c9b1e248f2b663e0855ace5c)
Merged-In: I67747368547d3ef3e29ad64f8f818ef4c5896246
---
 tools/releasetools/common.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index fcf6532126..418d8daa85 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1187,10 +1187,14 @@ def MergeDynamicPartitionInfoDicts(framework_dict, vendor_dict):
     return " ".join(sorted(combined))
 
   if (framework_dict.get("use_dynamic_partitions") !=
-          "true") or (vendor_dict.get("use_dynamic_partitions") != "true"):
+        "true") or (vendor_dict.get("use_dynamic_partitions") != "true"):
     raise ValueError("Both dictionaries must have use_dynamic_partitions=true")
 
   merged_dict = {"use_dynamic_partitions": "true"}
+  # For keys-value pairs that are the same, copy to merged dict
+  for key in vendor_dict.keys():
+    if key in framework_dict and framework_dict[key] == vendor_dict[key]:
+      merged_dict[key] = vendor_dict[key]
 
   merged_dict["dynamic_partition_list"] = uniq_concat(
       framework_dict.get("dynamic_partition_list", ""),

From d047f6968a90da0b523da1345e6a2ec3c164e163 Mon Sep 17 00:00:00 2001
From: Omer Osman <omerosman@google.com>
Date: Sun, 1 May 2022 03:24:22 +0000
Subject: [PATCH 348/425] Update VNDK core to link to BT Audio HAL V2 library

Bug: 226441860
Test: A2DP sink device using bds-dev
Change-Id: Ib6dee1dbe7ef74762ca3a2b8d3382a76e6f5f005
---
 target/product/gsi/33.txt      | 2 +-
 target/product/gsi/current.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

From 25d69c8bf5e2f25f58081b5fc918d3c343f248fd Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <zhangkelvin@google.com>
Date: Mon, 9 May 2022 10:20:52 -0700
Subject: [PATCH 349/425] Temporary hack for making T->S downgrade work

Downgrade OTA was broken because generic_ramdisk was removed from boot
partition in android T. Neither does O6 have init_boot. O6 also doesn't
include generic ramdisk in vendor boot, so no way for otatools to locate
contents of generic ramdisk. As a hack, omit boot partition timestamp if
we can't find ramdisk.

Test: generate T->S downgrade OTA for O6
Bug: 231656318
Merged-In: I9f5359462332aadadc324348873a3a4b2b126068
Change-Id: I9f5359462332aadadc324348873a3a4b2b126068
---
 tools/releasetools/ota_from_target_files.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index 522d489195..d1b935845f 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -1068,10 +1068,11 @@ def GeneratePartitionTimestampFlagsDowngrade(
         pre_partition_state, post_partition_state):
   assert pre_partition_state is not None
   partition_timestamps = {}
-  for part in pre_partition_state:
-    partition_timestamps[part.partition_name] = part.version
   for part in post_partition_state:
-    partition_timestamps[part.partition_name] = \
+    partition_timestamps[part.partition_name] = part.version
+  for part in pre_partition_state:
+    if part.partition_name in partition_timestamps:
+      partition_timestamps[part.partition_name] = \
         max(part.version, partition_timestamps[part.partition_name])
   return [
       "--partition_timestamps",

From e74f0728badd6225515cc69e40160a311156ee7f Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 10 May 2022 19:11:20 +0000
Subject: [PATCH 350/425] Version bump to TP1A.220510.002 [core/build_id.mk]

Change-Id: If9f81eb88ebf3c4961e4e12de7bb6b439eeac24e
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 5e688b534f..eb549da584 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=TP1A.220510.001
+BUILD_ID=TP1A.220510.002

From acc662e7cbbc34a34acacc7adaad98aad2ab1dc5 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 11 May 2022 01:31:30 +0000
Subject: [PATCH 351/425] Version bump to TP1A.220511.002 [core/build_id.mk]

Change-Id: Iddabfed15c7ba6ebd567dced44b744d46a53e16f
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 131cde936c..aaccc932e5 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=TP1A.220511.001
+BUILD_ID=TP1A.220511.002

From 7a00c23e636bea9c8f5ad65417eb5e9e80e2f5de Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 12 May 2022 01:21:05 +0000
Subject: [PATCH 352/425] Version bump to TP1A.220512.002 [core/build_id.mk]

Change-Id: I2f4ed9681e52bd4c844520865ca0b2963f8e4830
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 1d6ca08f96..cf6f85982d 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=TP1A.220512.001
+BUILD_ID=TP1A.220512.002

From 8f559e099d3263de0ab265a301c7d52f964e7055 Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Thu, 12 May 2022 13:17:02 +0900
Subject: [PATCH 353/425] Use non-next NetworkStack

NetworkStack now builds against stable T APIs, so T can use
the stable binaries instead of the "next" versions.

Since it has just been bumped, NetworkStack is equivalent to
NetworkStackNext at this point, so this is a no-op.

This change should not go into development branches using unstable SDKs
(including aosp/master downstreams), as per the merged-in.

Bug: 216396304
Test: m
Merged-In: I12348bd913f724c4675177ce6cdf582948d9d03c
Change-Id: I8788c5af37c862e9a74cc140d1dc917fb15ec5a9
---
 target/product/base_system.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 83ca2248ae..bc054cc495 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -225,7 +225,7 @@ PRODUCT_PACKAGES += \
     mtpd \
     ndc \
     netd \
-    NetworkStackNext \
+    NetworkStack \
     odsign \
     org.apache.http.legacy \
     otacerts \

From 85998a4a6188edda6a562db734c2b13175786531 Mon Sep 17 00:00:00 2001
From: Ken Chen <cken@google.com>
Date: Thu, 5 May 2022 14:24:37 +0800
Subject: [PATCH 354/425] Delete com.android.cronet from base_system

No concrete plan to ship Cronet for now

Merged-In ID is from an unrelated change in this project that happens to be merged into branches downstream of tm-dev.

Bug: 230548501
Test: TH
Merged-In: Ifc6051cd9422b3f5c52322833d9a7f5e8263f857
Change-Id: I0ee3418a0def50a61251af665fbded869e0329e7
---
 target/product/base_system.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 83ca2248ae..f2bb7517a2 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 \

From 661ff4fbd2b21309f98a1b015db3a94c7a169df1 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 12 May 2022 18:05:10 +0000
Subject: [PATCH 355/425] Version bump to TP1A.220512.003 [core/build_id.mk]

Change-Id: I0177379c9906d453ccc9ae68affc839a0c12eb7a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index cf6f85982d..917612eac2 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=TP1A.220512.002
+BUILD_ID=TP1A.220512.003

From e359b9008240897e5dcf0fe233e93dbed9560d4b Mon Sep 17 00:00:00 2001
From: Steve Berbary <sberbary@google.com>
Date: Thu, 12 May 2022 18:49:12 +0000
Subject: [PATCH 356/425] Update Security String to 2022-07-05

Bug: 231380374
Change-Id: I745bd646af530a8c202994e48a0821a5cb7ec3dd
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 0daae6bdcb..731d4989ee 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -240,7 +240,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
 .KATI_READONLY := PLATFORM_SECURITY_PATCH
 

From 1596620c590fbbc60cab678a52da2427512e038f Mon Sep 17 00:00:00 2001
From: Steve Berbary <sberbary@google.com>
Date: Thu, 12 May 2022 18:51:10 +0000
Subject: [PATCH 357/425] Update Security String to 2022-07-01

Bug: 231380374
Change-Id: I745bd646af530a8c202994e48a0821a5cb7ec3dd
Merged-In: I745bd646af530a8c202994e48a0821a5cb7ec3dd
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 0a3350a03b..e21a7336e0 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -250,7 +250,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-01
+      PLATFORM_SECURITY_PATCH := 2022-07-01
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH
 

From 72178e60bf819eb831a1ef712d4c6ddcc18bacec Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 12 May 2022 21:41:13 +0000
Subject: [PATCH 358/425] Version bump to TP1A.220512.004 [core/build_id.mk]

Change-Id: I64a248dbd7af84703998e4a0108469bd898ad45e
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 917612eac2..b113b52d25 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=TP1A.220512.003
+BUILD_ID=TP1A.220512.004

From bd3ea9e7f22b392e7dd15be0348a20f165eb3f81 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 13 May 2022 18:39:20 +0000
Subject: [PATCH 359/425] Version bump to TP1A.220513.002 [core/build_id.mk]

Change-Id: I075714e9abc5cc43fdf57944a53c06e7b1bd7e5c
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 671769d6e8..3bef9dd481 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=TP1A.220513.001
+BUILD_ID=TP1A.220513.002

From 596724b8ce990e4734cbe81188fad0af685f9fb1 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Sun, 15 May 2022 21:49:13 +0000
Subject: [PATCH 360/425] Version bump to TP1A.220516.002 [core/build_id.mk]

Change-Id: Ie6a11d9f4b3574d0a4051cf39ac356d244b0f63f
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 60c1b1b261..8f16a3c382 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=TP1A.220516.001
+BUILD_ID=TP1A.220516.002

From 50370ff77e749eb3d1e8f5abf3fdccabed72b333 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 17 May 2022 05:49:07 +0000
Subject: [PATCH 361/425] Version bump to TP1A.220517.002 [core/build_id.mk]

Change-Id: I2e11c7a605075c41bf21d57815d4fc146f2dd659
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 915b5d9acc..5bb2303ddb 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=TP1A.220517.001
+BUILD_ID=TP1A.220517.002

From c56b11cb87a2bd81f3d39756f3ea5df97b5c90ff Mon Sep 17 00:00:00 2001
From: Frederick Mayle <fmayle@google.com>
Date: Thu, 12 May 2022 21:41:27 +0000
Subject: [PATCH 362/425] Remove "@1.0-" from android.system.suspend service's
 name

Bug: 232447926
Test: TH
Change-Id: If177707ae0459cd3e0521d3b8fba8417c5609c5f
---
 target/product/base_system.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 83ca2248ae..60b0a2a21f 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -24,7 +24,7 @@ PRODUCT_PACKAGES += \
     android.hidl.manager-V1.0-java \
     android.hidl.memory@1.0-impl \
     android.hidl.memory@1.0-impl.vendor \
-    android.system.suspend@1.0-service \
+    android.system.suspend-service \
     android.test.base \
     android.test.mock \
     android.test.runner \

From 38ef68931ab02713360c4e5b34f973dc544e50ec Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 18 May 2022 01:43:10 +0000
Subject: [PATCH 363/425] Version bump to TP1A.220518.002 [core/build_id.mk]

Change-Id: Iae4607b9427911ad04e98f91af830c2f4c1041ed
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index c5c58671be..0f4f402a4c 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=TP1A.220518.001
+BUILD_ID=TP1A.220518.002

From ec7b36fabd8036d03de7c914fa7fbda92430d59c Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 19 May 2022 00:15:48 +0000
Subject: [PATCH 364/425] Version bump to TP1A.220519.002 [core/build_id.mk]

Change-Id: I9e7a8675ab24a91ec3cba1a41f4123dd8a7801f6
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 2716bd35d6..eeaea4abb7 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=TP1A.220519.001
+BUILD_ID=TP1A.220519.002

From e710be2d83e5915c502b4708cd36d81a885d6ce9 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 19 May 2022 06:53:23 +0000
Subject: [PATCH 365/425] Version bump to TP1A.220519.003 [core/build_id.mk]

Change-Id: I7a0d04fd56ef67422f94dee1894294a8d0b5c843
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index eeaea4abb7..6563173244 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=TP1A.220519.002
+BUILD_ID=TP1A.220519.003

From de9f0b12f1b1f9f57358caf5d63af2e3124fe1b7 Mon Sep 17 00:00:00 2001
From: Dario Freni <dariofreni@google.com>
Date: Tue, 29 Mar 2022 15:21:41 +0000
Subject: [PATCH 366/425] Enable mainline prebuilts on tm-dev branch.

Except for santizer and framework Java coverage tests as they require
specialized prebuilts built from a matching configuration and we do not
provide them.

Bug: 230478310
Bug: 223592962
Test: presubmit
Merged-In: I3ed091156c4b39dad6eaf578144ac3d070025988
Merged-In: I9731400acfade95b3eab8f2d99fddb4cf856aa91
Change-Id: Ibc3ea584b95f8186c63e29f71b5164451dc433cd
---
 core/android_soong_config_vars.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 329847fbbd..144edd088e 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -39,7 +39,14 @@ $(call add_soong_config_var,ANDROID,PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT)
 # Default behavior for the tree wrt building modules or using prebuilts. This
 # can always be overridden by setting the environment variable
 # MODULE_BUILD_FROM_SOURCE.
-BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
+ifneq ($(SANITIZE_TARGET)$(EMMA_INSTRUMENT_FRAMEWORK),)
+  # Always use sources when building the framework with Java coverage or
+  # sanitized builds as they both require purpose built prebuilts which we do
+  # not provide.
+  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
+else
+  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := false
+endif
 
 ifneq (,$(MODULE_BUILD_FROM_SOURCE))
   # Keep an explicit setting.

From dddc036bd1d6c3fb8a403dbdd20ac062af574000 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Sat, 21 May 2022 00:12:03 +0000
Subject: [PATCH 367/425] Revert "Enable mainline prebuilts on tm-dev branch."

This reverts commit de9f0b12f1b1f9f57358caf5d63af2e3124fe1b7.

Reason for revert: breaks build_test and build_test2 on git_tm-dev.

Reverting the topic together does not work due to limitations with TH. However, this is the change that caused the error, the other changes were just fixing issues unrelated to this specific problem.

Bug: 233412962
Bug: 230478310
Bug: 223592962
Change-Id: I4d4de4f4c63c9c34fb083edbe76b09852af357e4
Test: presubmit
---
 core/android_soong_config_vars.mk | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 144edd088e..329847fbbd 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -39,14 +39,7 @@ $(call add_soong_config_var,ANDROID,PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT)
 # Default behavior for the tree wrt building modules or using prebuilts. This
 # can always be overridden by setting the environment variable
 # MODULE_BUILD_FROM_SOURCE.
-ifneq ($(SANITIZE_TARGET)$(EMMA_INSTRUMENT_FRAMEWORK),)
-  # Always use sources when building the framework with Java coverage or
-  # sanitized builds as they both require purpose built prebuilts which we do
-  # not provide.
-  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
-else
-  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := false
-endif
+BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
 
 ifneq (,$(MODULE_BUILD_FROM_SOURCE))
   # Keep an explicit setting.

From 8248deb03026c43b211c1a0ae27a88a0112fc64e Mon Sep 17 00:00:00 2001
From: Oriol Prieto Gasco <opg@google.com>
Date: Fri, 20 May 2022 21:07:05 +0000
Subject: [PATCH 368/425] RESTRICT AUTOMERGE Update Build ID for APK-in-APEX
 fix for July

Bug: 229625490
Change-Id: I622ab780c9dac19e0216b3b2e079ca577381d632
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 52ccf822df..63aa8fbf1b 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=M_2022_05
+BUILD_ID=M_2022_07

From c7b5e2c0cea30dd084536bdc68dffdfb1c50073d Mon Sep 17 00:00:00 2001
From: Dario Freni <dariofreni@google.com>
Date: Tue, 29 Mar 2022 15:21:41 +0000
Subject: [PATCH 369/425] Retry: Enable mainline prebuilts on tm-dev branch.

Except for santizer and framework Java coverage tests as they require
specialized prebuilts built from a matching configuration and we do not
provide them.

And products that use dex2oat(d)s as they are not available as a
prebuilt.

And products that cross compile to arm64 and linux_bionic on the host
as prebuilts for that are not available.

And atv/tv products as they break when building against prebuilts.

Bug: 230478310
Bug: 223592962
Test: presubmit
Merged-In: I3ed091156c4b39dad6eaf578144ac3d070025988
Merged-In: I9731400acfade95b3eab8f2d99fddb4cf856aa91
Merged-In: I43fa4ae8db51012eaf78d70fe65e9e0a3f7eca16
Change-Id: Ib01ba9e2e3c2225c88d52b6811edf04aff02c81e
---
 core/android_soong_config_vars.mk | 40 ++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 329847fbbd..a6116f215b 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -39,7 +39,45 @@ $(call add_soong_config_var,ANDROID,PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT)
 # Default behavior for the tree wrt building modules or using prebuilts. This
 # can always be overridden by setting the environment variable
 # MODULE_BUILD_FROM_SOURCE.
-BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
+BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := false
+
+ifneq ($(SANITIZE_TARGET)$(EMMA_INSTRUMENT_FRAMEWORK),)
+  # Always use sources when building the framework with Java coverage or
+  # sanitized builds as they both require purpose built prebuilts which we do
+  # not provide.
+  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
+endif
+
+# TODO(b/172063604): Remove once products no longer use dex2oat(d)s.
+# If the product uses dex2oats and/or dex2oatds then build from sources as
+# ART does not currently provide prebuilts of those tools.
+ifneq (,$(filter dex2oats dex2oatds,$(PRODUCT_HOST_PACKAGES)))
+  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
+endif
+
+# ART does not provide linux_bionic variants needed for products that
+# set HOST_CROSS_OS=linux_bionic.
+ifeq (linux_bionic,${HOST_CROSS_OS})
+  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
+endif
+
+# ART does not provide host side arm64 variants needed for products that
+# set HOST_CROSS_ARCH=arm64.
+ifeq (arm64,${HOST_CROSS_ARCH})
+  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
+endif
+
+# TV based devices do not seem to work with prebuilts, so build from source
+# for now and fix in a follow up.
+ifneq (,$(filter tv,$(subst $(comma),$(space),${PRODUCT_CHARACTERISTICS})))
+  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
+endif
+
+# ATV based devices do not seem to work with prebuilts, so build from source
+# for now and fix in a follow up.
+ifneq (,${PRODUCT_IS_ATV})
+  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
+endif
 
 ifneq (,$(MODULE_BUILD_FROM_SOURCE))
   # Keep an explicit setting.

From 42d97799f33ec94f631d97d2b2f140db96b016aa Mon Sep 17 00:00:00 2001
From: Matt Casey <mrcasey@google.com>
Date: Tue, 24 May 2022 16:17:39 +0000
Subject: [PATCH 370/425] Remove IntentResolver from build

Not currently in use, need some allowlisting before we can launch with
in the build.

Bug: 233468811
Bug: 215295976
Test: Run sharesheet, presubmits.
Change-Id: I1bafa1d4f6c10b88f7b758983f8f8f457463901a
---
 target/product/base_system.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 998327e9a0..6f6cd79214 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -120,7 +120,6 @@ PRODUCT_PACKAGES += \
     init_system \
     input \
     installd \
-    IntentResolver \
     ip \
     iptables \
     ip-up-vpn \

From 183b53f429e54020d56ce1c6d599341f4ebf84d8 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 24 May 2022 18:39:14 +0000
Subject: [PATCH 371/425] Version bump to TP1A.220524.002 [core/build_id.mk]

Change-Id: Ibb36d47349159781f2351a59001f7e147322ec88
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 331271372c..622d3e9fd8 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=TP1A.220524.001
+BUILD_ID=TP1A.220524.002

From bcece8e77708c1305b09146fab5c21a2761d83ca Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 25 May 2022 03:43:15 +0000
Subject: [PATCH 372/425] Version bump to TP1A.220525.002 [core/build_id.mk]

Change-Id: Ic3bdca7b1becf5c028f9f82cbbc18048affe9352
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index db19ecf495..dcdd8ebebb 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=TP1A.220525.001
+BUILD_ID=TP1A.220525.002

From a0ab45384de78795aa9f778e33ae162710e0b14b Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Mon, 25 Apr 2022 16:29:15 +0100
Subject: [PATCH 373/425] Remove notice file for sdk system image

The system image itself is being removed from the sdk zip,
so remove the NOTICE file for it at the same time.

Bug: 205008975
Test: m sdk sdk_repo dist
Merged-In: Ib75b3e5919cd203e58e03efc1cb0a378283b0c34
Change-Id: Ib75b3e5919cd203e58e03efc1cb0a378283b0c34
---
 core/Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index 93b3e03af7..d9b4654b9d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1571,7 +1571,6 @@ ifndef TARGET_BUILD_APPS
 # TODO These intermediate NOTICE.txt/NOTICE.html files should go into
 # TARGET_OUT_NOTICE_FILES now that the notice files are gathered from
 # the src subdirectory.
-target_notice_file_txt := $(TARGET_OUT_INTERMEDIATES)/NOTICE.txt
 kernel_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/kernel.txt
 winpthreads_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/winpthreads.txt
 
@@ -6825,7 +6824,6 @@ sdk_atree_files += $(atree_dir)/sdk.atree
 endif
 
 deps := \
-	$(target_notice_file_txt) \
 	$(OUT_DOCS)/offline-sdk-timestamp \
 	$(SDK_METADATA_FILES) \
 	$(SYMBOLS_ZIP) \
@@ -6882,8 +6880,6 @@ $(INTERNAL_SDK_TARGET): $(deps)
 	        -v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \
 	        -v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \
 	        -o $(PRIVATE_DIR) && \
-	    cp -f $(target_notice_file_txt) \
-	            $(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \
 	    HOST_OUT_EXECUTABLES=$(HOST_OUT_EXECUTABLES) HOST_OS=$(HOST_OS) \
 	        development/build/tools/sdk_clean.sh $(PRIVATE_DIR) && \
 	    chmod -R ug+rwX $(PRIVATE_DIR) && \

From 09fc47b6ce39c0913a8df8cfe009314b766e4274 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 12 May 2022 08:45:29 +0000
Subject: [PATCH 374/425] Remove unused dependencies from sdk goals

The SDK no longer includes system images, so no longer needs to depend
on targets that are only relevant for the system images.

Remove all the explicit dependencies that end up depending on
"everything" but are not included in the sdk zip.

Two positive side-effects:
- fewer unused things get built (now ~32k targets, down from ~108k)
- apexes no longer get built, eliminating the risk of mismatch between
  module sdk prebuilts and source-built AOSP apexes.

There are some potential risks with this CL:
- because we no longer forcefully rebuild everything, if there are bugs
  in dependencies of exising files in the SDK, incremental builds may
  not rebuild them.
- some files that get built into the SDK may be being built as a
  side-effect of other files included in the SDK, so removing one file
  may cause another to not get built. The solution to that is to add
  the file not getting built to ALL_SDK_FILES.

Bug: 205008975
Test: m sdk sdk_repo dist && diff sdk.zip before/after (identical)
Merged-In: I97284864f66aa88556fbe16864f45b04be97634e
Change-Id: I97284864f66aa88556fbe16864f45b04be97634e
---
 core/Makefile | 26 +-------------------------
 core/main.mk  |  4 ----
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index d9b4654b9d..de9fd52c12 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -842,10 +842,6 @@ $(INSTALLED_FILES_FILE_ROOT) : $(INTERNAL_ROOT_FILES) $(FILESLIST) $(FILESLIST_U
 $(call declare-0p-target,$(INSTALLED_FILES_FILE_ROOT))
 $(call declare-0p-target,$(INSTALLED_FILES_JSON_ROOT))
 
-ifeq ($(HOST_OS),linux)
-$(call dist-for-goals, sdk sdk_addon, $(INSTALLED_FILES_FILE_ROOT))
-endif
-
 #------------------------------------------------------------------
 # dtb
 ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG
@@ -877,9 +873,6 @@ $(INSTALLED_FILES_FILE_RAMDISK) : $(INTERNAL_RAMDISK_FILES) $(FILESLIST) $(FILES
 $(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_RAMDISK)))
 $(eval $(call declare-0p-target,$(INSTALLED_FILES_JSON_RAMDISK)))
 
-ifeq ($(HOST_OS),linux)
-$(call dist-for-goals, sdk sdk_addon, $(INSTALLED_FILES_FILE_RAMDISK))
-endif
 BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img
 
 ifeq ($(BOARD_RAMDISK_USE_LZ4),true)
@@ -3108,10 +3101,6 @@ $(eval $(call declare-0p-target,$(INSTALLED_FILES_JSON)))
 .PHONY: installed-file-list
 installed-file-list: $(INSTALLED_FILES_FILE)
 
-ifeq ($(HOST_OS),linux)
-$(call dist-for-goals, sdk sdk_addon, $(INSTALLED_FILES_FILE))
-endif
-
 systemimage_intermediates := \
     $(call intermediates-dir-for,PACKAGING,systemimage)
 BUILT_SYSTEMIMAGE := $(systemimage_intermediates)/system.img
@@ -6798,8 +6787,6 @@ ATREE_FILES :=
 # if we don't have a real list, then use "everything"
 ifeq ($(strip $(ATREE_FILES)),)
 ATREE_FILES := \
-	$(ALL_DEFAULT_INSTALLED_MODULES) \
-	$(INSTALLED_RAMDISK_TARGET) \
 	$(ALL_DOCS) \
 	$(ALL_SDK_FILES)
 endif
@@ -6826,18 +6813,7 @@ endif
 deps := \
 	$(OUT_DOCS)/offline-sdk-timestamp \
 	$(SDK_METADATA_FILES) \
-	$(SYMBOLS_ZIP) \
-	$(COVERAGE_ZIP) \
-	$(APPCOMPAT_ZIP) \
-	$(INSTALLED_SYSTEMIMAGE_TARGET) \
-	$(INSTALLED_QEMU_SYSTEMIMAGE) \
-	$(INSTALLED_QEMU_RAMDISKIMAGE) \
-	$(INSTALLED_QEMU_VENDORIMAGE) \
-	$(QEMU_VERIFIED_BOOT_PARAMS) \
-	$(INSTALLED_USERDATAIMAGE_TARGET) \
-	$(INSTALLED_RAMDISK_TARGET) \
-	$(INSTALLED_SDK_BUILD_PROP_TARGET) \
-	$(INSTALLED_BUILD_PROP_TARGET) \
+  $(INSTALLED_SDK_BUILD_PROP_TARGET) \
 	$(ATREE_FILES) \
 	$(sdk_atree_files) \
 	$(HOST_OUT_EXECUTABLES)/atree \
diff --git a/core/main.mk b/core/main.mk
index e0efdad61e..c63c6dfde9 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1936,10 +1936,6 @@ ALL_SDK_TARGETS := $(INTERNAL_SDK_TARGET)
 sdk: $(ALL_SDK_TARGETS)
 $(call dist-for-goals,sdk, \
     $(ALL_SDK_TARGETS) \
-    $(SYMBOLS_ZIP) \
-    $(SYMBOLS_MAPPING) \
-    $(COVERAGE_ZIP) \
-    $(APPCOMPAT_ZIP) \
     $(INSTALLED_BUILD_PROP_TARGET) \
 )
 endif

From 28f089d9b0c8f61e865a9e0e6131b7a42db43ab1 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 12 May 2022 18:41:40 +0000
Subject: [PATCH 375/425] Slim down the sdk product

The sdk_phone_armv7 product is designed to build system images, which
adds unnecessary dependencies and enables unnecessary checks (such as
verifying dexpreopt artifacts).

Bug: 205008975
Test: m sdk sdk_repo dist && diff android-sdk.zip (only build.prop diffs)
Merged-In: I940655c39a3ae58839521416abafaf461df44921
Change-Id: I940655c39a3ae58839521416abafaf461df44921
---
 target/product/sdk.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 96d8cc94e1..fa7e1ad381 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -14,8 +14,11 @@
 # limitations under the License.
 #
 
-# Don't modify this file - It's just an alias!
+# This is a simple product that uses configures the minimum amount
+# needed to build the SDK (without the emulator).
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_phone_armv7.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)
 
 PRODUCT_NAME := sdk
+PRODUCT_BRAND := Android
+PRODUCT_DEVICE := mainline_x86

From ca7160e531e8bedc73b8dc7928312a1df2e2fe11 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 27 May 2022 20:29:01 +0000
Subject: [PATCH 376/425] Version bump to TP1A.220527.002 [core/build_id.mk]

Change-Id: I40ccd3aaaa14dca3038c117c3c4711013ad3736b
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 4f2b23d4e4..e15f6b6664 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=TP1A.220527.001
+BUILD_ID=TP1A.220527.002

From f372ce1415ad9078a253af6b80f7f65ad611c0c7 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Thu, 26 May 2022 10:19:18 +0000
Subject: [PATCH 377/425] Disable prebuilts when building with clang coverage

Prebuilts broke the cf_x86_phone-userdebug_coverage_bionic
on tm-release build.

Bug: 230478310
Bug: 223592962
Test: presubmit
Merged-In: I3ed091156c4b39dad6eaf578144ac3d070025988
Merged-In: I9731400acfade95b3eab8f2d99fddb4cf856aa91
Merged-In: I6eca2fcc670dccef4a6cd9dc3f08003eb47e5bca
Change-Id: I40c10e88b824e5f4b783b1dc0a500096fad209b2
---
 core/android_soong_config_vars.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index a6116f215b..28181ebfae 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -48,6 +48,18 @@ ifneq ($(SANITIZE_TARGET)$(EMMA_INSTRUMENT_FRAMEWORK),)
   BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
 endif
 
+ifneq ($(CLANG_COVERAGE)$(NATIVE_COVERAGE_PATHS),)
+  # Always use sources when building with clang coverage and native coverage.
+  # It is possible that there are certain situations when building with coverage
+  # would work with prebuilts, e.g. when the coverage is not being applied to
+  # modules for which we provide prebuilts. Unfortunately, determining that
+  # would require embedding knowledge of which coverage paths affect which
+  # modules here. That would duplicate a lot of information, add yet another
+  # location  module authors have to update and complicate the logic here.
+  # For nowe we will just always build from sources when doing coverage builds.
+  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
+endif
+
 # TODO(b/172063604): Remove once products no longer use dex2oat(d)s.
 # If the product uses dex2oats and/or dex2oatds then build from sources as
 # ART does not currently provide prebuilts of those tools.

From cc924e50f10aa29f7447e0a729ff35ca3c4c8f83 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 1 Jun 2022 00:37:09 +0000
Subject: [PATCH 378/425] Version bump to TP1A.220601.002 [core/build_id.mk]

Change-Id: I50e74201e42782fc8f041ca4cfe6908b686b3cdf
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 405d19cd4d..558c551397 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=TP1A.220601.001
+BUILD_ID=TP1A.220601.002

From 43d6894ab0f409b4c67ca9db64f205304a4b37c2 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 2 Jun 2022 19:57:05 +0000
Subject: [PATCH 379/425] Version bump to TP1A.220602.002 [core/build_id.mk]

Change-Id: I0606c1b28ba5c38f6ff2c9e47dfb3a3ecac8d39a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index b2b0fb9f33..19fd9bcc21 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=TP1A.220602.001
+BUILD_ID=TP1A.220602.002

From ec5522e7763732e9ebc83c0ea1f7ff57dd5f3ae1 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 3 Jun 2022 19:05:14 +0000
Subject: [PATCH 380/425] Version bump to TP1A.220603.002 [core/build_id.mk]

Change-Id: I0fc55083fa33590f3a182682c72260c8f5b0d4af
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 5e9cb53c60..4f7f4a1832 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=TP1A.220603.001
+BUILD_ID=TP1A.220603.002

From 3a445abd7681e503107b9b20e3eafb09887fbb9e Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 8 Jun 2022 10:01:22 -0700
Subject: [PATCH 381/425] Remove Tiramisu codename from branches downstream of
 tm-dev

Tiramisu has been finalized in tm-dev, remove the codename from
branches downstream of tm-dev.

Bug: 225745567
Test: treehugger
Change-Id: I12d5a0d018cd8a7dc53136dc67cd23b78b56d55a
---
 core/version_defaults.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index a95d8281ec..4ed8673634 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -42,7 +42,7 @@ endif
 
 DEFAULT_PLATFORM_VERSION := UP1A
 .KATI_READONLY := DEFAULT_PLATFORM_VERSION
-MIN_PLATFORM_VERSION := TP1A
+MIN_PLATFORM_VERSION := UP1A
 MAX_PLATFORM_VERSION := UP1A
 
 # The last stable version name of the platform that was released.  During
@@ -53,7 +53,6 @@ PLATFORM_VERSION_LAST_STABLE := 13
 
 # These are the current development codenames, if the build is not a final
 # release build.  If this is a final release build, it is simply "REL".
-PLATFORM_VERSION_CODENAME.TP1A := Tiramisu
 PLATFORM_VERSION_CODENAME.UP1A := UpsideDownCake
 
 # This is the user-visible version.  In a final release build it should

From b5353a160b34b4da536acd44ff37193879ac8111 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Tue, 7 Jun 2022 21:07:11 -0700
Subject: [PATCH 382/425] Fix license package name and provide license text.

Bug: 235331488

Test: m droid dist

Change-Id: Ic450732083773668bf9d9d0e1fffa1852f88ab45
Merged-in: Ic450732083773668bf9d9d0e1fffa1852f88ab45
---
 core/tasks/tools/package-modules.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/tasks/tools/package-modules.mk b/core/tasks/tools/package-modules.mk
index 20a1694682..f89d51eea0 100644
--- a/core/tasks/tools/package-modules.mk
+++ b/core/tasks/tools/package-modules.mk
@@ -21,6 +21,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := $(my_package_name)
 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
 LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_LICENSE_PACKAGE_NAME := Android
+LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
 LOCAL_MODULE_CLASS := PACKAGING
 LOCAL_MODULE_STEM := $(my_package_name).zip
 LOCAL_UNINSTALLABLE_MODULE := true

From fae08baef5ca73d5a686771b78ac199e63e0f369 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 9 Jun 2022 17:35:09 +0000
Subject: [PATCH 383/425] Version bump to TP1A.220609.002 [core/build_id.mk]

Change-Id: I28b053ea7c134996879249475190333dbf91a74a
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index cf98e785c8..6cde9b8163 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=TP1A.220609.001
+BUILD_ID=TP1A.220609.002

From ccf947490cd6105d93aa8035ead64971eab48152 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Fri, 3 Jun 2022 10:42:27 -0700
Subject: [PATCH 384/425] Improve flags for compliance tools.

Bug: 235333302

Test: m droid dist reportmissinglicenses

Change-Id: I4090dae3d5d33d1908d67dff31aeee92d2b261da
Merged-in: I4090dae3d5d33d1908d67dff31aeee92d2b261da
---
 tools/compliance/Android.bp                   |  33 ++++-
 tools/compliance/cmd/bom/bom.go               |  68 ++++++----
 tools/compliance/cmd/checkshare/checkshare.go | 117 +++++++++++++----
 tools/compliance/cmd/dumpgraph/dumpgraph.go   | 112 ++++++++++++----
 .../cmd/dumpresolutions/dumpresolutions.go    | 114 ++++++++++++----
 tools/compliance/cmd/htmlnotice/htmlnotice.go |  78 +++++++----
 tools/compliance/cmd/listshare/listshare.go   |  91 ++++++++++---
 tools/compliance/cmd/rtrace/rtrace.go         | 122 +++++++++++++-----
 .../compliance/cmd/shippedlibs/shippedlibs.go |   3 -
 tools/compliance/cmd/textnotice/textnotice.go |  74 +++++++----
 tools/compliance/cmd/xmlnotice/xmlnotice.go   |  76 +++++++----
 11 files changed, 649 insertions(+), 239 deletions(-)

diff --git a/tools/compliance/Android.bp b/tools/compliance/Android.bp
index 7a6c4ba4c0..225f3a578b 100644
--- a/tools/compliance/Android.bp
+++ b/tools/compliance/Android.bp
@@ -20,14 +20,20 @@ package {
 blueprint_go_binary {
     name: "compliance_checkshare",
     srcs: ["cmd/checkshare/checkshare.go"],
-    deps: ["compliance-module"],
+    deps: [
+        "compliance-module",
+        "soong-response",
+    ],
     testSrcs: ["cmd/checkshare/checkshare_test.go"],
 }
 
 blueprint_go_binary {
     name: "compliancenotice_bom",
     srcs: ["cmd/bom/bom.go"],
-    deps: ["compliance-module"],
+    deps: [
+        "compliance-module",
+        "soong-response",
+    ],
     testSrcs: ["cmd/bom/bom_test.go"],
 }
 
@@ -44,21 +50,30 @@ blueprint_go_binary {
 blueprint_go_binary {
     name: "compliance_listshare",
     srcs: ["cmd/listshare/listshare.go"],
-    deps: ["compliance-module"],
+    deps: [
+        "compliance-module",
+        "soong-response",
+    ],
     testSrcs: ["cmd/listshare/listshare_test.go"],
 }
 
 blueprint_go_binary {
     name: "compliance_dumpgraph",
     srcs: ["cmd/dumpgraph/dumpgraph.go"],
-    deps: ["compliance-module"],
+    deps: [
+        "compliance-module",
+        "soong-response",
+    ],
     testSrcs: ["cmd/dumpgraph/dumpgraph_test.go"],
 }
 
 blueprint_go_binary {
     name: "compliance_dumpresolutions",
     srcs: ["cmd/dumpresolutions/dumpresolutions.go"],
-    deps: ["compliance-module"],
+    deps: [
+        "compliance-module",
+        "soong-response",
+    ],
     testSrcs: ["cmd/dumpresolutions/dumpresolutions_test.go"],
 }
 
@@ -68,6 +83,7 @@ blueprint_go_binary {
     deps: [
         "compliance-module",
         "blueprint-deptools",
+        "soong-response",
     ],
     testSrcs: ["cmd/htmlnotice/htmlnotice_test.go"],
 }
@@ -75,7 +91,10 @@ blueprint_go_binary {
 blueprint_go_binary {
     name: "compliance_rtrace",
     srcs: ["cmd/rtrace/rtrace.go"],
-    deps: ["compliance-module"],
+    deps: [
+        "compliance-module",
+        "soong-response",
+    ],
     testSrcs: ["cmd/rtrace/rtrace_test.go"],
 }
 
@@ -85,6 +104,7 @@ blueprint_go_binary {
     deps: [
         "compliance-module",
         "blueprint-deptools",
+        "soong-response",
     ],
     testSrcs: ["cmd/textnotice/textnotice_test.go"],
 }
@@ -95,6 +115,7 @@ blueprint_go_binary {
     deps: [
         "compliance-module",
         "blueprint-deptools",
+        "soong-response",
     ],
     testSrcs: ["cmd/xmlnotice/xmlnotice_test.go"],
 }
diff --git a/tools/compliance/cmd/bom/bom.go b/tools/compliance/cmd/bom/bom.go
index b613a1f9ff..187f828057 100644
--- a/tools/compliance/cmd/bom/bom.go
+++ b/tools/compliance/cmd/bom/bom.go
@@ -24,13 +24,11 @@ import (
 	"path/filepath"
 	"strings"
 
+	"android/soong/response"
 	"android/soong/tools/compliance"
 )
 
 var (
-	outputFile  = flag.String("o", "-", "Where to write the bill of materials. (default stdout)")
-	stripPrefix = newMultiString("strip_prefix", "Prefix to remove from paths. i.e. path to root (multiple allowed)")
-
 	failNoneRequested = fmt.Errorf("\nNo license metadata files requested")
 	failNoLicenses    = fmt.Errorf("No licenses found")
 )
@@ -55,22 +53,10 @@ func (ctx context) strip(installPath string) string {
 	return installPath
 }
 
-func init() {
-	flag.Usage = func() {
-		fmt.Fprintf(os.Stderr, `Usage: %s {options} file.meta_lic {file.meta_lic...}
-
-Outputs a bill of materials. i.e. the list of installed paths.
-
-Options:
-`, filepath.Base(os.Args[0]))
-		flag.PrintDefaults()
-	}
-}
-
 // newMultiString creates a flag that allows multiple values in an array.
-func newMultiString(name, usage string) *multiString {
+func newMultiString(flags *flag.FlagSet, name, usage string) *multiString {
 	var f multiString
-	flag.Var(&f, name, usage)
+	flags.Var(&f, name, usage)
 	return &f
 }
 
@@ -81,16 +67,52 @@ func (ms *multiString) String() string     { return strings.Join(*ms, ", ") }
 func (ms *multiString) Set(s string) error { *ms = append(*ms, s); return nil }
 
 func main() {
-	flag.Parse()
+	var expandedArgs []string
+	for _, arg := range os.Args[1:] {
+		if strings.HasPrefix(arg, "@") {
+			f, err := os.Open(strings.TrimPrefix(arg, "@"))
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+
+			respArgs, err := response.ReadRspFile(f)
+			f.Close()
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+			expandedArgs = append(expandedArgs, respArgs...)
+		} else {
+			expandedArgs = append(expandedArgs, arg)
+		}
+	}
+
+	flags := flag.NewFlagSet("flags", flag.ExitOnError)
+
+	flags.Usage = func() {
+		fmt.Fprintf(os.Stderr, `Usage: %s {options} file.meta_lic {file.meta_lic...}
+
+Outputs a bill of materials. i.e. the list of installed paths.
+
+Options:
+`, filepath.Base(os.Args[0]))
+		flags.PrintDefaults()
+	}
+
+	outputFile := flags.String("o", "-", "Where to write the bill of materials. (default stdout)")
+	stripPrefix := newMultiString(flags, "strip_prefix", "Prefix to remove from paths. i.e. path to root (multiple allowed)")
+
+	flags.Parse(expandedArgs)
 
 	// Must specify at least one root target.
-	if flag.NArg() == 0 {
-		flag.Usage()
+	if flags.NArg() == 0 {
+		flags.Usage()
 		os.Exit(2)
 	}
 
 	if len(*outputFile) == 0 {
-		flag.Usage()
+		flags.Usage()
 		fmt.Fprintf(os.Stderr, "must specify file for -o; use - for stdout\n")
 		os.Exit(2)
 	} else {
@@ -118,10 +140,10 @@ func main() {
 
 	ctx := &context{ofile, os.Stderr, compliance.FS, *stripPrefix}
 
-	err := billOfMaterials(ctx, flag.Args()...)
+	err := billOfMaterials(ctx, flags.Args()...)
 	if err != nil {
 		if err == failNoneRequested {
-			flag.Usage()
+			flags.Usage()
 		}
 		fmt.Fprintf(os.Stderr, "%s\n", err.Error())
 		os.Exit(1)
diff --git a/tools/compliance/cmd/checkshare/checkshare.go b/tools/compliance/cmd/checkshare/checkshare.go
index 73bdcb5679..f7b4cd2e39 100644
--- a/tools/compliance/cmd/checkshare/checkshare.go
+++ b/tools/compliance/cmd/checkshare/checkshare.go
@@ -15,6 +15,7 @@
 package main
 
 import (
+	"bytes"
 	"flag"
 	"fmt"
 	"io"
@@ -22,31 +23,12 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
+	"strings"
 
+	"android/soong/response"
 	"android/soong/tools/compliance"
 )
 
-func init() {
-	flag.Usage = func() {
-		fmt.Fprintf(os.Stderr, `Usage: %s file.meta_lic {file.meta_lic...}
-
-Reports on stderr any targets where policy says that the source both
-must and must not be shared. The error report indicates the target, the
-license condition that has a source privacy policy, and the license
-condition that has a source sharing policy.
-
-Any given target may appear multiple times with different combinations
-of conflicting license conditions.
-
-If all the source code that policy says must be shared may be shared,
-outputs "PASS" to stdout and exits with status 0.
-
-If policy says any source must both be shared and not be shared,
-outputs "FAIL" to stdout and exits with status 1.
-`, filepath.Base(os.Args[0]))
-	}
-}
-
 var (
 	failConflicts     = fmt.Errorf("conflicts")
 	failNoneRequested = fmt.Errorf("\nNo metadata files requested")
@@ -61,24 +43,105 @@ func (l byError) Swap(i, j int)      { l[i], l[j] = l[j], l[i] }
 func (l byError) Less(i, j int) bool { return l[i].Error() < l[j].Error() }
 
 func main() {
-	flag.Parse()
+	var expandedArgs []string
+	for _, arg := range os.Args[1:] {
+		if strings.HasPrefix(arg, "@") {
+			f, err := os.Open(strings.TrimPrefix(arg, "@"))
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+
+			respArgs, err := response.ReadRspFile(f)
+			f.Close()
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+			expandedArgs = append(expandedArgs, respArgs...)
+		} else {
+			expandedArgs = append(expandedArgs, arg)
+		}
+	}
+
+	flags := flag.NewFlagSet("flags", flag.ExitOnError)
+
+	flags.Usage = func() {
+		fmt.Fprintf(os.Stderr, `Usage: %s {-o outfile} file.meta_lic {file.meta_lic...}
+
+Reports on stderr any targets where policy says that the source both
+must and must not be shared. The error report indicates the target, the
+license condition that has a source privacy policy, and the license
+condition that has a source sharing policy.
+
+Any given target may appear multiple times with different combinations
+of conflicting license conditions.
+
+If all the source code that policy says must be shared may be shared,
+outputs "PASS" to stdout and exits with status 0.
+
+If policy says any source must both be shared and not be shared,
+outputs "FAIL" to stdout and exits with status 1.
+`, filepath.Base(os.Args[0]))
+		flags.PrintDefaults()
+	}
+
+	outputFile := flags.String("o", "-", "Where to write the output. (default stdout)")
+
+	flags.Parse(expandedArgs)
 
 	// Must specify at least one root target.
-	if flag.NArg() == 0 {
-		flag.Usage()
+	if flags.NArg() == 0 {
+		flags.Usage()
 		os.Exit(2)
 	}
 
-	err := checkShare(os.Stdout, os.Stderr, compliance.FS, flag.Args()...)
+	if len(*outputFile) == 0 {
+		flags.Usage()
+		fmt.Fprintf(os.Stderr, "must specify file for -o; use - for stdout\n")
+		os.Exit(2)
+	} else {
+		dir, err := filepath.Abs(filepath.Dir(*outputFile))
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "cannot determine path to %q: %s\n", *outputFile, err)
+			os.Exit(1)
+		}
+		fi, err := os.Stat(dir)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "cannot read directory %q of %q: %s\n", dir, *outputFile, err)
+			os.Exit(1)
+		}
+		if !fi.IsDir() {
+			fmt.Fprintf(os.Stderr, "parent %q of %q is not a directory\n", dir, *outputFile)
+			os.Exit(1)
+		}
+	}
+
+	var ofile io.Writer
+	ofile = os.Stdout
+	var obuf *bytes.Buffer
+	if *outputFile != "-" {
+		obuf = &bytes.Buffer{}
+		ofile = obuf
+	}
+
+	err := checkShare(ofile, os.Stderr, compliance.FS, flags.Args()...)
 	if err != nil {
 		if err != failConflicts {
 			if err == failNoneRequested {
-				flag.Usage()
+				flags.Usage()
 			}
 			fmt.Fprintf(os.Stderr, "%s\n", err.Error())
 		}
 		os.Exit(1)
 	}
+	if *outputFile != "-" {
+		err := os.WriteFile(*outputFile, obuf.Bytes(), 0666)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "could not write output to %q from %q: %s\n", *outputFile, os.Getenv("PWD"), err)
+			os.Exit(1)
+		}
+	}
 	os.Exit(0)
 }
 
@@ -92,7 +155,7 @@ func checkShare(stdout, stderr io.Writer, rootFS fs.FS, files ...string) error {
 	// Read the license graph from the license metadata files (*.meta_lic).
 	licenseGraph, err := compliance.ReadLicenseGraph(rootFS, stderr, files)
 	if err != nil {
-		return fmt.Errorf("Unable to read license metadata file(s) %q: %w\n", files, err)
+		return fmt.Errorf("Unable to read license metadata file(s) %q from %q: %w\n", files, os.Getenv("PWD"), err)
 	}
 	if licenseGraph == nil {
 		return failNoLicenses
diff --git a/tools/compliance/cmd/dumpgraph/dumpgraph.go b/tools/compliance/cmd/dumpgraph/dumpgraph.go
index 32a3fc44cf..56257794a4 100644
--- a/tools/compliance/cmd/dumpgraph/dumpgraph.go
+++ b/tools/compliance/cmd/dumpgraph/dumpgraph.go
@@ -15,6 +15,7 @@
 package main
 
 import (
+	"bytes"
 	"flag"
 	"fmt"
 	"io"
@@ -24,14 +25,11 @@ import (
 	"sort"
 	"strings"
 
+	"android/soong/response"
 	"android/soong/tools/compliance"
 )
 
 var (
-	graphViz        = flag.Bool("dot", false, "Whether to output graphviz (i.e. dot) format.")
-	labelConditions = flag.Bool("label_conditions", false, "Whether to label target nodes with conditions.")
-	stripPrefix     = newMultiString("strip_prefix", "Prefix to remove from paths. i.e. path to root (multiple allowed)")
-
 	failNoneRequested = fmt.Errorf("\nNo license metadata files requested")
 	failNoLicenses    = fmt.Errorf("No licenses found")
 )
@@ -55,8 +53,44 @@ func (ctx context) strip(installPath string) string {
 	return installPath
 }
 
-func init() {
-	flag.Usage = func() {
+// newMultiString creates a flag that allows multiple values in an array.
+func newMultiString(flags *flag.FlagSet, name, usage string) *multiString {
+	var f multiString
+	flags.Var(&f, name, usage)
+	return &f
+}
+
+// multiString implements the flag `Value` interface for multiple strings.
+type multiString []string
+
+func (ms *multiString) String() string     { return strings.Join(*ms, ", ") }
+func (ms *multiString) Set(s string) error { *ms = append(*ms, s); return nil }
+
+func main() {
+	var expandedArgs []string
+	for _, arg := range os.Args[1:] {
+		if strings.HasPrefix(arg, "@") {
+			f, err := os.Open(strings.TrimPrefix(arg, "@"))
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+
+			respArgs, err := response.ReadRspFile(f)
+			f.Close()
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+			expandedArgs = append(expandedArgs, respArgs...)
+		} else {
+			expandedArgs = append(expandedArgs, arg)
+		}
+	}
+
+	flags := flag.NewFlagSet("flags", flag.ExitOnError)
+
+	flags.Usage = func() {
 		fmt.Fprintf(os.Stderr, `Usage: %s {options} file.meta_lic {file.meta_lic...}
 
 Outputs space-separated Target Dependency Annotations tuples for each
@@ -70,42 +104,68 @@ target:condition1:condition2 etc.
 
 Options:
 `, filepath.Base(os.Args[0]))
-		flag.PrintDefaults()
+		flags.PrintDefaults()
 	}
-}
 
-// newMultiString creates a flag that allows multiple values in an array.
-func newMultiString(name, usage string) *multiString {
-	var f multiString
-	flag.Var(&f, name, usage)
-	return &f
-}
+	graphViz := flags.Bool("dot", false, "Whether to output graphviz (i.e. dot) format.")
+	labelConditions := flags.Bool("label_conditions", false, "Whether to label target nodes with conditions.")
+	outputFile := flags.String("o", "-", "Where to write the output. (default stdout)")
+	stripPrefix := newMultiString(flags, "strip_prefix", "Prefix to remove from paths. i.e. path to root (multiple allowed)")
 
-// multiString implements the flag `Value` interface for multiple strings.
-type multiString []string
-
-func (ms *multiString) String() string     { return strings.Join(*ms, ", ") }
-func (ms *multiString) Set(s string) error { *ms = append(*ms, s); return nil }
-
-func main() {
-	flag.Parse()
+	flags.Parse(expandedArgs)
 
 	// Must specify at least one root target.
-	if flag.NArg() == 0 {
-		flag.Usage()
+	if flags.NArg() == 0 {
+		flags.Usage()
 		os.Exit(2)
 	}
 
+	if len(*outputFile) == 0 {
+		flags.Usage()
+		fmt.Fprintf(os.Stderr, "must specify file for -o; use - for stdout\n")
+		os.Exit(2)
+	} else {
+		dir, err := filepath.Abs(filepath.Dir(*outputFile))
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "cannot determine path to %q: %s\n", *outputFile, err)
+			os.Exit(1)
+		}
+		fi, err := os.Stat(dir)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "cannot read directory %q of %q: %s\n", dir, *outputFile, err)
+			os.Exit(1)
+		}
+		if !fi.IsDir() {
+			fmt.Fprintf(os.Stderr, "parent %q of %q is not a directory\n", dir, *outputFile)
+			os.Exit(1)
+		}
+	}
+
+	var ofile io.Writer
+	ofile = os.Stdout
+	var obuf *bytes.Buffer
+	if *outputFile != "-" {
+		obuf = &bytes.Buffer{}
+		ofile = obuf
+	}
+
 	ctx := &context{*graphViz, *labelConditions, *stripPrefix}
 
-	err := dumpGraph(ctx, os.Stdout, os.Stderr, compliance.FS, flag.Args()...)
+	err := dumpGraph(ctx, ofile, os.Stderr, compliance.FS, flags.Args()...)
 	if err != nil {
 		if err == failNoneRequested {
-			flag.Usage()
+			flags.Usage()
 		}
 		fmt.Fprintf(os.Stderr, "%s\n", err.Error())
 		os.Exit(1)
 	}
+	if *outputFile != "-" {
+		err := os.WriteFile(*outputFile, obuf.Bytes(), 0666)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "could not write output to %q from %q: %s\n", *outputFile, os.Getenv("PWD"), err)
+			os.Exit(1)
+		}
+	}
 	os.Exit(0)
 }
 
diff --git a/tools/compliance/cmd/dumpresolutions/dumpresolutions.go b/tools/compliance/cmd/dumpresolutions/dumpresolutions.go
index d02c238846..dc0cf884f5 100644
--- a/tools/compliance/cmd/dumpresolutions/dumpresolutions.go
+++ b/tools/compliance/cmd/dumpresolutions/dumpresolutions.go
@@ -15,6 +15,7 @@
 package main
 
 import (
+	"bytes"
 	"flag"
 	"fmt"
 	"io"
@@ -24,15 +25,11 @@ import (
 	"sort"
 	"strings"
 
+	"android/soong/response"
 	"android/soong/tools/compliance"
 )
 
 var (
-	conditions      = newMultiString("c", "License condition to resolve. (may be given multiple times)")
-	graphViz        = flag.Bool("dot", false, "Whether to output graphviz (i.e. dot) format.")
-	labelConditions = flag.Bool("label_conditions", false, "Whether to label target nodes with conditions.")
-	stripPrefix     = newMultiString("strip_prefix", "Prefix to remove from paths. i.e. path to root (multiple allowed)")
-
 	failNoneRequested = fmt.Errorf("\nNo license metadata files requested")
 	failNoLicenses    = fmt.Errorf("No licenses found")
 )
@@ -57,8 +54,44 @@ func (ctx context) strip(installPath string) string {
 	return installPath
 }
 
-func init() {
-	flag.Usage = func() {
+// newMultiString creates a flag that allows multiple values in an array.
+func newMultiString(flags *flag.FlagSet, name, usage string) *multiString {
+	var f multiString
+	flags.Var(&f, name, usage)
+	return &f
+}
+
+// multiString implements the flag `Value` interface for multiple strings.
+type multiString []string
+
+func (ms *multiString) String() string     { return strings.Join(*ms, ", ") }
+func (ms *multiString) Set(s string) error { *ms = append(*ms, s); return nil }
+
+func main() {
+	var expandedArgs []string
+	for _, arg := range os.Args[1:] {
+		if strings.HasPrefix(arg, "@") {
+			f, err := os.Open(strings.TrimPrefix(arg, "@"))
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+
+			respArgs, err := response.ReadRspFile(f)
+			f.Close()
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+			expandedArgs = append(expandedArgs, respArgs...)
+		} else {
+			expandedArgs = append(expandedArgs, arg)
+		}
+	}
+
+	flags := flag.NewFlagSet("flags", flag.ExitOnError)
+
+	flags.Usage = func() {
 		fmt.Fprintf(os.Stderr, `Usage: %s {options} file.meta_lic {file.meta_lic...}
 
 Outputs a space-separated Target ActsOn Origin Condition tuple for each
@@ -75,32 +108,52 @@ i.e. target:condition1:condition2 etc.
 
 Options:
 `, filepath.Base(os.Args[0]))
-		flag.PrintDefaults()
+		flags.PrintDefaults()
 	}
-}
 
-// newMultiString creates a flag that allows multiple values in an array.
-func newMultiString(name, usage string) *multiString {
-	var f multiString
-	flag.Var(&f, name, usage)
-	return &f
-}
+	conditions := newMultiString(flags, "c", "License condition to resolve. (may be given multiple times)")
+	graphViz := flags.Bool("dot", false, "Whether to output graphviz (i.e. dot) format.")
+	labelConditions := flags.Bool("label_conditions", false, "Whether to label target nodes with conditions.")
+	outputFile := flags.String("o", "-", "Where to write the output. (default stdout)")
+	stripPrefix := newMultiString(flags, "strip_prefix", "Prefix to remove from paths. i.e. path to root (multiple allowed)")
 
-// multiString implements the flag `Value` interface for multiple strings.
-type multiString []string
-
-func (ms *multiString) String() string     { return strings.Join(*ms, ", ") }
-func (ms *multiString) Set(s string) error { *ms = append(*ms, s); return nil }
-
-func main() {
-	flag.Parse()
+	flags.Parse(expandedArgs)
 
 	// Must specify at least one root target.
-	if flag.NArg() == 0 {
-		flag.Usage()
+	if flags.NArg() == 0 {
+		flags.Usage()
 		os.Exit(2)
 	}
 
+	if len(*outputFile) == 0 {
+		flags.Usage()
+		fmt.Fprintf(os.Stderr, "must specify file for -o; use - for stdout\n")
+		os.Exit(2)
+	} else {
+		dir, err := filepath.Abs(filepath.Dir(*outputFile))
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "cannot determine path to %q: %s\n", *outputFile, err)
+			os.Exit(1)
+		}
+		fi, err := os.Stat(dir)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "cannot read directory %q of %q: %s\n", dir, *outputFile, err)
+			os.Exit(1)
+		}
+		if !fi.IsDir() {
+			fmt.Fprintf(os.Stderr, "parent %q of %q is not a directory\n", dir, *outputFile)
+			os.Exit(1)
+		}
+	}
+
+	var ofile io.Writer
+	ofile = os.Stdout
+	var obuf *bytes.Buffer
+	if *outputFile != "-" {
+		obuf = &bytes.Buffer{}
+		ofile = obuf
+	}
+
 	lcs := make([]compliance.LicenseCondition, 0, len(*conditions))
 	for _, name := range *conditions {
 		lcs = append(lcs, compliance.RecognizedConditionNames[name])
@@ -111,14 +164,21 @@ func main() {
 		labelConditions: *labelConditions,
 		stripPrefix:     *stripPrefix,
 	}
-	_, err := dumpResolutions(ctx, os.Stdout, os.Stderr, compliance.FS, flag.Args()...)
+	_, err := dumpResolutions(ctx, ofile, os.Stderr, compliance.FS, flags.Args()...)
 	if err != nil {
 		if err == failNoneRequested {
-			flag.Usage()
+			flags.Usage()
 		}
 		fmt.Fprintf(os.Stderr, "%s\n", err.Error())
 		os.Exit(1)
 	}
+	if *outputFile != "-" {
+		err := os.WriteFile(*outputFile, obuf.Bytes(), 0666)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "could not write output to %q from %q: %s\n", *outputFile, os.Getenv("PWD"), err)
+			os.Exit(1)
+		}
+	}
 	os.Exit(0)
 }
 
diff --git a/tools/compliance/cmd/htmlnotice/htmlnotice.go b/tools/compliance/cmd/htmlnotice/htmlnotice.go
index e98b27222a..1a4961020e 100644
--- a/tools/compliance/cmd/htmlnotice/htmlnotice.go
+++ b/tools/compliance/cmd/htmlnotice/htmlnotice.go
@@ -26,19 +26,13 @@ import (
 	"path/filepath"
 	"strings"
 
+	"android/soong/response"
 	"android/soong/tools/compliance"
 
 	"github.com/google/blueprint/deptools"
 )
 
 var (
-	outputFile  = flag.String("o", "-", "Where to write the NOTICE text file. (default stdout)")
-	depsFile    = flag.String("d", "", "Where to write the deps file")
-	includeTOC  = flag.Bool("toc", true, "Whether to include a table of contents.")
-	product     = flag.String("product", "", "The name of the product for which the notice is generated.")
-	stripPrefix = newMultiString("strip_prefix", "Prefix to remove from paths. i.e. path to root (multiple allowed)")
-	title       = flag.String("title", "", "The title of the notice file.")
-
 	failNoneRequested = fmt.Errorf("\nNo license metadata files requested")
 	failNoLicenses    = fmt.Errorf("No licenses found")
 )
@@ -70,23 +64,10 @@ func (ctx context) strip(installPath string) string {
 	return installPath
 }
 
-func init() {
-	flag.Usage = func() {
-		fmt.Fprintf(os.Stderr, `Usage: %s {options} file.meta_lic {file.meta_lic...}
-
-Outputs an html NOTICE.html or gzipped NOTICE.html.gz file if the -o filename
-ends with ".gz".
-
-Options:
-`, filepath.Base(os.Args[0]))
-		flag.PrintDefaults()
-	}
-}
-
 // newMultiString creates a flag that allows multiple values in an array.
-func newMultiString(name, usage string) *multiString {
+func newMultiString(flags *flag.FlagSet, name, usage string) *multiString {
 	var f multiString
-	flag.Var(&f, name, usage)
+	flags.Var(&f, name, usage)
 	return &f
 }
 
@@ -97,16 +78,57 @@ func (ms *multiString) String() string     { return strings.Join(*ms, ", ") }
 func (ms *multiString) Set(s string) error { *ms = append(*ms, s); return nil }
 
 func main() {
-	flag.Parse()
+	var expandedArgs []string
+	for _, arg := range os.Args[1:] {
+		if strings.HasPrefix(arg, "@") {
+			f, err := os.Open(strings.TrimPrefix(arg, "@"))
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+
+			respArgs, err := response.ReadRspFile(f)
+			f.Close()
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+			expandedArgs = append(expandedArgs, respArgs...)
+		} else {
+			expandedArgs = append(expandedArgs, arg)
+		}
+	}
+
+	flags := flag.NewFlagSet("flags", flag.ExitOnError)
+
+	flags.Usage = func() {
+		fmt.Fprintf(os.Stderr, `Usage: %s {options} file.meta_lic {file.meta_lic...}
+
+Outputs an html NOTICE.html or gzipped NOTICE.html.gz file if the -o filename
+ends with ".gz".
+
+Options:
+`, filepath.Base(os.Args[0]))
+		flags.PrintDefaults()
+	}
+
+	outputFile := flags.String("o", "-", "Where to write the NOTICE text file. (default stdout)")
+	depsFile := flags.String("d", "", "Where to write the deps file")
+	includeTOC := flags.Bool("toc", true, "Whether to include a table of contents.")
+	product := flags.String("product", "", "The name of the product for which the notice is generated.")
+	stripPrefix := newMultiString(flags, "strip_prefix", "Prefix to remove from paths. i.e. path to root (multiple allowed)")
+	title := flags.String("title", "", "The title of the notice file.")
+
+	flags.Parse(expandedArgs)
 
 	// Must specify at least one root target.
-	if flag.NArg() == 0 {
-		flag.Usage()
+	if flags.NArg() == 0 {
+		flags.Usage()
 		os.Exit(2)
 	}
 
 	if len(*outputFile) == 0 {
-		flag.Usage()
+		flags.Usage()
 		fmt.Fprintf(os.Stderr, "must specify file for -o; use - for stdout\n")
 		os.Exit(2)
 	} else {
@@ -143,10 +165,10 @@ func main() {
 
 	ctx := &context{ofile, os.Stderr, compliance.FS, *includeTOC, *product, *stripPrefix, *title, &deps}
 
-	err := htmlNotice(ctx, flag.Args()...)
+	err := htmlNotice(ctx, flags.Args()...)
 	if err != nil {
 		if err == failNoneRequested {
-			flag.Usage()
+			flags.Usage()
 		}
 		fmt.Fprintf(os.Stderr, "%s\n", err.Error())
 		os.Exit(1)
diff --git a/tools/compliance/cmd/listshare/listshare.go b/tools/compliance/cmd/listshare/listshare.go
index 7f4038b6c5..31bd1b22ac 100644
--- a/tools/compliance/cmd/listshare/listshare.go
+++ b/tools/compliance/cmd/listshare/listshare.go
@@ -15,6 +15,7 @@
 package main
 
 import (
+	"bytes"
 	"flag"
 	"fmt"
 	"io"
@@ -24,12 +25,41 @@ import (
 	"sort"
 	"strings"
 
+	"android/soong/response"
 	"android/soong/tools/compliance"
 )
 
-func init() {
-	flag.Usage = func() {
-		fmt.Fprintf(os.Stderr, `Usage: %s file.meta_lic {file.meta_lic...}
+var (
+	failNoneRequested = fmt.Errorf("\nNo license metadata files requested")
+	failNoLicenses    = fmt.Errorf("No licenses found")
+)
+
+func main() {
+	var expandedArgs []string
+	for _, arg := range os.Args[1:] {
+		if strings.HasPrefix(arg, "@") {
+			f, err := os.Open(strings.TrimPrefix(arg, "@"))
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+
+			respArgs, err := response.ReadRspFile(f)
+			f.Close()
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+			expandedArgs = append(expandedArgs, respArgs...)
+		} else {
+			expandedArgs = append(expandedArgs, arg)
+		}
+	}
+
+	flags := flag.NewFlagSet("flags", flag.ExitOnError)
+
+	flags.Usage = func() {
+		fmt.Fprintf(os.Stderr, `Usage: %s {-o outfile} file.meta_lic {file.meta_lic...}
 
 Outputs a csv file with 1 project per line in the first field followed
 by target:condition pairs describing why the project must be shared.
@@ -39,30 +69,61 @@ Soong module or Make target, and the license condition is either
 restricted (e.g. GPL) or reciprocal (e.g. MPL).
 `, filepath.Base(os.Args[0]))
 	}
-}
 
-var (
-	failNoneRequested = fmt.Errorf("\nNo license metadata files requested")
-	failNoLicenses    = fmt.Errorf("No licenses found")
-)
+	outputFile := flags.String("o", "-", "Where to write the list of projects to share. (default stdout)")
 
-func main() {
-	flag.Parse()
+	flags.Parse(expandedArgs)
 
 	// Must specify at least one root target.
-	if flag.NArg() == 0 {
-		flag.Usage()
+	if flags.NArg() == 0 {
+		flags.Usage()
 		os.Exit(2)
 	}
 
-	err := listShare(os.Stdout, os.Stderr, compliance.FS, flag.Args()...)
+	if len(*outputFile) == 0 {
+		flags.Usage()
+		fmt.Fprintf(os.Stderr, "must specify file for -o; use - for stdout\n")
+		os.Exit(2)
+	} else {
+		dir, err := filepath.Abs(filepath.Dir(*outputFile))
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "cannot determine path to %q: %s\n", *outputFile, err)
+			os.Exit(1)
+		}
+		fi, err := os.Stat(dir)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "cannot read directory %q of %q: %s\n", dir, *outputFile, err)
+			os.Exit(1)
+		}
+		if !fi.IsDir() {
+			fmt.Fprintf(os.Stderr, "parent %q of %q is not a directory\n", dir, *outputFile)
+			os.Exit(1)
+		}
+	}
+
+	var ofile io.Writer
+	ofile = os.Stdout
+	var obuf *bytes.Buffer
+	if *outputFile != "-" {
+		obuf = &bytes.Buffer{}
+		ofile = obuf
+	}
+
+	err := listShare(ofile, os.Stderr, compliance.FS, flags.Args()...)
 	if err != nil {
 		if err == failNoneRequested {
-			flag.Usage()
+			flags.Usage()
 		}
 		fmt.Fprintf(os.Stderr, "%s\n", err.Error())
 		os.Exit(1)
 	}
+	if *outputFile != "-" {
+		err := os.WriteFile(*outputFile, obuf.Bytes(), 0666)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "could not write output to %q from %q: %s\n", *outputFile, os.Getenv("PWD"), err)
+			os.Exit(1)
+		}
+	}
 	os.Exit(0)
 }
 
@@ -76,7 +137,7 @@ func listShare(stdout, stderr io.Writer, rootFS fs.FS, files ...string) error {
 	// Read the license graph from the license metadata files (*.meta_lic).
 	licenseGraph, err := compliance.ReadLicenseGraph(rootFS, stderr, files)
 	if err != nil {
-		return fmt.Errorf("Unable to read license metadata file(s) %q: %v\n", files, err)
+		return fmt.Errorf("Unable to read license metadata file(s) %q from %q: %v\n", files, os.Getenv("PWD"), err)
 	}
 	if licenseGraph == nil {
 		return failNoLicenses
diff --git a/tools/compliance/cmd/rtrace/rtrace.go b/tools/compliance/cmd/rtrace/rtrace.go
index 91171c42e7..667cdcea87 100644
--- a/tools/compliance/cmd/rtrace/rtrace.go
+++ b/tools/compliance/cmd/rtrace/rtrace.go
@@ -15,6 +15,7 @@
 package main
 
 import (
+	"bytes"
 	"flag"
 	"fmt"
 	"io"
@@ -24,21 +25,19 @@ import (
 	"sort"
 	"strings"
 
+	"android/soong/response"
 	"android/soong/tools/compliance"
 )
 
 var (
-	sources         = newMultiString("rtrace", "Projects or metadata files to trace back from. (required; multiple allowed)")
-	stripPrefix     = newMultiString("strip_prefix", "Prefix to remove from paths. i.e. path to root (multiple allowed)")
-
 	failNoneRequested = fmt.Errorf("\nNo license metadata files requested")
 	failNoSources     = fmt.Errorf("\nNo projects or metadata files to trace back from")
 	failNoLicenses    = fmt.Errorf("No licenses found")
 )
 
 type context struct {
-	sources         []string
-	stripPrefix     []string
+	sources     []string
+	stripPrefix []string
 }
 
 func (ctx context) strip(installPath string) string {
@@ -54,8 +53,44 @@ func (ctx context) strip(installPath string) string {
 	return installPath
 }
 
-func init() {
-	flag.Usage = func() {
+// newMultiString creates a flag that allows multiple values in an array.
+func newMultiString(flags *flag.FlagSet, name, usage string) *multiString {
+	var f multiString
+	flags.Var(&f, name, usage)
+	return &f
+}
+
+// multiString implements the flag `Value` interface for multiple strings.
+type multiString []string
+
+func (ms *multiString) String() string     { return strings.Join(*ms, ", ") }
+func (ms *multiString) Set(s string) error { *ms = append(*ms, s); return nil }
+
+func main() {
+	var expandedArgs []string
+	for _, arg := range os.Args[1:] {
+		if strings.HasPrefix(arg, "@") {
+			f, err := os.Open(strings.TrimPrefix(arg, "@"))
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+
+			respArgs, err := response.ReadRspFile(f)
+			f.Close()
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+			expandedArgs = append(expandedArgs, respArgs...)
+		} else {
+			expandedArgs = append(expandedArgs, arg)
+		}
+	}
+
+	flags := flag.NewFlagSet("flags", flag.ExitOnError)
+
+	flags.Usage = func() {
 		fmt.Fprintf(os.Stderr, `Usage: %s {options} file.meta_lic {file.meta_lic...}
 
 Outputs a space-separated Target ActsOn Origin Condition tuple for each
@@ -72,50 +107,75 @@ i.e. target:condition1:condition2 etc.
 
 Options:
 `, filepath.Base(os.Args[0]))
-		flag.PrintDefaults()
+		flags.PrintDefaults()
 	}
-}
 
-// newMultiString creates a flag that allows multiple values in an array.
-func newMultiString(name, usage string) *multiString {
-	var f multiString
-	flag.Var(&f, name, usage)
-	return &f
-}
+	outputFile := flags.String("o", "-", "Where to write the output. (default stdout)")
+	sources := newMultiString(flags, "rtrace", "Projects or metadata files to trace back from. (required; multiple allowed)")
+	stripPrefix := newMultiString(flags, "strip_prefix", "Prefix to remove from paths. i.e. path to root (multiple allowed)")
 
-// multiString implements the flag `Value` interface for multiple strings.
-type multiString []string
-
-func (ms *multiString) String() string     { return strings.Join(*ms, ", ") }
-func (ms *multiString) Set(s string) error { *ms = append(*ms, s); return nil }
-
-func main() {
-	flag.Parse()
+	flags.Parse(expandedArgs)
 
 	// Must specify at least one root target.
-	if flag.NArg() == 0 {
-		flag.Usage()
+	if flags.NArg() == 0 {
+		flags.Usage()
 		os.Exit(2)
 	}
 
 	if len(*sources) == 0 {
-		flag.Usage()
+		flags.Usage()
 		fmt.Fprintf(os.Stderr, "\nMust specify at least 1 --rtrace source.\n")
 		os.Exit(2)
 	}
 
-	ctx := &context{
-		sources:         *sources,
-		stripPrefix:     *stripPrefix,
+	if len(*outputFile) == 0 {
+		flags.Usage()
+		fmt.Fprintf(os.Stderr, "must specify file for -o; use - for stdout\n")
+		os.Exit(2)
+	} else {
+		dir, err := filepath.Abs(filepath.Dir(*outputFile))
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "cannot determine path to %q: %s\n", *outputFile, err)
+			os.Exit(1)
+		}
+		fi, err := os.Stat(dir)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "cannot read directory %q of %q: %s\n", dir, *outputFile, err)
+			os.Exit(1)
+		}
+		if !fi.IsDir() {
+			fmt.Fprintf(os.Stderr, "parent %q of %q is not a directory\n", dir, *outputFile)
+			os.Exit(1)
+		}
 	}
-	_, err := traceRestricted(ctx, os.Stdout, os.Stderr, compliance.FS, flag.Args()...)
+
+	var ofile io.Writer
+	ofile = os.Stdout
+	var obuf *bytes.Buffer
+	if *outputFile != "-" {
+		obuf = &bytes.Buffer{}
+		ofile = obuf
+	}
+
+	ctx := &context{
+		sources:     *sources,
+		stripPrefix: *stripPrefix,
+	}
+	_, err := traceRestricted(ctx, ofile, os.Stderr, compliance.FS, flags.Args()...)
 	if err != nil {
 		if err == failNoneRequested {
-			flag.Usage()
+			flags.Usage()
 		}
 		fmt.Fprintf(os.Stderr, "%s\n", err.Error())
 		os.Exit(1)
 	}
+	if *outputFile != "-" {
+		err := os.WriteFile(*outputFile, obuf.Bytes(), 0666)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "could not write output to %q from %q: %s\n", *outputFile, os.Getenv("PWD"), err)
+			os.Exit(1)
+		}
+	}
 	os.Exit(0)
 }
 
diff --git a/tools/compliance/cmd/shippedlibs/shippedlibs.go b/tools/compliance/cmd/shippedlibs/shippedlibs.go
index 9d25dd3de9..add6dd63e8 100644
--- a/tools/compliance/cmd/shippedlibs/shippedlibs.go
+++ b/tools/compliance/cmd/shippedlibs/shippedlibs.go
@@ -39,9 +39,6 @@ type context struct {
 	rootFS fs.FS
 }
 
-func init() {
-}
-
 func main() {
 	var expandedArgs []string
 	for _, arg := range os.Args[1:] {
diff --git a/tools/compliance/cmd/textnotice/textnotice.go b/tools/compliance/cmd/textnotice/textnotice.go
index cfa0859a2a..9beaf58ad1 100644
--- a/tools/compliance/cmd/textnotice/textnotice.go
+++ b/tools/compliance/cmd/textnotice/textnotice.go
@@ -25,18 +25,13 @@ import (
 	"path/filepath"
 	"strings"
 
+	"android/soong/response"
 	"android/soong/tools/compliance"
 
 	"github.com/google/blueprint/deptools"
 )
 
 var (
-	outputFile  = flag.String("o", "-", "Where to write the NOTICE text file. (default stdout)")
-	depsFile    = flag.String("d", "", "Where to write the deps file")
-	product     = flag.String("product", "", "The name of the product for which the notice is generated.")
-	stripPrefix = newMultiString("strip_prefix", "Prefix to remove from paths. i.e. path to root (multiple allowed)")
-	title       = flag.String("title", "", "The title of the notice file.")
-
 	failNoneRequested = fmt.Errorf("\nNo license metadata files requested")
 	failNoLicenses    = fmt.Errorf("No licenses found")
 )
@@ -67,22 +62,10 @@ func (ctx context) strip(installPath string) string {
 	return installPath
 }
 
-func init() {
-	flag.Usage = func() {
-		fmt.Fprintf(os.Stderr, `Usage: %s {options} file.meta_lic {file.meta_lic...}
-
-Outputs a text NOTICE file.
-
-Options:
-`, filepath.Base(os.Args[0]))
-		flag.PrintDefaults()
-	}
-}
-
 // newMultiString creates a flag that allows multiple values in an array.
-func newMultiString(name, usage string) *multiString {
+func newMultiString(flags *flag.FlagSet, name, usage string) *multiString {
 	var f multiString
-	flag.Var(&f, name, usage)
+	flags.Var(&f, name, usage)
 	return &f
 }
 
@@ -93,16 +76,55 @@ func (ms *multiString) String() string     { return strings.Join(*ms, ", ") }
 func (ms *multiString) Set(s string) error { *ms = append(*ms, s); return nil }
 
 func main() {
-	flag.Parse()
+	var expandedArgs []string
+	for _, arg := range os.Args[1:] {
+		if strings.HasPrefix(arg, "@") {
+			f, err := os.Open(strings.TrimPrefix(arg, "@"))
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+
+			respArgs, err := response.ReadRspFile(f)
+			f.Close()
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+			expandedArgs = append(expandedArgs, respArgs...)
+		} else {
+			expandedArgs = append(expandedArgs, arg)
+		}
+	}
+
+	flags := flag.NewFlagSet("flags", flag.ExitOnError)
+
+	flags.Usage = func() {
+		fmt.Fprintf(os.Stderr, `Usage: %s {options} file.meta_lic {file.meta_lic...}
+
+Outputs a text NOTICE file.
+
+Options:
+`, filepath.Base(os.Args[0]))
+		flags.PrintDefaults()
+	}
+
+	outputFile := flags.String("o", "-", "Where to write the NOTICE text file. (default stdout)")
+	depsFile := flags.String("d", "", "Where to write the deps file")
+	product := flags.String("product", "", "The name of the product for which the notice is generated.")
+	stripPrefix := newMultiString(flags, "strip_prefix", "Prefix to remove from paths. i.e. path to root (multiple allowed)")
+	title := flags.String("title", "", "The title of the notice file.")
+
+	flags.Parse(expandedArgs)
 
 	// Must specify at least one root target.
-	if flag.NArg() == 0 {
-		flag.Usage()
+	if flags.NArg() == 0 {
+		flags.Usage()
 		os.Exit(2)
 	}
 
 	if len(*outputFile) == 0 {
-		flag.Usage()
+		flags.Usage()
 		fmt.Fprintf(os.Stderr, "must specify file for -o; use - for stdout\n")
 		os.Exit(2)
 	} else {
@@ -139,10 +161,10 @@ func main() {
 
 	ctx := &context{ofile, os.Stderr, compliance.FS, *product, *stripPrefix, *title, &deps}
 
-	err := textNotice(ctx, flag.Args()...)
+	err := textNotice(ctx, flags.Args()...)
 	if err != nil {
 		if err == failNoneRequested {
-			flag.Usage()
+			flags.Usage()
 		}
 		fmt.Fprintf(os.Stderr, "%s\n", err.Error())
 		os.Exit(1)
diff --git a/tools/compliance/cmd/xmlnotice/xmlnotice.go b/tools/compliance/cmd/xmlnotice/xmlnotice.go
index 84859d738a..2097b7c5e1 100644
--- a/tools/compliance/cmd/xmlnotice/xmlnotice.go
+++ b/tools/compliance/cmd/xmlnotice/xmlnotice.go
@@ -26,18 +26,13 @@ import (
 	"path/filepath"
 	"strings"
 
+	"android/soong/response"
 	"android/soong/tools/compliance"
 
 	"github.com/google/blueprint/deptools"
 )
 
 var (
-	outputFile  = flag.String("o", "-", "Where to write the NOTICE xml or xml.gz file. (default stdout)")
-	depsFile    = flag.String("d", "", "Where to write the deps file")
-	product     = flag.String("product", "", "The name of the product for which the notice is generated.")
-	stripPrefix = newMultiString("strip_prefix", "Prefix to remove from paths. i.e. path to root (multiple allowed)")
-	title       = flag.String("title", "", "The title of the notice file.")
-
 	failNoneRequested = fmt.Errorf("\nNo license metadata files requested")
 	failNoLicenses    = fmt.Errorf("No licenses found")
 )
@@ -68,23 +63,10 @@ func (ctx context) strip(installPath string) string {
 	return installPath
 }
 
-func init() {
-	flag.Usage = func() {
-		fmt.Fprintf(os.Stderr, `Usage: %s {options} file.meta_lic {file.meta_lic...}
-
-Outputs an xml NOTICE.xml or gzipped NOTICE.xml.gz file if the -o filename ends
-with ".gz".
-
-Options:
-`, filepath.Base(os.Args[0]))
-		flag.PrintDefaults()
-	}
-}
-
 // newMultiString creates a flag that allows multiple values in an array.
-func newMultiString(name, usage string) *multiString {
+func newMultiString(flags *flag.FlagSet, name, usage string) *multiString {
 	var f multiString
-	flag.Var(&f, name, usage)
+	flags.Var(&f, name, usage)
 	return &f
 }
 
@@ -95,16 +77,56 @@ func (ms *multiString) String() string     { return strings.Join(*ms, ", ") }
 func (ms *multiString) Set(s string) error { *ms = append(*ms, s); return nil }
 
 func main() {
-	flag.Parse()
+	var expandedArgs []string
+	for _, arg := range os.Args[1:] {
+		if strings.HasPrefix(arg, "@") {
+			f, err := os.Open(strings.TrimPrefix(arg, "@"))
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+
+			respArgs, err := response.ReadRspFile(f)
+			f.Close()
+			if err != nil {
+				fmt.Fprintln(os.Stderr, err.Error())
+				os.Exit(1)
+			}
+			expandedArgs = append(expandedArgs, respArgs...)
+		} else {
+			expandedArgs = append(expandedArgs, arg)
+		}
+	}
+
+	flags := flag.NewFlagSet("flags", flag.ExitOnError)
+
+	flags.Usage = func() {
+		fmt.Fprintf(os.Stderr, `Usage: %s {options} file.meta_lic {file.meta_lic...}
+
+Outputs an xml NOTICE.xml or gzipped NOTICE.xml.gz file if the -o filename ends
+with ".gz".
+
+Options:
+`, filepath.Base(os.Args[0]))
+		flags.PrintDefaults()
+	}
+
+	outputFile := flags.String("o", "-", "Where to write the NOTICE xml or xml.gz file. (default stdout)")
+	depsFile := flags.String("d", "", "Where to write the deps file")
+	product := flags.String("product", "", "The name of the product for which the notice is generated.")
+	stripPrefix := newMultiString(flags, "strip_prefix", "Prefix to remove from paths. i.e. path to root (multiple allowed)")
+	title := flags.String("title", "", "The title of the notice file.")
+
+	flags.Parse(expandedArgs)
 
 	// Must specify at least one root target.
-	if flag.NArg() == 0 {
-		flag.Usage()
+	if flags.NArg() == 0 {
+		flags.Usage()
 		os.Exit(2)
 	}
 
 	if len(*outputFile) == 0 {
-		flag.Usage()
+		flags.Usage()
 		fmt.Fprintf(os.Stderr, "must specify file for -o; use - for stdout\n")
 		os.Exit(2)
 	} else {
@@ -141,10 +163,10 @@ func main() {
 
 	ctx := &context{ofile, os.Stderr, compliance.FS, *product, *stripPrefix, *title, &deps}
 
-	err := xmlNotice(ctx, flag.Args()...)
+	err := xmlNotice(ctx, flags.Args()...)
 	if err != nil {
 		if err == failNoneRequested {
-			flag.Usage()
+			flags.Usage()
 		}
 		fmt.Fprintf(os.Stderr, "%s\n", err.Error())
 		os.Exit(1)

From 570381b746485332f7640432d59dc23654e92c22 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Mon, 18 Apr 2022 17:28:11 +0000
Subject: [PATCH 385/425] Create lists of projects to share per dist target

Bug: 151177513
Bug: 210912771
Bug: 235333302

Test: m droid dist reportmissinglicenses

Change-Id: Ibf5a9869d03726e279fb23bf68ca66547b972138
Merged-in: Ibf5a9869d03726e279fb23bf68ca66547b972138
---
 core/definitions.mk  | 137 +++++++++++++++++++++++++++++++++++++++----
 core/distdir.mk      |  59 +++++++++++++++++++
 core/notice_files.mk |   2 +-
 3 files changed, 187 insertions(+), 11 deletions(-)

diff --git a/core/definitions.mk b/core/definitions.mk
index 0c46de9fc6..84860f9fa4 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -570,16 +570,21 @@ define license-metadata-dir
 $(call generated-sources-dir-for,META,lic,)
 endef
 
+TARGETS_MISSING_LICENSE_METADATA:=
+
 ###########################################################
 # License metadata targets corresponding to targets in $(1)
 ###########################################################
 define corresponding-license-metadata
-$(strip $(foreach target, $(sort $(1)), \
+$(strip $(filter-out 0p,$(foreach target, $(sort $(1)), \
   $(if $(strip $(ALL_MODULES.$(target).META_LIC)), \
     $(ALL_MODULES.$(target).META_LIC), \
     $(if $(strip $(ALL_TARGETS.$(target).META_LIC)), \
       $(ALL_TARGETS.$(target).META_LIC), \
-      $(call append-path,$(call license-metadata-dir),$(patsubst $(OUT_DIR)%,out%,$(target).meta_lic))))))
+      $(eval TARGETS_MISSING_LICENSE_METADATA += $(target)) \
+    ) \
+  ) \
+)))
 endef
 
 ###########################################################
@@ -704,6 +709,60 @@ $(_meta) : $(foreach d,$(_deps),$(call word-colon,1,$(d))) $(foreach n,$(_notice
 
 endef
 
+###########################################################
+## Record missing dependencies for non-module target $(1)
+###########################################################
+define record-missing-non-module-dependencies
+$(strip $(eval _tgt := $(strip $(1))))
+$(strip $(foreach d,$(strip $(ALL_NON_MODULES.$(_tgt).DEPENDENCIES)), \
+  $(if $(strip $(ALL_TARGETS.$(d).META_LIC)), \
+    , \
+    $(eval NON_MODULES_WITHOUT_LICENSE_METADATA += $(d))) \
+))
+endef
+
+###########################################################
+## License metadata build rule for copied target $(1)
+###########################################################
+define copied-target-license-metadata-rule
+$(if $(strip $(ALL_TARGETS.$(1).META_LIC)),,$(call _copied-target-license-metadata-rule,$(1)))
+endef
+
+define _copied-target-license-metadata-rule
+$(strip $(eval _dir := $(call license-metadata-dir)))
+$(strip $(eval _meta := $(call append-path,$(_dir),$(patsubst $(OUT_DIR)%,out%,$(1).meta_lic))))
+$(strip $(eval ALL_TARGETS.$(1).META_LIC:=$(_meta)))
+$(strip $(eval _dep:=))
+$(strip $(foreach s,$(ALL_COPIED_TARGETS.$(1).SOURCES),\
+  $(eval _dmeta:=$(ALL_TARGETS.$(s).META_LIC))\
+  $(if $(filter 0p,$(_dmeta)),\
+    $(if $(filter-out 0p,$(_dep)),,$(eval ALL_TARGETS.$(1).META_LIC:=0p)),\
+    $(if $(_dep),\
+      $(if $(filter-out $(_dep),$(_dmeta)),$(error cannot copy target from multiple modules: $(1) from $(_dep) and $(_dmeta))),
+      $(eval _dep:=$(_dmeta))))))
+$(strip $(if $(strip $(_dep)),,$(error cannot copy target from unknown module: $(1) from $(ALL_COPIED_TARGETS.$(1).SOURCES))))
+
+ifneq (0p,$(ALL_TARGETS.$(1).META_LIC))
+$(_meta): PRIVATE_DEST_TARGET := $(1)
+$(_meta): PRIVATE_SOURCE_TARGETS := $(ALL_COPIED_TARGETS.$(1).SOURCES)
+$(_meta): PRIVATE_SOURCE_METADATA := $(_dep)
+$(_meta): PRIVATE_ARGUMENT_FILE := $(call intermediates-dir-for,PACKAGING,copynotice)/$(_meta)/arguments
+$(_meta) : $(_dep) $(COPY_LICENSE_METADATA)
+	rm -f $$@
+	mkdir -p $$(dir $$@)
+	mkdir -p $$(dir $$(PRIVATE_ARGUMENT_FILE))
+	$$(call dump-words-to-file,\
+	    $$(addprefix -i ,$$(PRIVATE_DEST_TARGET))\
+	    $$(addprefix -s ,$$(PRIVATE_SOURCE_TARGETS))\
+	    $$(addprefix -d ,$$(PRIVATE_SOURCE_METADATA)),\
+	    $$(PRIVATE_ARGUMENT_FILE))
+	OUT_DIR=$(OUT_DIR) $(COPY_LICENSE_METADATA) \
+	  @$$(PRIVATE_ARGUMENT_FILE) \
+	  -o $$@
+
+endif
+endef
+
 ###########################################################
 ## Declare the license metadata for non-module target $(1).
 ##
@@ -717,6 +776,7 @@ define declare-license-metadata
 $(strip \
   $(eval _tgt := $(subst //,/,$(strip $(1)))) \
   $(eval ALL_NON_MODULES += $(_tgt)) \
+  $(eval ALL_TARGETS.$(_tgt).META_LIC := $(call license-metadata-dir)/$(patsubst $(OUT_DIR)%,out%,$(_tgt)).meta_lic) \
   $(eval ALL_NON_MODULES.$(_tgt).LICENSE_KINDS := $(strip $(2))) \
   $(eval ALL_NON_MODULES.$(_tgt).LICENSE_CONDITIONS := $(strip $(3))) \
   $(eval ALL_NON_MODULES.$(_tgt).NOTICES := $(strip $(4))) \
@@ -757,6 +817,7 @@ define declare-container-license-metadata
 $(strip \
   $(eval _tgt := $(subst //,/,$(strip $(1)))) \
   $(eval ALL_NON_MODULES += $(_tgt)) \
+  $(eval ALL_TARGETS.$(_tgt).META_LIC := $(call license-metadata-dir)/$(patsubst $(OUT_DIR)%,out%,$(_tgt)).meta_lic) \
   $(eval ALL_NON_MODULES.$(_tgt).LICENSE_KINDS := $(strip $(2))) \
   $(eval ALL_NON_MODULES.$(_tgt).LICENSE_CONDITIONS := $(strip $(3))) \
   $(eval ALL_NON_MODULES.$(_tgt).NOTICES := $(strip $(4))) \
@@ -829,6 +890,7 @@ define declare-license-deps
 $(strip \
   $(eval _tgt := $(strip $(1))) \
   $(eval ALL_NON_MODULES += $(_tgt)) \
+  $(eval ALL_TARGETS.$(_tgt).META_LIC := $(call license-metadata-dir)/$(patsubst $(OUT_DIR)%,out%,$(_tgt)).meta_lic) \
   $(eval ALL_NON_MODULES.$(_tgt).DEPENDENCIES := $(strip $(ALL_NON_MODULES.$(_tgt).DEPENDENCIES) $(2))) \
 )
 endef
@@ -845,6 +907,7 @@ define declare-container-license-deps
 $(strip \
   $(eval _tgt := $(strip $(1))) \
   $(eval ALL_NON_MODULES += $(_tgt)) \
+  $(eval ALL_TARGETS.$(_tgt).META_LIC := $(call license-metadata-dir)/$(patsubst $(OUT_DIR)%,out%,$(_tgt)).meta_lic) \
   $(eval ALL_NON_MODULES.$(_tgt).DEPENDENCIES := $(strip $(ALL_NON_MODULES.$(_tgt).DEPENDENCIES) $(2))) \
   $(eval ALL_NON_MODULES.$(_tgt).IS_CONTAINER := true) \
   $(eval ALL_NON_MODULES.$(_tgt).ROOT_MAPPINGS := $(strip $(ALL_NON_MODULES.$(_tgt).ROOT_MAPPINGS) $(3))) \
@@ -856,12 +919,14 @@ endef
 ###########################################################
 define report-missing-licenses-rule
 .PHONY: reportmissinglicenses
-reportmissinglicenses: PRIVATE_NON_MODULES:=$(sort $(NON_MODULES_WITHOUT_LICENSE_METADATA))
-reportmissinglicenses: PRIVATE_COPIED_FILES:=$(sort $(filter $(NON_MODULES_WITHOUT_LICENSE_METADATA),$(foreach _pair,$(PRODUCT_COPY_FILES), $(PRODUCT_OUT)/$(call word-colon,2,$(_pair)))))
+reportmissinglicenses: PRIVATE_NON_MODULES:=$(sort $(NON_MODULES_WITHOUT_LICENSE_METADATA) $(TARGETS_MISSING_LICENSE_METADATA))
+reportmissinglicenses: PRIVATE_COPIED_FILES:=$(sort $(filter $(NON_MODULES_WITHOUT_LICENSE_METADATA) $(TARGETS_MISSING_LICENSE_METADATA),\
+  $(foreach _pair,$(PRODUCT_COPY_FILES), $(PRODUCT_OUT)/$(call word-colon,2,$(_pair)))))
 reportmissinglicenses:
 	@echo Reporting $$(words $$(PRIVATE_NON_MODULES)) targets without license metadata
 	$$(foreach t,$$(PRIVATE_NON_MODULES),if ! [ -h $$(t) ]; then echo No license metadata for $$(t) >&2; fi;)
 	$$(foreach t,$$(PRIVATE_COPIED_FILES),if ! [ -h $$(t) ]; then echo No license metadata for copied file $$(t) >&2; fi;)
+	echo $$(words $$(PRIVATE_NON_MODULES)) targets missing license metadata >&2
 
 endef
 
@@ -914,13 +979,9 @@ $(strip \
   $(foreach t,$(sort $(ALL_0P_TARGETS)), \
     $(eval ALL_TARGETS.$(t).META_LIC := 0p) \
   ) \
-  $(foreach t,$(sort $(ALL_NON_MODULES)), \
-    $(eval ALL_TARGETS.$(t).META_LIC := $(call append-path,$(_dir),$(patsubst $(OUT_DIR)%,out%,$(t).meta_lic))) \
-  ) \
   $(foreach t,$(sort $(ALL_NON_MODULES)),$(eval $(call non-module-license-metadata-rule,$(t)))) \
   $(foreach m,$(sort $(ALL_MODULES)),$(eval $(call license-metadata-rule,$(m)))) \
-  $(eval $(call report-missing-licenses-rule)) \
-  $(eval $(call report-all-notice-library-names-rule)) \
+  $(foreach t,$(sort $(ALL_COPIED_TARGETS)),$(eval $(call copied-target-license-metadata-rule,$(t)))) \
   $(eval $(call build-all-license-metadata-rule)))
 endef
 
@@ -992,6 +1053,22 @@ $(strip \
 )
 endef
 
+# Uses LOCAL_MODULE_CLASS, LOCAL_MODULE, and LOCAL_IS_HOST_MODULE
+# to determine the intermediates directory.
+#
+# $(1): if non-empty, force the intermediates to be COMMON
+# $(2): if non-empty, force the intermediates to be for the 2nd arch
+# $(3): if non-empty, force the intermediates to be for the host cross os
+define local-meta-intermediates-dir
+$(strip \
+    $(if $(strip $(LOCAL_MODULE_CLASS)),, \
+        $(error $(LOCAL_PATH): LOCAL_MODULE_CLASS not defined before call to local-meta-intermediates-dir)) \
+    $(if $(strip $(LOCAL_MODULE)),, \
+        $(error $(LOCAL_PATH): LOCAL_MODULE not defined before call to local-meta-intermediates-dir)) \
+    $(call intermediates-dir-for,META$(LOCAL_MODULE_CLASS),$(LOCAL_MODULE),$(if $(strip $(LOCAL_IS_HOST_MODULE)),HOST),$(1),$(2),$(3)) \
+)
+endef
+
 ###########################################################
 ## The generated sources directory.  Placing generated
 ## source files directly in the intermediates directory
@@ -2411,7 +2488,47 @@ define dump-words-to-file
         @$(call emit-line,$(wordlist 38001,38500,$(1)),$(2))
         @$(call emit-line,$(wordlist 38501,39000,$(1)),$(2))
         @$(call emit-line,$(wordlist 39001,39500,$(1)),$(2))
-        @$(if $(wordlist 39501,39502,$(1)),$(error Too many words ($(words $(1)))))
+        @$(call emit-line,$(wordlist 39501,40000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 40001,40500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 40501,41000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 41001,41500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 41501,42000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 42001,42500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 42501,43000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 43001,43500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 43501,44000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 44001,44500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 44501,45000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 45001,45500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 45501,46000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 46001,46500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 46501,47000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 47001,47500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 47501,48000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 48001,48500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 48501,49000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 49001,49500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 49501,50000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 50001,50500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 50501,51000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 51001,51500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 51501,52000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 52001,52500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 52501,53000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 53001,53500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 53501,54000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 54001,54500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 54501,55000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 55001,55500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 55501,56000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 56001,56500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 56501,57000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 57001,57500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 57501,58000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 58001,58500,$(1)),$(2))
+        @$(call emit-line,$(wordlist 58501,59000,$(1)),$(2))
+        @$(call emit-line,$(wordlist 59001,59500,$(1)),$(2))
+        @$(if $(wordlist 59501,59502,$(1)),$(error Too many words ($(words $(1)))))
 endef
 # Return jar arguments to compress files in a given directory
 # $(1): directory
diff --git a/core/distdir.mk b/core/distdir.mk
index aad8ff3d65..0edeffdf4b 100644
--- a/core/distdir.mk
+++ b/core/distdir.mk
@@ -45,6 +45,56 @@ $(foreach file,$(2), \
     $(eval _all_dist_goal_output_pairs += $$(goal):$$(dst))))
 endef
 
+.PHONY: shareprojects
+#shareprojects:
+
+define __share-projects-rule
+$(1) : PRIVATE_TARGETS := $(2)
+$(1) : PRIVATE_ARGUMENT_FILE := $(call intermediates-dir-for,PACKAGING,codesharing)/$(1)/arguments
+$(1): $(2) $(COMPLIANCE_LISTSHARE)
+	$(hide) rm -f $$@
+	mkdir -p $$(dir $$@)
+	mkdir -p $$(dir $$(PRIVATE_ARGUMENT_FILE))
+	$$(if $$(strip $$(PRIVATE_TARGETS)),$$(call dump-words-to-file,$$(PRIVATE_TARGETS),$$(PRIVATE_ARGUMENT_FILE)))
+	$$(if $$(strip $$(PRIVATE_TARGETS)),OUT_DIR=$(OUT_DIR) $(COMPLIANCE_LISTSHARE) -o $$@ @$$(PRIVATE_ARGUMENT_FILE),touch $$@)
+endef
+
+# build list of projects to share in $(1) for dist targets in $(2)
+#
+# $(1): the intermediate project sharing file
+# $(2): the dist files to base the sharing on
+define _share-projects-rule
+$(eval $(call __share-projects-rule,$(1),$(call corresponding-license-metadata,$(2))))
+endef
+
+# Add a build dependency
+#
+# $(1): the goal phony target
+# $(2): the intermediate shareprojects file
+define _share-projects-dep
+$(1): $(2)
+endef
+
+define _add_projects_to_share
+$(strip $(eval _idir := $(call intermediates-dir-for,PACKAGING,shareprojects))) \
+$(strip $(eval _goals := $(sort $(_all_dist_goals)))) \
+$(strip $(eval _opairs := $(sort $(_all_dist_goal_output_pairs)))) \
+$(strip $(eval _dpairs := $(sort $(_all_dist_src_dst_pairs)))) \
+$(strip $(eval _allt :=)) \
+$(foreach goal,$(_goals), \
+  $(eval _f := $(_idir)/$(goal).shareprojects) \
+  $(call dist-for-goals,$(goal),$(_f):shareprojects/$(basename $(notdir $(_f)))) \
+  $(eval _targets :=) \
+  $(foreach op,$(filter $(goal):%,$(_opairs)),$(foreach p,$(filter %:$(call word-colon,2,$(op)),$(_dpairs)),$(eval _targets += $(call word-colon,1,$(p))))) \
+  $(eval _allt += $(_targets)) \
+  $(eval $(call _share-projects-rule,$(_f),$(_targets))) \
+)\
+$(eval _f := $(_idir)/all.shareprojects)\
+$(eval $(call _share-projects-dep,shareprojects,$(_f))) \
+$(call dist-for-goals,droid shareprojects,$(_f):shareprojects/all)\
+$(eval $(call _share-projects-rule,$(_f),$(sort $(_allt))))
+endef
+
 #------------------------------------------------------------------
 # To be used at the end of the build to collect all the uses of
 # dist-for-goals, and write them into a file for the packaging step to use.
@@ -52,6 +102,15 @@ endef
 # $(1): The file to write
 define dist-write-file
 $(strip \
+  $(call _add_projects_to_share)\
+  $(if $(strip $(ANDROID_REQUIRE_LICENSE_METADATA)),\
+    $(foreach target,$(sort $(TARGETS_MISSING_LICENSE_METADATA)),$(warning target $(target) missing license metadata))\
+    $(if $(strip $(TARGETS_MISSING_LICENSE_METADATA)),\
+      $(if $(filter true error,$(ANDROID_REQUIRE_LICENSE_METADATA)),\
+        $(error $(words $(sort $(TARGETS_MISSING_LICENSE_METADATA))) targets need license metadata))))\
+  $(foreach t,$(sort $(ALL_NON_MODULES)),$(call record-missing-non-module-dependencies,$(t))) \
+  $(eval $(call report-missing-licenses-rule)) \
+  $(eval $(call report-all-notice-library-names-rule)) \
   $(KATI_obsolete_var dist-for-goals,Cannot be used after dist-write-file) \
   $(foreach goal,$(sort $(_all_dist_goals)), \
     $(eval $$(goal): _dist_$$(goal))) \
diff --git a/core/notice_files.mk b/core/notice_files.mk
index c05d4ea0be..4b67404fd2 100644
--- a/core/notice_files.mk
+++ b/core/notice_files.mk
@@ -125,7 +125,7 @@ local_path := $(LOCAL_PATH)
 module_license_metadata :=
 
 ifdef my_register_name
-  module_license_metadata := $(call local-intermediates-dir)/$(my_register_name).meta_lic
+  module_license_metadata := $(call local-meta-intermediates-dir)/$(my_register_name).meta_lic
 
   $(foreach target,$(ALL_MODULES.$(my_register_name).BUILT) $(ALL_MODULES.$(my_register_name).INSTALLED) $(my_test_data) $(my_test_config),\
     $(eval ALL_TARGETS.$(target).META_LIC := $(module_license_metadata)))

From 6a661f011d926c642008e9060f4cbe85b957d77f Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Tue, 7 Jun 2022 21:09:35 -0700
Subject: [PATCH 386/425] Record license text for every dist target.

Bug: 151177513
Bug: 210912771
Bug: 235333302
Bug: 232138105

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_coral_hwasan TARGET_BUILD_VARIANT=userdebug droid dist with-license platform_tests continuous_instrumentation_tests continuous_native_tests

Change-Id: Ibd737c0dd0a35e19529ab08472f4d1bc1195efbd
Merged-in: Ibd737c0dd0a35e19529ab08472f4d1bc1195efbd
---
 core/distdir.mk | 57 +++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 53 insertions(+), 4 deletions(-)

diff --git a/core/distdir.mk b/core/distdir.mk
index 0edeffdf4b..3d48a484a5 100644
--- a/core/distdir.mk
+++ b/core/distdir.mk
@@ -46,11 +46,10 @@ $(foreach file,$(2), \
 endef
 
 .PHONY: shareprojects
-#shareprojects:
 
 define __share-projects-rule
 $(1) : PRIVATE_TARGETS := $(2)
-$(1) : PRIVATE_ARGUMENT_FILE := $(call intermediates-dir-for,PACKAGING,codesharing)/$(1)/arguments
+$(1) : PRIVATE_ARGUMENT_FILE := $(call intermediates-dir-for,METAPACKAGING,codesharing)/$(1)/arguments
 $(1): $(2) $(COMPLIANCE_LISTSHARE)
 	$(hide) rm -f $$@
 	mkdir -p $$(dir $$@)
@@ -75,24 +74,74 @@ define _share-projects-dep
 $(1): $(2)
 endef
 
+.PHONY: alllicensetexts
+
+define __license-texts-rule
+$(2) : PRIVATE_GOAL := $(1)
+$(2) : PRIVATE_TARGETS := $(3)
+$(2) : PRIVATE_ROOTS := $(4)
+$(2) : PRIVATE_ARGUMENT_FILE := $(call intermediates-dir-for,METAPACKAGING,licensetexts)/$(2)/arguments
+$(2): $(3) $(TEXTNOTICE)
+	$(hide) rm -f $$@
+	mkdir -p $$(dir $$@)
+	mkdir -p $$(dir $$(PRIVATE_ARGUMENT_FILE))
+	$$(if $$(strip $$(PRIVATE_TARGETS)),$$(call dump-words-to-file,\
+            -product="$$(PRIVATE_GOAL)" -title="$$(PRIVATE_GOAL)" \
+            $$(addprefix -strip_prefix ,$$(PRIVATE_ROOTS)) \
+            -strip_prefix=$(PRODUCT_OUT)/ -strip_prefix=$(HOST_OUT)/\
+            $$(PRIVATE_TARGETS),\
+            $$(PRIVATE_ARGUMENT_FILE)))
+	$$(if $$(strip $$(PRIVATE_TARGETS)),OUT_DIR=$(OUT_DIR) $(TEXTNOTICE) -o $$@ @$$(PRIVATE_ARGUMENT_FILE),touch $$@)
+endef
+
+# build list of projects to share in $(2) for dist targets in $(3) for dist goal $(1)
+#
+# $(1): the name of the dist goal
+# $(2): the intermediate project sharing file
+# $(3): the dist files to base the sharing on
+define _license-texts-rule
+$(eval $(call __license-texts-rule,$(1),$(2),$(call corresponding-license-metadata,$(3)),$(sort $(dir $(3)))))
+endef
+
+# Add a build dependency
+#
+# $(1): the goal phony target
+# $(2): the intermediate shareprojects file
+define _license-texts-dep
+$(1): $(2)
+endef
+
 define _add_projects_to_share
-$(strip $(eval _idir := $(call intermediates-dir-for,PACKAGING,shareprojects))) \
+$(strip $(eval _idir := $(call intermediates-dir-for,METAPACKAGING,shareprojects))) \
+$(strip $(eval _tdir := $(call intermediates-dir-for,METAPACKAGING,licensetexts))) \
 $(strip $(eval _goals := $(sort $(_all_dist_goals)))) \
 $(strip $(eval _opairs := $(sort $(_all_dist_goal_output_pairs)))) \
 $(strip $(eval _dpairs := $(sort $(_all_dist_src_dst_pairs)))) \
 $(strip $(eval _allt :=)) \
 $(foreach goal,$(_goals), \
   $(eval _f := $(_idir)/$(goal).shareprojects) \
+  $(eval _n := $(_tdir)/$(goal).txt) \
   $(call dist-for-goals,$(goal),$(_f):shareprojects/$(basename $(notdir $(_f)))) \
+  $(call dist-for-goals,$(goal),$(_n):licensetexts/$(basename $(notdir $(_n)))) \
   $(eval _targets :=) \
   $(foreach op,$(filter $(goal):%,$(_opairs)),$(foreach p,$(filter %:$(call word-colon,2,$(op)),$(_dpairs)),$(eval _targets += $(call word-colon,1,$(p))))) \
   $(eval _allt += $(_targets)) \
   $(eval $(call _share-projects-rule,$(_f),$(_targets))) \
+  $(eval $(call _license-texts-rule,$(goal),$(_n),$(_targets))) \
 )\
 $(eval _f := $(_idir)/all.shareprojects)\
+$(eval _n := $(_tdir)/all.txt)\
+$(eval _idir :=)\
+$(eval _tdir :=)\
 $(eval $(call _share-projects-dep,shareprojects,$(_f))) \
+$(eval $(call _license-texts-dep,alllicensetexts,$(_n))) \
 $(call dist-for-goals,droid shareprojects,$(_f):shareprojects/all)\
-$(eval $(call _share-projects-rule,$(_f),$(sort $(_allt))))
+$(call dist-for-goals,droid alllicensetexts,$(_n):licensetexts/all)\
+$(eval _allt := $(sort $(_allt)))\
+$(eval $(call _share-projects-rule,$(_f),$(_allt)))\
+$(eval $(call _license-texts-rule,droid,$(_n),$(_allt)))\
+$(eval _f :=)\
+$(evan _n :=)
 endef
 
 #------------------------------------------------------------------

From cf1595d3e9ef3cfbdef67d922f31679f45091a3d Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 10 Jun 2022 02:19:20 +0000
Subject: [PATCH 387/425] Version bump to TP1A.220610.002 [core/build_id.mk]

Change-Id: Iaaf20d75e6dc37e0a403aaf035f250918be2758c
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index b01b329e11..9d0178006f 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=TP1A.220610.001
+BUILD_ID=TP1A.220610.002

From 9a5e3d53a8b9bd40917fa7ab28eab80753a62c1f Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Thu, 9 Jun 2022 15:59:28 +0000
Subject: [PATCH 388/425] Add wifi_module/source_build Soong config variable

As an optional module, wifi has its own Soong config variable. This
change ensures that it is controlled by the same environment variable
as the rest of the modules.

Bug: 233965247
Test: # Unpack wifi snapshot that uses wifi specific Soong config.
      m nothing
      # Without this the build fails as it uses the wifi prebuilts
      # which do not work in AOSP.
      # With this change the build passes as it uses the wifi
      # sources.
Change-Id: Iea0ad09182a162b8f5ddf1403f65a3bbffb9ef08
(cherry picked from commit 4f4b6d776df71655c8d7723f5c0c67c75c0c6a0e)
Merged-In: Iea0ad09182a162b8f5ddf1403f65a3bbffb9ef08
---
 core/android_soong_config_vars.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 28181ebfae..5b49749b35 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -121,6 +121,15 @@ endif
 
 $(call soong_config_set,art_module,source_build,$(ART_MODULE_BUILD_FROM_SOURCE))
 
+# Ensure that those mainline modules who have individually toggleable prebuilts
+# are controlled by the MODULE_BUILD_FROM_SOURCE environment variable by
+# default.
+INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \
+  wifi \
+
+$(foreach m, $(INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES),\
+  $(call soong_config_set,$(m)_module,source_build,$(MODULE_BUILD_FROM_SOURCE)))
+
 # Apex build mode variables
 ifdef APEX_BUILD_FOR_PRE_S_DEVICES
 $(call add_soong_config_var_value,ANDROID,library_linking_strategy,prefer_static)

From 70a11a34c022d77ca113479858b802c7f878a307 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Thu, 9 Jun 2022 21:25:26 +0000
Subject: [PATCH 389/425] Add bluetooth and uwb to the optional modules list

Bug: 233965247
Test: m nothing
Change-Id: I9618844499d6f1da4d5e9b5b31bfaca86c4de980
---
 core/android_soong_config_vars.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 5b49749b35..41310de9d4 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -125,6 +125,8 @@ $(call soong_config_set,art_module,source_build,$(ART_MODULE_BUILD_FROM_SOURCE))
 # are controlled by the MODULE_BUILD_FROM_SOURCE environment variable by
 # default.
 INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \
+  bluetooth \
+  uwb \
   wifi \
 
 $(foreach m, $(INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES),\

From 84f46a95dec8fcce400a07228245d9f753b5a683 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Sun, 12 Jun 2022 23:09:21 +0000
Subject: [PATCH 390/425] Version bump to TP1A.220613.002 [core/build_id.mk]

Change-Id: I11817d5a3b342e2d41856a8960d3bf0b9b04cab8
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 911f2574ad..ed3eed5bd4 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=TP1A.220613.001
+BUILD_ID=TP1A.220613.002

From 29d723fb4ace78d6ad8c2a234222b5792479f2fa Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Mon, 13 Jun 2022 19:32:53 +0000
Subject: [PATCH 391/425] Revert "Record license text for every dist target."

Revert submission 18821068

Reason for revert: Advised to switch to using TARGET_BUILD_APPS
Reverted Changes:
Ibd737c0dd:Record license text for every dist target.
Ibf5a9869d:Create lists of projects to share per dist target

Change-Id: Ib0007bf6989c25cc2503f8feac35682d13f0a2b7
Merged-in: I1442998bbafe909a0796abdb2e9691a0c4c099d6
---
 core/distdir.mk | 57 ++++---------------------------------------------
 1 file changed, 4 insertions(+), 53 deletions(-)

diff --git a/core/distdir.mk b/core/distdir.mk
index 3d48a484a5..0edeffdf4b 100644
--- a/core/distdir.mk
+++ b/core/distdir.mk
@@ -46,10 +46,11 @@ $(foreach file,$(2), \
 endef
 
 .PHONY: shareprojects
+#shareprojects:
 
 define __share-projects-rule
 $(1) : PRIVATE_TARGETS := $(2)
-$(1) : PRIVATE_ARGUMENT_FILE := $(call intermediates-dir-for,METAPACKAGING,codesharing)/$(1)/arguments
+$(1) : PRIVATE_ARGUMENT_FILE := $(call intermediates-dir-for,PACKAGING,codesharing)/$(1)/arguments
 $(1): $(2) $(COMPLIANCE_LISTSHARE)
 	$(hide) rm -f $$@
 	mkdir -p $$(dir $$@)
@@ -74,74 +75,24 @@ define _share-projects-dep
 $(1): $(2)
 endef
 
-.PHONY: alllicensetexts
-
-define __license-texts-rule
-$(2) : PRIVATE_GOAL := $(1)
-$(2) : PRIVATE_TARGETS := $(3)
-$(2) : PRIVATE_ROOTS := $(4)
-$(2) : PRIVATE_ARGUMENT_FILE := $(call intermediates-dir-for,METAPACKAGING,licensetexts)/$(2)/arguments
-$(2): $(3) $(TEXTNOTICE)
-	$(hide) rm -f $$@
-	mkdir -p $$(dir $$@)
-	mkdir -p $$(dir $$(PRIVATE_ARGUMENT_FILE))
-	$$(if $$(strip $$(PRIVATE_TARGETS)),$$(call dump-words-to-file,\
-            -product="$$(PRIVATE_GOAL)" -title="$$(PRIVATE_GOAL)" \
-            $$(addprefix -strip_prefix ,$$(PRIVATE_ROOTS)) \
-            -strip_prefix=$(PRODUCT_OUT)/ -strip_prefix=$(HOST_OUT)/\
-            $$(PRIVATE_TARGETS),\
-            $$(PRIVATE_ARGUMENT_FILE)))
-	$$(if $$(strip $$(PRIVATE_TARGETS)),OUT_DIR=$(OUT_DIR) $(TEXTNOTICE) -o $$@ @$$(PRIVATE_ARGUMENT_FILE),touch $$@)
-endef
-
-# build list of projects to share in $(2) for dist targets in $(3) for dist goal $(1)
-#
-# $(1): the name of the dist goal
-# $(2): the intermediate project sharing file
-# $(3): the dist files to base the sharing on
-define _license-texts-rule
-$(eval $(call __license-texts-rule,$(1),$(2),$(call corresponding-license-metadata,$(3)),$(sort $(dir $(3)))))
-endef
-
-# Add a build dependency
-#
-# $(1): the goal phony target
-# $(2): the intermediate shareprojects file
-define _license-texts-dep
-$(1): $(2)
-endef
-
 define _add_projects_to_share
-$(strip $(eval _idir := $(call intermediates-dir-for,METAPACKAGING,shareprojects))) \
-$(strip $(eval _tdir := $(call intermediates-dir-for,METAPACKAGING,licensetexts))) \
+$(strip $(eval _idir := $(call intermediates-dir-for,PACKAGING,shareprojects))) \
 $(strip $(eval _goals := $(sort $(_all_dist_goals)))) \
 $(strip $(eval _opairs := $(sort $(_all_dist_goal_output_pairs)))) \
 $(strip $(eval _dpairs := $(sort $(_all_dist_src_dst_pairs)))) \
 $(strip $(eval _allt :=)) \
 $(foreach goal,$(_goals), \
   $(eval _f := $(_idir)/$(goal).shareprojects) \
-  $(eval _n := $(_tdir)/$(goal).txt) \
   $(call dist-for-goals,$(goal),$(_f):shareprojects/$(basename $(notdir $(_f)))) \
-  $(call dist-for-goals,$(goal),$(_n):licensetexts/$(basename $(notdir $(_n)))) \
   $(eval _targets :=) \
   $(foreach op,$(filter $(goal):%,$(_opairs)),$(foreach p,$(filter %:$(call word-colon,2,$(op)),$(_dpairs)),$(eval _targets += $(call word-colon,1,$(p))))) \
   $(eval _allt += $(_targets)) \
   $(eval $(call _share-projects-rule,$(_f),$(_targets))) \
-  $(eval $(call _license-texts-rule,$(goal),$(_n),$(_targets))) \
 )\
 $(eval _f := $(_idir)/all.shareprojects)\
-$(eval _n := $(_tdir)/all.txt)\
-$(eval _idir :=)\
-$(eval _tdir :=)\
 $(eval $(call _share-projects-dep,shareprojects,$(_f))) \
-$(eval $(call _license-texts-dep,alllicensetexts,$(_n))) \
 $(call dist-for-goals,droid shareprojects,$(_f):shareprojects/all)\
-$(call dist-for-goals,droid alllicensetexts,$(_n):licensetexts/all)\
-$(eval _allt := $(sort $(_allt)))\
-$(eval $(call _share-projects-rule,$(_f),$(_allt)))\
-$(eval $(call _license-texts-rule,droid,$(_n),$(_allt)))\
-$(eval _f :=)\
-$(evan _n :=)
+$(eval $(call _share-projects-rule,$(_f),$(sort $(_allt))))
 endef
 
 #------------------------------------------------------------------

From 79605357390e65945ae3ed5e5aa12789093591e7 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Mon, 13 Jun 2022 19:32:53 +0000
Subject: [PATCH 392/425] Revert "Create lists of projects to share per dist
 target"

Revert submission 18821068

Reason for revert: Advised to switch to using TARGET_BUILD_APPS
Reverted Changes:
Ibd737c0dd:Record license text for every dist target.
Ibf5a9869d:Create lists of projects to share per dist target

Change-Id: I4a2c7b3c74b446ce3748217be30da70c060da0dd
Merged-in: If56a1fceb5da66b90b7b0ec2275ec429661515b4
---
 core/definitions.mk  | 137 ++++---------------------------------------
 core/distdir.mk      |  59 -------------------
 core/notice_files.mk |   2 +-
 3 files changed, 11 insertions(+), 187 deletions(-)

diff --git a/core/definitions.mk b/core/definitions.mk
index 84860f9fa4..0c46de9fc6 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -570,21 +570,16 @@ define license-metadata-dir
 $(call generated-sources-dir-for,META,lic,)
 endef
 
-TARGETS_MISSING_LICENSE_METADATA:=
-
 ###########################################################
 # License metadata targets corresponding to targets in $(1)
 ###########################################################
 define corresponding-license-metadata
-$(strip $(filter-out 0p,$(foreach target, $(sort $(1)), \
+$(strip $(foreach target, $(sort $(1)), \
   $(if $(strip $(ALL_MODULES.$(target).META_LIC)), \
     $(ALL_MODULES.$(target).META_LIC), \
     $(if $(strip $(ALL_TARGETS.$(target).META_LIC)), \
       $(ALL_TARGETS.$(target).META_LIC), \
-      $(eval TARGETS_MISSING_LICENSE_METADATA += $(target)) \
-    ) \
-  ) \
-)))
+      $(call append-path,$(call license-metadata-dir),$(patsubst $(OUT_DIR)%,out%,$(target).meta_lic))))))
 endef
 
 ###########################################################
@@ -709,60 +704,6 @@ $(_meta) : $(foreach d,$(_deps),$(call word-colon,1,$(d))) $(foreach n,$(_notice
 
 endef
 
-###########################################################
-## Record missing dependencies for non-module target $(1)
-###########################################################
-define record-missing-non-module-dependencies
-$(strip $(eval _tgt := $(strip $(1))))
-$(strip $(foreach d,$(strip $(ALL_NON_MODULES.$(_tgt).DEPENDENCIES)), \
-  $(if $(strip $(ALL_TARGETS.$(d).META_LIC)), \
-    , \
-    $(eval NON_MODULES_WITHOUT_LICENSE_METADATA += $(d))) \
-))
-endef
-
-###########################################################
-## License metadata build rule for copied target $(1)
-###########################################################
-define copied-target-license-metadata-rule
-$(if $(strip $(ALL_TARGETS.$(1).META_LIC)),,$(call _copied-target-license-metadata-rule,$(1)))
-endef
-
-define _copied-target-license-metadata-rule
-$(strip $(eval _dir := $(call license-metadata-dir)))
-$(strip $(eval _meta := $(call append-path,$(_dir),$(patsubst $(OUT_DIR)%,out%,$(1).meta_lic))))
-$(strip $(eval ALL_TARGETS.$(1).META_LIC:=$(_meta)))
-$(strip $(eval _dep:=))
-$(strip $(foreach s,$(ALL_COPIED_TARGETS.$(1).SOURCES),\
-  $(eval _dmeta:=$(ALL_TARGETS.$(s).META_LIC))\
-  $(if $(filter 0p,$(_dmeta)),\
-    $(if $(filter-out 0p,$(_dep)),,$(eval ALL_TARGETS.$(1).META_LIC:=0p)),\
-    $(if $(_dep),\
-      $(if $(filter-out $(_dep),$(_dmeta)),$(error cannot copy target from multiple modules: $(1) from $(_dep) and $(_dmeta))),
-      $(eval _dep:=$(_dmeta))))))
-$(strip $(if $(strip $(_dep)),,$(error cannot copy target from unknown module: $(1) from $(ALL_COPIED_TARGETS.$(1).SOURCES))))
-
-ifneq (0p,$(ALL_TARGETS.$(1).META_LIC))
-$(_meta): PRIVATE_DEST_TARGET := $(1)
-$(_meta): PRIVATE_SOURCE_TARGETS := $(ALL_COPIED_TARGETS.$(1).SOURCES)
-$(_meta): PRIVATE_SOURCE_METADATA := $(_dep)
-$(_meta): PRIVATE_ARGUMENT_FILE := $(call intermediates-dir-for,PACKAGING,copynotice)/$(_meta)/arguments
-$(_meta) : $(_dep) $(COPY_LICENSE_METADATA)
-	rm -f $$@
-	mkdir -p $$(dir $$@)
-	mkdir -p $$(dir $$(PRIVATE_ARGUMENT_FILE))
-	$$(call dump-words-to-file,\
-	    $$(addprefix -i ,$$(PRIVATE_DEST_TARGET))\
-	    $$(addprefix -s ,$$(PRIVATE_SOURCE_TARGETS))\
-	    $$(addprefix -d ,$$(PRIVATE_SOURCE_METADATA)),\
-	    $$(PRIVATE_ARGUMENT_FILE))
-	OUT_DIR=$(OUT_DIR) $(COPY_LICENSE_METADATA) \
-	  @$$(PRIVATE_ARGUMENT_FILE) \
-	  -o $$@
-
-endif
-endef
-
 ###########################################################
 ## Declare the license metadata for non-module target $(1).
 ##
@@ -776,7 +717,6 @@ define declare-license-metadata
 $(strip \
   $(eval _tgt := $(subst //,/,$(strip $(1)))) \
   $(eval ALL_NON_MODULES += $(_tgt)) \
-  $(eval ALL_TARGETS.$(_tgt).META_LIC := $(call license-metadata-dir)/$(patsubst $(OUT_DIR)%,out%,$(_tgt)).meta_lic) \
   $(eval ALL_NON_MODULES.$(_tgt).LICENSE_KINDS := $(strip $(2))) \
   $(eval ALL_NON_MODULES.$(_tgt).LICENSE_CONDITIONS := $(strip $(3))) \
   $(eval ALL_NON_MODULES.$(_tgt).NOTICES := $(strip $(4))) \
@@ -817,7 +757,6 @@ define declare-container-license-metadata
 $(strip \
   $(eval _tgt := $(subst //,/,$(strip $(1)))) \
   $(eval ALL_NON_MODULES += $(_tgt)) \
-  $(eval ALL_TARGETS.$(_tgt).META_LIC := $(call license-metadata-dir)/$(patsubst $(OUT_DIR)%,out%,$(_tgt)).meta_lic) \
   $(eval ALL_NON_MODULES.$(_tgt).LICENSE_KINDS := $(strip $(2))) \
   $(eval ALL_NON_MODULES.$(_tgt).LICENSE_CONDITIONS := $(strip $(3))) \
   $(eval ALL_NON_MODULES.$(_tgt).NOTICES := $(strip $(4))) \
@@ -890,7 +829,6 @@ define declare-license-deps
 $(strip \
   $(eval _tgt := $(strip $(1))) \
   $(eval ALL_NON_MODULES += $(_tgt)) \
-  $(eval ALL_TARGETS.$(_tgt).META_LIC := $(call license-metadata-dir)/$(patsubst $(OUT_DIR)%,out%,$(_tgt)).meta_lic) \
   $(eval ALL_NON_MODULES.$(_tgt).DEPENDENCIES := $(strip $(ALL_NON_MODULES.$(_tgt).DEPENDENCIES) $(2))) \
 )
 endef
@@ -907,7 +845,6 @@ define declare-container-license-deps
 $(strip \
   $(eval _tgt := $(strip $(1))) \
   $(eval ALL_NON_MODULES += $(_tgt)) \
-  $(eval ALL_TARGETS.$(_tgt).META_LIC := $(call license-metadata-dir)/$(patsubst $(OUT_DIR)%,out%,$(_tgt)).meta_lic) \
   $(eval ALL_NON_MODULES.$(_tgt).DEPENDENCIES := $(strip $(ALL_NON_MODULES.$(_tgt).DEPENDENCIES) $(2))) \
   $(eval ALL_NON_MODULES.$(_tgt).IS_CONTAINER := true) \
   $(eval ALL_NON_MODULES.$(_tgt).ROOT_MAPPINGS := $(strip $(ALL_NON_MODULES.$(_tgt).ROOT_MAPPINGS) $(3))) \
@@ -919,14 +856,12 @@ endef
 ###########################################################
 define report-missing-licenses-rule
 .PHONY: reportmissinglicenses
-reportmissinglicenses: PRIVATE_NON_MODULES:=$(sort $(NON_MODULES_WITHOUT_LICENSE_METADATA) $(TARGETS_MISSING_LICENSE_METADATA))
-reportmissinglicenses: PRIVATE_COPIED_FILES:=$(sort $(filter $(NON_MODULES_WITHOUT_LICENSE_METADATA) $(TARGETS_MISSING_LICENSE_METADATA),\
-  $(foreach _pair,$(PRODUCT_COPY_FILES), $(PRODUCT_OUT)/$(call word-colon,2,$(_pair)))))
+reportmissinglicenses: PRIVATE_NON_MODULES:=$(sort $(NON_MODULES_WITHOUT_LICENSE_METADATA))
+reportmissinglicenses: PRIVATE_COPIED_FILES:=$(sort $(filter $(NON_MODULES_WITHOUT_LICENSE_METADATA),$(foreach _pair,$(PRODUCT_COPY_FILES), $(PRODUCT_OUT)/$(call word-colon,2,$(_pair)))))
 reportmissinglicenses:
 	@echo Reporting $$(words $$(PRIVATE_NON_MODULES)) targets without license metadata
 	$$(foreach t,$$(PRIVATE_NON_MODULES),if ! [ -h $$(t) ]; then echo No license metadata for $$(t) >&2; fi;)
 	$$(foreach t,$$(PRIVATE_COPIED_FILES),if ! [ -h $$(t) ]; then echo No license metadata for copied file $$(t) >&2; fi;)
-	echo $$(words $$(PRIVATE_NON_MODULES)) targets missing license metadata >&2
 
 endef
 
@@ -979,9 +914,13 @@ $(strip \
   $(foreach t,$(sort $(ALL_0P_TARGETS)), \
     $(eval ALL_TARGETS.$(t).META_LIC := 0p) \
   ) \
+  $(foreach t,$(sort $(ALL_NON_MODULES)), \
+    $(eval ALL_TARGETS.$(t).META_LIC := $(call append-path,$(_dir),$(patsubst $(OUT_DIR)%,out%,$(t).meta_lic))) \
+  ) \
   $(foreach t,$(sort $(ALL_NON_MODULES)),$(eval $(call non-module-license-metadata-rule,$(t)))) \
   $(foreach m,$(sort $(ALL_MODULES)),$(eval $(call license-metadata-rule,$(m)))) \
-  $(foreach t,$(sort $(ALL_COPIED_TARGETS)),$(eval $(call copied-target-license-metadata-rule,$(t)))) \
+  $(eval $(call report-missing-licenses-rule)) \
+  $(eval $(call report-all-notice-library-names-rule)) \
   $(eval $(call build-all-license-metadata-rule)))
 endef
 
@@ -1053,22 +992,6 @@ $(strip \
 )
 endef
 
-# Uses LOCAL_MODULE_CLASS, LOCAL_MODULE, and LOCAL_IS_HOST_MODULE
-# to determine the intermediates directory.
-#
-# $(1): if non-empty, force the intermediates to be COMMON
-# $(2): if non-empty, force the intermediates to be for the 2nd arch
-# $(3): if non-empty, force the intermediates to be for the host cross os
-define local-meta-intermediates-dir
-$(strip \
-    $(if $(strip $(LOCAL_MODULE_CLASS)),, \
-        $(error $(LOCAL_PATH): LOCAL_MODULE_CLASS not defined before call to local-meta-intermediates-dir)) \
-    $(if $(strip $(LOCAL_MODULE)),, \
-        $(error $(LOCAL_PATH): LOCAL_MODULE not defined before call to local-meta-intermediates-dir)) \
-    $(call intermediates-dir-for,META$(LOCAL_MODULE_CLASS),$(LOCAL_MODULE),$(if $(strip $(LOCAL_IS_HOST_MODULE)),HOST),$(1),$(2),$(3)) \
-)
-endef
-
 ###########################################################
 ## The generated sources directory.  Placing generated
 ## source files directly in the intermediates directory
@@ -2488,47 +2411,7 @@ define dump-words-to-file
         @$(call emit-line,$(wordlist 38001,38500,$(1)),$(2))
         @$(call emit-line,$(wordlist 38501,39000,$(1)),$(2))
         @$(call emit-line,$(wordlist 39001,39500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 39501,40000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 40001,40500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 40501,41000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 41001,41500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 41501,42000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 42001,42500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 42501,43000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 43001,43500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 43501,44000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 44001,44500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 44501,45000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 45001,45500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 45501,46000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 46001,46500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 46501,47000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 47001,47500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 47501,48000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 48001,48500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 48501,49000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 49001,49500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 49501,50000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 50001,50500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 50501,51000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 51001,51500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 51501,52000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 52001,52500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 52501,53000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 53001,53500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 53501,54000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 54001,54500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 54501,55000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 55001,55500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 55501,56000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 56001,56500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 56501,57000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 57001,57500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 57501,58000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 58001,58500,$(1)),$(2))
-        @$(call emit-line,$(wordlist 58501,59000,$(1)),$(2))
-        @$(call emit-line,$(wordlist 59001,59500,$(1)),$(2))
-        @$(if $(wordlist 59501,59502,$(1)),$(error Too many words ($(words $(1)))))
+        @$(if $(wordlist 39501,39502,$(1)),$(error Too many words ($(words $(1)))))
 endef
 # Return jar arguments to compress files in a given directory
 # $(1): directory
diff --git a/core/distdir.mk b/core/distdir.mk
index 0edeffdf4b..aad8ff3d65 100644
--- a/core/distdir.mk
+++ b/core/distdir.mk
@@ -45,56 +45,6 @@ $(foreach file,$(2), \
     $(eval _all_dist_goal_output_pairs += $$(goal):$$(dst))))
 endef
 
-.PHONY: shareprojects
-#shareprojects:
-
-define __share-projects-rule
-$(1) : PRIVATE_TARGETS := $(2)
-$(1) : PRIVATE_ARGUMENT_FILE := $(call intermediates-dir-for,PACKAGING,codesharing)/$(1)/arguments
-$(1): $(2) $(COMPLIANCE_LISTSHARE)
-	$(hide) rm -f $$@
-	mkdir -p $$(dir $$@)
-	mkdir -p $$(dir $$(PRIVATE_ARGUMENT_FILE))
-	$$(if $$(strip $$(PRIVATE_TARGETS)),$$(call dump-words-to-file,$$(PRIVATE_TARGETS),$$(PRIVATE_ARGUMENT_FILE)))
-	$$(if $$(strip $$(PRIVATE_TARGETS)),OUT_DIR=$(OUT_DIR) $(COMPLIANCE_LISTSHARE) -o $$@ @$$(PRIVATE_ARGUMENT_FILE),touch $$@)
-endef
-
-# build list of projects to share in $(1) for dist targets in $(2)
-#
-# $(1): the intermediate project sharing file
-# $(2): the dist files to base the sharing on
-define _share-projects-rule
-$(eval $(call __share-projects-rule,$(1),$(call corresponding-license-metadata,$(2))))
-endef
-
-# Add a build dependency
-#
-# $(1): the goal phony target
-# $(2): the intermediate shareprojects file
-define _share-projects-dep
-$(1): $(2)
-endef
-
-define _add_projects_to_share
-$(strip $(eval _idir := $(call intermediates-dir-for,PACKAGING,shareprojects))) \
-$(strip $(eval _goals := $(sort $(_all_dist_goals)))) \
-$(strip $(eval _opairs := $(sort $(_all_dist_goal_output_pairs)))) \
-$(strip $(eval _dpairs := $(sort $(_all_dist_src_dst_pairs)))) \
-$(strip $(eval _allt :=)) \
-$(foreach goal,$(_goals), \
-  $(eval _f := $(_idir)/$(goal).shareprojects) \
-  $(call dist-for-goals,$(goal),$(_f):shareprojects/$(basename $(notdir $(_f)))) \
-  $(eval _targets :=) \
-  $(foreach op,$(filter $(goal):%,$(_opairs)),$(foreach p,$(filter %:$(call word-colon,2,$(op)),$(_dpairs)),$(eval _targets += $(call word-colon,1,$(p))))) \
-  $(eval _allt += $(_targets)) \
-  $(eval $(call _share-projects-rule,$(_f),$(_targets))) \
-)\
-$(eval _f := $(_idir)/all.shareprojects)\
-$(eval $(call _share-projects-dep,shareprojects,$(_f))) \
-$(call dist-for-goals,droid shareprojects,$(_f):shareprojects/all)\
-$(eval $(call _share-projects-rule,$(_f),$(sort $(_allt))))
-endef
-
 #------------------------------------------------------------------
 # To be used at the end of the build to collect all the uses of
 # dist-for-goals, and write them into a file for the packaging step to use.
@@ -102,15 +52,6 @@ endef
 # $(1): The file to write
 define dist-write-file
 $(strip \
-  $(call _add_projects_to_share)\
-  $(if $(strip $(ANDROID_REQUIRE_LICENSE_METADATA)),\
-    $(foreach target,$(sort $(TARGETS_MISSING_LICENSE_METADATA)),$(warning target $(target) missing license metadata))\
-    $(if $(strip $(TARGETS_MISSING_LICENSE_METADATA)),\
-      $(if $(filter true error,$(ANDROID_REQUIRE_LICENSE_METADATA)),\
-        $(error $(words $(sort $(TARGETS_MISSING_LICENSE_METADATA))) targets need license metadata))))\
-  $(foreach t,$(sort $(ALL_NON_MODULES)),$(call record-missing-non-module-dependencies,$(t))) \
-  $(eval $(call report-missing-licenses-rule)) \
-  $(eval $(call report-all-notice-library-names-rule)) \
   $(KATI_obsolete_var dist-for-goals,Cannot be used after dist-write-file) \
   $(foreach goal,$(sort $(_all_dist_goals)), \
     $(eval $$(goal): _dist_$$(goal))) \
diff --git a/core/notice_files.mk b/core/notice_files.mk
index 4b67404fd2..c05d4ea0be 100644
--- a/core/notice_files.mk
+++ b/core/notice_files.mk
@@ -125,7 +125,7 @@ local_path := $(LOCAL_PATH)
 module_license_metadata :=
 
 ifdef my_register_name
-  module_license_metadata := $(call local-meta-intermediates-dir)/$(my_register_name).meta_lic
+  module_license_metadata := $(call local-intermediates-dir)/$(my_register_name).meta_lic
 
   $(foreach target,$(ALL_MODULES.$(my_register_name).BUILT) $(ALL_MODULES.$(my_register_name).INSTALLED) $(my_test_data) $(my_test_config),\
     $(eval ALL_TARGETS.$(target).META_LIC := $(module_license_metadata)))

From 58a0f98fc37897df157fc969fe7bb2b44b0c1299 Mon Sep 17 00:00:00 2001
From: Jooyung Han <jooyung@google.com>
Date: Mon, 30 May 2022 16:19:55 +0900
Subject: [PATCH 393/425] Remove AIDL libs from VNDK libs

The remaining AIDL libs are still in use by other VNDK libs.

Bug: 234181591
Test: m
Merged-In: I234a55f10c01ca1786eb5e6715a75ed72705ca50
Change-Id: I234a55f10c01ca1786eb5e6715a75ed72705ca50
(cherry picked from commit be9d1e21f6cb4a3f273f039a288940431df3783a)
---
 target/product/gsi/current.txt | 45 ----------------------------------
 1 file changed, 45 deletions(-)

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index 03a143d02c..bb8dbf483a 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -58,70 +58,25 @@ VNDK-SP: libunwindstack.so
 VNDK-SP: libutils.so
 VNDK-SP: libutilscallstack.so
 VNDK-SP: libz.so
-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-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
-VNDK-core: android.hardware.camera.provider-V1-ndk.so
 VNDK-core: android.hardware.configstore-utils.so
 VNDK-core: android.hardware.configstore@1.0.so
 VNDK-core: android.hardware.configstore@1.1.so
 VNDK-core: android.hardware.confirmationui-support-lib.so
-VNDK-core: android.hardware.drm-V1-ndk.so
-VNDK-core: android.hardware.dumpstate-V1-ndk.so
-VNDK-core: android.hardware.gnss-V2-ndk.so
 VNDK-core: android.hardware.graphics.allocator@2.0.so
 VNDK-core: android.hardware.graphics.allocator@3.0.so
 VNDK-core: android.hardware.graphics.allocator@4.0.so
 VNDK-core: android.hardware.graphics.bufferqueue@1.0.so
 VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
-VNDK-core: android.hardware.health-V1-ndk.so
-VNDK-core: android.hardware.health.storage-V1-ndk.so
-VNDK-core: android.hardware.identity-V4-ndk.so
-VNDK-core: android.hardware.ir-V1-ndk.so
-VNDK-core: android.hardware.keymaster-V3-ndk.so
-VNDK-core: android.hardware.light-V2-ndk.so
 VNDK-core: android.hardware.media.bufferpool@2.0.so
 VNDK-core: android.hardware.media.omx@1.0.so
 VNDK-core: android.hardware.media@1.0.so
 VNDK-core: android.hardware.memtrack-V1-ndk.so
 VNDK-core: android.hardware.memtrack@1.0.so
-VNDK-core: android.hardware.nfc-V1-ndk.so
-VNDK-core: android.hardware.oemlock-V1-ndk.so
-VNDK-core: android.hardware.power-V3-ndk.so
-VNDK-core: android.hardware.power.stats-V1-ndk.so
-VNDK-core: android.hardware.radio-V1-ndk.so
-VNDK-core: android.hardware.radio.config-V1-ndk.so
-VNDK-core: android.hardware.radio.data-V1-ndk.so
-VNDK-core: android.hardware.radio.messaging-V1-ndk.so
-VNDK-core: android.hardware.radio.modem-V1-ndk.so
-VNDK-core: android.hardware.radio.network-V1-ndk.so
-VNDK-core: android.hardware.radio.sim-V1-ndk.so
-VNDK-core: android.hardware.radio.voice-V1-ndk.so
-VNDK-core: android.hardware.rebootescrow-V1-ndk.so
-VNDK-core: android.hardware.security.dice-V1-ndk.so
-VNDK-core: android.hardware.security.keymint-V2-ndk.so
-VNDK-core: android.hardware.security.secureclock-V1-ndk.so
-VNDK-core: android.hardware.security.sharedsecret-V1-ndk.so
-VNDK-core: android.hardware.sensors-V1-ndk.so
-VNDK-core: android.hardware.soundtrigger3-V1-ndk.so
 VNDK-core: android.hardware.soundtrigger@2.0-core.so
 VNDK-core: android.hardware.soundtrigger@2.0.so
-VNDK-core: android.hardware.usb-V1-ndk.so
-VNDK-core: android.hardware.uwb-V1-ndk.so
-VNDK-core: android.hardware.vibrator-V2-ndk.so
-VNDK-core: android.hardware.weaver-V1-ndk.so
-VNDK-core: android.hardware.wifi.hostapd-V1-ndk.so
-VNDK-core: android.hardware.wifi.supplicant-V1-ndk.so
 VNDK-core: android.hidl.token@1.0-utils.so
 VNDK-core: android.hidl.token@1.0.so
-VNDK-core: android.media.audio.common.types-V1-ndk.so
-VNDK-core: android.media.soundtrigger.types-V1-ndk.so
-VNDK-core: android.system.keystore2-V2-ndk.so
 VNDK-core: android.system.suspend-V1-ndk.so
 VNDK-core: android.system.suspend@1.0.so
 VNDK-core: libaudioroute.so

From ad0ef270db79cdf67508dff343d1f36cd58308eb Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 14 Jun 2022 11:56:30 +0000
Subject: [PATCH 394/425] Don't exclude docs build from using prebuilts

Even though it doesn't have google modules in PRODUCT_PACKAGES,
the docs build wants to use prebuilts when the rest of the branch
does.

Bug: 230478310
Test: m docs (inspect MODULE_BUILD_FROM_SOURCE)
Change-Id: I1d67f4099e9fdc5fbaeeb0bf0fce80aa91c05eb5
---
 core/android_soong_config_vars.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 28181ebfae..ae8204c8a2 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -93,13 +93,13 @@ endif
 
 ifneq (,$(MODULE_BUILD_FROM_SOURCE))
   # Keep an explicit setting.
-else ifeq (,$(filter 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)))
   # Prebuilt module SDKs require prebuilt modules to work, and currently
   # prebuilt modules are only provided for com.google.android.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.
   #
-  # However, sdk/win_sdk/sdk_addon builds might not include com.google.android.xxx
+  # However, docs/sdk/win_sdk/sdk_addon builds might not include com.google.android.xxx
   # packages, so for those we respect the default behavior.
   MODULE_BUILD_FROM_SOURCE := true
 else ifneq (,$(PRODUCT_MODULE_BUILD_FROM_SOURCE))

From 9f2be867c4e76f9a83f193e64ae737c45cd79e14 Mon Sep 17 00:00:00 2001
From: Bassem Khalife <bkhalife@google.com>
Date: Wed, 15 Jun 2022 21:58:54 +0000
Subject: [PATCH 395/425] Update Security String to 2022-08-05

Bug: 232157623
Change-Id: Ief202c2f8b37d686397560df599d2143d763ba65
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index cce80b5e64..65957c8859 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-07-05
+    PLATFORM_SECURITY_PATCH := 2022-08-05
 endif
 
 include $(BUILD_SYSTEM)/version_util.mk

From 2489eee1733323b2c54d2c954ac49592ece89001 Mon Sep 17 00:00:00 2001
From: Bassem Khalife <bkhalife@google.com>
Date: Wed, 15 Jun 2022 22:02:43 +0000
Subject: [PATCH 396/425] Update Security String to 2022-08-01

Bug: 232157623

Change-Id: Ief202c2f8b37d686397560df599d2143d763ba65
Merged-In: Ief202c2f8b37d686397560df599d2143d763ba65
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index e21a7336e0..ba18c14a60 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -250,7 +250,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-07-01
+      PLATFORM_SECURITY_PATCH := 2022-08-01
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH
 

From ee6b08e1a2ef52f864ccff2fe9691e9576291e02 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 17 Jun 2022 06:29:21 +0000
Subject: [PATCH 397/425] Version bump to TP1A.220617.002 [core/build_id.mk]

Change-Id: I40d6f95886baf91e954c38460e6227f7997432a3
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 6da28fdd28..0e20e2af64 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=TP1A.220617.001
+BUILD_ID=TP1A.220617.002

From 39675fb7f3cbf45067ee69e239701bede051b3b2 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 17 Jun 2022 14:47:10 +0000
Subject: [PATCH 398/425] Version bump to TP1A.220617.003 [core/build_id.mk]

Change-Id: I6ad181f68a4027aa023f4ae9b9e9ef27cfbde00f
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 0e20e2af64..5217b6770a 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=TP1A.220617.002
+BUILD_ID=TP1A.220617.003

From bfd1aa30f53d0cb21fec39876b90b5dea66fd2e0 Mon Sep 17 00:00:00 2001
From: Oriol Prieto Gasco <opg@google.com>
Date: Sun, 19 Jun 2022 17:52:07 +0000
Subject: [PATCH 399/425] Use the btservices apex for bluetooth stack

Test: TH

Bug: 236187653, 236192423

Change-Id: Id57f3e86f243948d3ea21c6e1a7150ab07c317b5
---
 target/product/base_system.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 6f6cd79214..c919ac462b 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -52,7 +52,7 @@ PRODUCT_PACKAGES += \
     com.android.adbd \
     com.android.adservices \
     com.android.appsearch \
-    com.android.bluetooth \
+    com.android.btservices \
     com.android.conscrypt \
     com.android.extservices \
     com.android.i18n \

From 52fd4edb4717aad45f4b3b42983bdee1a1da48c1 Mon Sep 17 00:00:00 2001
From: Bassem Khalife <bkhalife@google.com>
Date: Tue, 21 Jun 2022 05:32:29 +0000
Subject: [PATCH 400/425] Update Security String to 2022-08-01

Bug: 232157623

Change-Id: Ief202c2f8b37d686397560df599d2143d763ba65
Merged-In: Ief202c2f8b37d686397560df599d2143d763ba65
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 731d4989ee..ce1574e331 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -240,7 +240,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-07-05
+    PLATFORM_SECURITY_PATCH := 2022-08-01
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH
 

From 9c2f61119c2bd7c11b0c1e4077607921c4d835d1 Mon Sep 17 00:00:00 2001
From: William Escande <wescande@google.com>
Date: Wed, 22 Jun 2022 13:19:47 -0700
Subject: [PATCH 401/425] Change Bluetooth apex mountpoint

Apex name has been changed to com.android.btservices
Changing mount point accordingly
Bug: 235892590
Test: Flash / boot bt / look logs & pair a device

Change-Id: I1e32f26c5e2b121391bc85c6b50b2ccdf57ff5de
---
 target/product/default_art_config.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 993edf3284..e2bb9d5dd4 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -54,7 +54,7 @@ PRODUCT_APEX_BOOT_JARS := \
     com.android.adservices:framework-adservices \
     com.android.adservices:framework-sdksandbox \
     com.android.appsearch:framework-appsearch \
-    com.android.bluetooth:framework-bluetooth \
+    com.android.btservices:framework-bluetooth \
     com.android.conscrypt:conscrypt \
     com.android.i18n:core-icu4j \
     com.android.ipsec:android.net.ipsec.ike \
@@ -93,7 +93,7 @@ PRODUCT_STANDALONE_SYSTEM_SERVER_JARS := \
 # Keep the list sorted by module names and then library names.
 # Note: For modules available in Q, DO NOT add new entries here.
 PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS := \
-    com.android.bluetooth:service-bluetooth \
+    com.android.btservices:service-bluetooth \
     com.android.os.statsd:service-statsd \
     com.android.scheduling:service-scheduling \
     com.android.tethering:service-connectivity \

From dccd189954c52d2726cfd287a7a230f4b837f285 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Wed, 22 Jun 2022 16:42:26 +0000
Subject: [PATCH 402/425] Do not override setting of
 SOONG_CONFIG_<m>_module_source_build

Previously, any setting of SOONG_CONFIG_<m>_module_source_build (where
<m> is one of wifi, uwb or bluetooth) that was made before the
core/android_soong_config_vars.mk was processed would be replaced with
false. This change will only set them to false if they have not been
previously set.

Bug: 233965247
Test: m nothing
      # After setting SOONG_CONFIG_wifi_module_source=true before this
      # code. Without this change out/soong/soong.variables uses false
      # for the wifi_module/module_source config variable. With this
      # change it uses true.
Change-Id: I1dffeb055a68250f574630d4ef5fedc51bad4a2b
---
 core/android_soong_config_vars.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 711518ed70..2880b287c5 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -130,7 +130,8 @@ INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \
   wifi \
 
 $(foreach m, $(INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES),\
-  $(call soong_config_set,$(m)_module,source_build,$(MODULE_BUILD_FROM_SOURCE)))
+  $(if $(call soong_config_get,$(m)_module,source_build),,\
+    $(call soong_config_set,$(m)_module,source_build,$(MODULE_BUILD_FROM_SOURCE))))
 
 # Apex build mode variables
 ifdef APEX_BUILD_FOR_PRE_S_DEVICES

From dc356dddec7ee17843b76975db0736d20cedc85d Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 24 Jun 2022 02:27:20 +0000
Subject: [PATCH 403/425] Version bump to TP1A.220624.002 [core/build_id.mk]

Change-Id: Idd3688a71cf7a1cd2e2022e06f0bb39b010f1a20
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 28ef816ca9..ae9814d93a 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=TP1A.220624.001
+BUILD_ID=TP1A.220624.002

From fbd160844d86e51c1f018463904670488f201fde Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 24 Jun 2022 21:10:39 +0000
Subject: [PATCH 404/425] Version bump to TP1A.220624.003 [core/build_id.mk]

Change-Id: Ifd7cc158b239cd6e8b0cfb0e31e7a4ca7b3f6d4c
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index ae9814d93a..bd8b91357d 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=TP1A.220624.002
+BUILD_ID=TP1A.220624.003

From 3aaf633e7e0047fc3c66c77219c94bd8675767c7 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 28 Jun 2022 01:30:24 +0000
Subject: [PATCH 405/425] Version bump to TP1A.220624.004 [core/build_id.mk]

Change-Id: I5279757e5c0c64f5e9c72c3b8b1bcbb3b10787b7
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index bd8b91357d..bb9c452dd1 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=TP1A.220624.003
+BUILD_ID=TP1A.220624.004

From 28ab2d31e75c3e1ba60a650746380383d17b2cab Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 29 Jun 2022 00:04:46 +0000
Subject: [PATCH 406/425] Version bump to TP1A.220624.005 [core/build_id.mk]

Change-Id: Idec156499d8e9c158f62c0e323d6c1a1071b1c22
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index bb9c452dd1..b13a7e2984 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=TP1A.220624.004
+BUILD_ID=TP1A.220624.005

From 9b2f5857655c9590d059a9a178bf7ae3c9a3e0dc Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 29 Jun 2022 04:13:09 +0000
Subject: [PATCH 407/425] Version bump to TP1A.220624.006 [core/build_id.mk]

Change-Id: I44654bde98093cf52112518f947c447b414c69ea
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index b13a7e2984..5f06f7cd9d 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=TP1A.220624.005
+BUILD_ID=TP1A.220624.006

From af0a439b774cdcbb0879f910e13b0c819ab81547 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 30 Jun 2022 02:28:14 +0000
Subject: [PATCH 408/425] Version bump to TP1A.220624.007 [core/build_id.mk]

Change-Id: If63d2ac0b3f19b6f20852c19aa7ce56a23dbe512
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 5f06f7cd9d..53f3bb7f73 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=TP1A.220624.006
+BUILD_ID=TP1A.220624.007

From 480b2a5f6e11757edd090fead3f0bec20b190dcb Mon Sep 17 00:00:00 2001
From: Xin Li <delphij@google.com>
Date: Thu, 30 Jun 2022 05:55:34 +0000
Subject: [PATCH 409/425] Fix BUILD_ID after T merge.

Bug: 236760014
Merged-In: I4e4b6a02fc140a1e38ce533031d7eb0a739396df
Change-Id: I98773bd8a62e2a7160e70d0c888c799f2f10fbf0
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index a4897887a2..ba5ca42dc7 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=TM
+BUILD_ID=AOSP.MASTER

From a8de116cedb1b68df1fedb727ba531bb629275bb Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 1 Jul 2022 00:59:57 +0000
Subject: [PATCH 410/425] Version bump to TP1A.220624.008 [core/build_id.mk]

Change-Id: I38c1fb3d98250396831c445fcc7666cfeaaa2c49
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 53f3bb7f73..cd6fce5a71 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=TP1A.220624.007
+BUILD_ID=TP1A.220624.008

From 193d68bbc3eb5a75f1e768de382aca140c1de8b3 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 1 Jul 2022 23:47:41 +0000
Subject: [PATCH 411/425] Version bump to TP1A.220624.009 [core/build_id.mk]

Change-Id: I5704765db36bf7eee269ceb59ccbf808fd08f79d
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index cd6fce5a71..585e2459fc 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=TP1A.220624.008
+BUILD_ID=TP1A.220624.009

From c494d0291a0e264682e6d6e59b8cbf7652a64efe Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 7 Jul 2022 03:06:18 +0000
Subject: [PATCH 412/425] Version bump to TP1A.220624.010 [core/build_id.mk]

Change-Id: Ied294fcb0a4d7a2cbc6c6ae26370057c41b11b5f
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 585e2459fc..0509827ef8 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=TP1A.220624.009
+BUILD_ID=TP1A.220624.010

From 9d9caf2ee9ddf62cbe37ac9df37553f9ec203d34 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Fri, 8 Jul 2022 00:19:57 +0000
Subject: [PATCH 413/425] Version bump to TP1A.220624.011 [core/build_id.mk]

Change-Id: Ia2c1a3adbb96711c5f6c15f7b5bcd305ec336073
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 0509827ef8..2b60c2eb7e 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=TP1A.220624.010
+BUILD_ID=TP1A.220624.011

From d08025e143eb035b7387d29533bf4c0bd9797cff Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Sat, 9 Jul 2022 07:37:44 +0000
Subject: [PATCH 414/425] Version bump to TP1A.220624.012 [core/build_id.mk]

Change-Id: Idfcc0649c498111bba9259ce76fafb9acfca585c
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 2b60c2eb7e..35b4ac1d5a 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=TP1A.220624.011
+BUILD_ID=TP1A.220624.012

From ea74f3753f2f126c994856bdce4bca41554dd8b6 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Sat, 9 Jul 2022 21:53:21 +0000
Subject: [PATCH 415/425] Version bump to TP1A.220624.013 [core/build_id.mk]

Change-Id: Ie16b441e03a031121fa6e3b1621a2c76ba8f4bb7
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 35b4ac1d5a..a4cb62f5cb 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=TP1A.220624.012
+BUILD_ID=TP1A.220624.013

From 2879d3117d81bca5338c34b8faa3cf7bfe907b21 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 12 Jul 2022 01:05:15 +0000
Subject: [PATCH 416/425] Version bump to TP1A.220624.014 [core/build_id.mk]

Change-Id: Idbff6d854ddb9df5b5936a45a822d63a7445deee
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index a4cb62f5cb..c024fd21f7 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=TP1A.220624.013
+BUILD_ID=TP1A.220624.014

From de072d3d498f34989879f9c9b8d40a258747a605 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 13 Jul 2022 01:45:50 +0000
Subject: [PATCH 417/425] Version bump to TP1A.220624.015 [core/build_id.mk]

Change-Id: I25acaf686414ac908673e518e6037ca6ef9c2cc9
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index c024fd21f7..41e5fb0a52 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=TP1A.220624.014
+BUILD_ID=TP1A.220624.015

From 86251a5450bff331adfa91ffb46ee6140b376b9f Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Tue, 12 Jul 2022 13:35:26 +0000
Subject: [PATCH 418/425] Add permission to the list of individually toggleable
 modules

This is safe even though permission is not an optional mainline
module because devices that support mainline must pass GTS and
testModulesSignedCorrectly and testModulesPreloadedCorrectly in GTS
currently tests this, along with testMainlineApprovedTrain which checks
mandatory/optional, signing keys, and if what's preloaded are part of
approved trains.

Bug: 238175656
Test: # Cherry pick to branch that has Google signed prebuilts for
      # permission and builds from prebuilts by default.
      # Update the permission to an sdk snapshot generated with
      # r.android.com/2151273.
      # Make sure that the permission is built from prebuilts by
      # default
Change-Id: Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9
(cherry picked from commit fb72d542ad0a766683b86fc48b6a9301140eea04)
Merged-In: Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9
---
 core/android_soong_config_vars.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index ba894d9f33..93ca70f636 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -76,6 +76,7 @@ $(call soong_config_set,art_module,source_build,$(ART_MODULE_BUILD_FROM_SOURCE))
 # default.
 INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \
   bluetooth \
+  permission \
   uwb \
   wifi \
 

From a4992884d4e98654d989d175889d890c54f859c8 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 14 Jul 2022 06:17:48 +0000
Subject: [PATCH 419/425] Version bump to TP1A.220624.016 [core/build_id.mk]

Change-Id: I23d5ebcfbfb18123b7c2e28c21373fff9cd64ff3
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 41e5fb0a52..22fad78af8 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=TP1A.220624.015
+BUILD_ID=TP1A.220624.016

From d4f1f84e4aef1122b5f1083857071ad728fa7455 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 14 Jul 2022 09:41:19 +0000
Subject: [PATCH 420/425] Version bump to TP1A.220624.017 [core/build_id.mk]

Change-Id: Ic190c7409c3e28ac442136db52a11a9037d270a9
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 22fad78af8..d114664f99 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=TP1A.220624.016
+BUILD_ID=TP1A.220624.017

From 9b615fdafbda9e8e969ffe1fc5a4290f3aaaf76d Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 20 Jul 2022 10:49:24 +0000
Subject: [PATCH 421/425] Version bump to TP1A.220624.018 [core/build_id.mk]

Change-Id: I3b4e6491b2bd15667973bf10720cf37f781a76d7
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index d114664f99..be6caad29c 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=TP1A.220624.017
+BUILD_ID=TP1A.220624.018

From f74a6809e956012319697d83ed9ffa415b757378 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Thu, 21 Jul 2022 03:28:42 +0000
Subject: [PATCH 422/425] Version bump to TP1A.220624.019 [core/build_id.mk]

Change-Id: I3d0c17148088479a56df8a6988ad13a8911b2f12
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index be6caad29c..534eae0e79 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=TP1A.220624.018
+BUILD_ID=TP1A.220624.019

From 5821c51c5d30d8305716688644544ae7203655e4 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Sat, 23 Jul 2022 05:25:23 +0000
Subject: [PATCH 423/425] Version bump to TP1A.220624.020 [core/build_id.mk]

Change-Id: I447464b3058d78503c4390ad39838b1a3b0c9e49
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 534eae0e79..575fda20c8 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=TP1A.220624.019
+BUILD_ID=TP1A.220624.020

From 8141d084089db67e0446ed34e9e50d4b5c225c05 Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Wed, 27 Jul 2022 20:27:40 +0000
Subject: [PATCH 424/425] Version bump to TP1A.220624.021 [core/build_id.mk]

Change-Id: Ic806bca584fa3f0f885c847620c4f4276261e20c
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 575fda20c8..4b306dd8ff 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=TP1A.220624.020
+BUILD_ID=TP1A.220624.021

From f200991b20aa464f7689c8b81eefbdb715692cdf Mon Sep 17 00:00:00 2001
From: Android Build Coastguard Worker
 <android-build-coastguard-worker@google.com>
Date: Tue, 2 Aug 2022 00:25:30 +0000
Subject: [PATCH 425/425] Version bump to TP1A.220624.021.A1 [core/build_id.mk]

Change-Id: I7c8493c902491dd966825f86f50a98e94119501e
---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 4b306dd8ff..798de1ce56 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=TP1A.220624.021
+BUILD_ID=TP1A.220624.021.A1