Merge remote-tracking branch 'origin/lineage-23.0' into a16 (6f82420f) · Commits · e / os / android_build

core/build_id.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

target/product/base_system.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ PRODUCT_PACKAGES += \
		android.test.mock \
		android.test.runner \
		apexd \
		apexd.mainline_patch_level_2 \
		appops \
		app_process \
		appwidget \

target/product/generic/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -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",

tools/compliance/cmd/htmlnotice/htmlnotice.go

+22 −0

Original line number	Diff line number	Diff line
		@@ -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))

tools/compliance/noticeindex.go

+6 −1

Original line number	Diff line number	Diff line
		@@ -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() {