Merge commit 'cda08bfbf55aed1e4c79efe6a66bb930d19a8a13' into lineage-23.0

* commit 'cda08bfbf55aed1e4c79efe6a66bb930d19a8a13': (25 commits)
  Add apexd.mainline_patch_level_2 to PRODUCT_PACKAGES
  Version bump to BP2A.250605.031.A5 [core/build_id.mk]
  Version bump to BP2A.250805.005 [core/build_id.mk]
  Version bump to BP2A.250805.004 [core/build_id.mk]
  Version bump to BP2A.250805.003 [core/build_id.mk]
  Version bump to BP2A.250805.002 [core/build_id.mk]
  Version bump to BP2A.250605.031.A4 [core/build_id.mk]
  Version bump to BP2A.250705.008.A1 [core/build_id.mk]
  Change the logic of checking if open source notice should be displayed
  Version bump to BP2A.250605.006.E4 [core/build_id.mk]
  Version bump to BP2A.250605.031.T1 [core/build_id.mk]
  Version bump to BP2A.250705.008 [core/build_id.mk]
  Version bump to BP2A.250605.031.A3 [core/build_id.mk]
  Version bump to BP2A.250705.007 [core/build_id.mk]
  Version bump to BP2A.250705.006 [core/build_id.mk]
  Update html notice to include a notice of requesting source code
  Version bump to BP2A.250705.004 [core/build_id.mk]
  Version bump to BP2A.250605.006.E3 [core/build_id.mk]
  Version bump to BP2A.250705.003 [core/build_id.mk]
  Version bump to BP2A.250705.002 [core/build_id.mk]
  ...

Change-Id: I11e82de2e03d10ed78d1fe418b2caf209fc0d710

5 files changed, 31 insertions, 2 deletions

diff --git a/core/build_id.mk b/core/build_id.mk
index 9067611279..ccaa9e8ca1 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=BP2A.250605.031.A2
+BUILD_ID=BP2A.250805.005
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 4b79773ca7..3f29c102e7 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -28,6 +28,7 @@ PRODUCT_PACKAGES += \
     android.test.mock \
     android.test.runner \
     apexd \
+    apexd.mainline_patch_level_2 \
     appops \
     app_process \
     appwidget \
diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp
index 0a32a55b6b..7198ea36e4 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -536,6 +536,7 @@ system_image_defaults {
         "android.software.window_magnification.prebuilt.xml", // handheld_system
         "android.system.suspend-service",
         "apexd",
+        "apexd.mainline_patch_level_2",
         "appops",
         "approved-ogki-builds.xml", // base_system
         "appwidget",
diff --git a/tools/compliance/cmd/htmlnotice/htmlnotice.go b/tools/compliance/cmd/htmlnotice/htmlnotice.go
index 78371ee599..6d07e66b30 100644
--- a/tools/compliance/cmd/htmlnotice/htmlnotice.go
+++ b/tools/compliance/cmd/htmlnotice/htmlnotice.go
@@ -241,6 +241,17 @@ func htmlNotice(ctx *context, files ...string) error {
 		fmt.Fprintf(ctx.stdout, "  <h1>%s</h1>\n", html.EscapeString(ctx.product))
 	}
 	ids := make(map[string]string)
+
+	// MD5 hash of File build/soong/licenses/opensourcerequest
+	opensourcerequestHash := "67459f64e6325b6ffaa3e53946688e6f"
+	opensourcerequestNotice := false
+	for h := range ni.Hashes() {
+		if h.String() == opensourcerequestHash {
+			opensourcerequestNotice = true
+			break
+		}
+	}
+
 	if ctx.includeTOC {
 		fmt.Fprintln(ctx.stdout, "  <ul class=\"toc\">")
 		i := 0
@@ -250,6 +261,9 @@ func htmlNotice(ctx *context, files ...string) error {
 			ids[installPath] = id
 			fmt.Fprintf(ctx.stdout, "    <li id=\"%s\"><strong>%s</strong>\n      <ul>\n", id, html.EscapeString(ctx.strip(installPath)))
 			for _, h := range ni.InstallHashes(installPath) {
+				if h.String() == opensourcerequestHash {
+					continue
+				}
 				libs := ni.InstallHashLibs(installPath, h)
 				fmt.Fprintf(ctx.stdout, "        <li><a href=\"#%s\">%s</a>\n", h.String(), html.EscapeString(strings.Join(libs, ", ")))
 			}
@@ -257,7 +271,15 @@ func htmlNotice(ctx *context, files ...string) error {
 		}
 		fmt.Fprintln(ctx.stdout, "  </ul><!-- toc -->")
 	}
+
+	if opensourcerequestNotice {
+		fmt.Fprintln(ctx.stdout, "  <hr>")
+		fmt.Fprintln(ctx.stdout, "  <strong>", html.EscapeString(string(ni.HashTextOfMd5(opensourcerequestHash))), "</strong>")
+	}
 	for h := range ni.Hashes() {
+		if h.String() == opensourcerequestHash {
+			continue
+		}
 		fmt.Fprintln(ctx.stdout, "  <hr>")
 		for _, libName := range ni.HashLibs(h) {
 			fmt.Fprintf(ctx.stdout, "  <strong>%s</strong> used by:\n    <ul class=\"file-list\">\n", html.EscapeString(libName))
diff --git a/tools/compliance/noticeindex.go b/tools/compliance/noticeindex.go
index c91a8dfa32..378dd23429 100644
--- a/tools/compliance/noticeindex.go
+++ b/tools/compliance/noticeindex.go
@@ -232,7 +232,7 @@ func (ni *NoticeIndex) Hashes() chan hash {
 // InputFiles returns the complete list of files read during indexing.
 func (ni *NoticeIndex) InputFiles() []string {
 	projectMeta := ni.pmix.AllMetadataFiles()
-	files := make([]string, 0, len(ni.files) + len(ni.lg.targets) + len(projectMeta))
+	files := make([]string, 0, len(ni.files)+len(ni.lg.targets)+len(projectMeta))
 	files = append(files, ni.files...)
 	for f := range ni.lg.targets {
 		files = append(files, f)
@@ -325,6 +325,11 @@ func (ni *NoticeIndex) HashText(h hash) []byte {
 	return ni.text[h]
 }
 
+func (ni *NoticeIndex) HashTextOfMd5(s string) []byte {
+	h := hash{key: s}
+	return ni.text[h]
+}
+
 // getLibName returns the name of the library associated with `noticeFor`.
 func (ni *NoticeIndex) getLibName(noticeFor *TargetNode, h hash) (string, error) {
 	for _, text := range noticeFor.LicenseTexts() {