Make change and version bump to BP2A.250304.001 (a93e246a) · 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.250303.001
		BUILD_ID=BP2A.250304.001

core/cxx_stl_setup.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
		my_static_libraries += libc++demangle

		ifeq ($(my_link_type),static)
		my_static_libraries += libm libc libunwind
		my_static_libraries += libm libc libunwind libstatic_rustlibs_for_make
		endif
		endif
		else ifeq ($(my_cxx_stl),ndk)

core/soong_config.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -489,6 +489,7 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse)
		$(call add_json_list, AbOtaPartitions, $(AB_OTA_PARTITIONS))
		$(call add_json_list, AbOtaKeys, $(PRODUCT_OTA_PUBLIC_KEYS))
		$(call add_json_list, AbOtaPostInstallConfig, $(AB_OTA_POSTINSTALL_CONFIG))
		$(call add_json_bool, BoardSuperImageInUpdatePackage, $(filter true,$(BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE)))

		# Avb (android verified boot) stuff
		$(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))
		@@ -569,6 +570,9 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse)

		$(call add_json_str, ReleaseToolsExtensionDir, $(firstword $(TARGET_RELEASETOOLS_EXTENSIONS) $($(TARGET_DEVICE_DIR)/../common)))

		# Fastboot
		$(call add_json_str, BoardFastbootInfoFile, $(TARGET_BOARD_FASTBOOT_INFO_FILE))

		$(call end_json_map)

		# For converting vintf_data

tools/compliance/Android.bp

+0 −26

Original line number	Diff line number	Diff line
		@@ -38,16 +38,6 @@ blueprint_go_binary {
		testSrcs: ["cmd/checkshare/checkshare_test.go"],
		}

		blueprint_go_binary {
		name: "compliancenotice_bom",
		srcs: ["cmd/bom/bom.go"],
		deps: [
		"compliance-module",
		"soong-response",
		],
		testSrcs: ["cmd/bom/bom_test.go"],
		}

		blueprint_go_binary {
		name: "compliancenotice_shippedlibs",
		srcs: ["cmd/shippedlibs/shippedlibs.go"],
		@@ -131,22 +121,6 @@ blueprint_go_binary {
		testSrcs: ["cmd/xmlnotice/xmlnotice_test.go"],
		}

		blueprint_go_binary {
		name: "compliance_sbom",
		srcs: ["cmd/sbom/sbom.go"],
		deps: [
		"compliance-module",
		"blueprint-deptools",
		"soong-response",
		"spdx-tools-spdxv2_2",
		"spdx-tools-builder2v2",
		"spdx-tools-spdxcommon",
		"spdx-tools-spdx-json",
		"spdx-tools-spdxlib",
		],
		testSrcs: ["cmd/sbom/sbom_test.go"],
		}

		bootstrap_go_package {
		name: "compliance-module",
		srcs: [

tools/compliance/cmd/bom/bom.go

deleted100644 → 0

+0 −189

Original line number	Diff line number	Diff line
		// Copyright 2021 Google LLC
		//
		// 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.

		package main

		import (
		"bytes"
		"flag"
		"fmt"
		"io"
		"io/fs"
		"os"
		"path/filepath"
		"strings"

		"android/soong/response"
		"android/soong/tools/compliance"
		)

		var (
		failNoneRequested = fmt.Errorf("\nNo license metadata files requested")
		failNoLicenses = fmt.Errorf("No licenses found")
		)

		type context struct {
		stdout io.Writer
		stderr io.Writer
		rootFS fs.FS
		stripPrefix []string
		}

		func (ctx context) strip(installPath string) string {
		for _, prefix := range ctx.stripPrefix {
		if strings.HasPrefix(installPath, prefix) {
		p := strings.TrimPrefix(installPath, prefix)
		if 0 == len(p) {
		continue
		}
		return p
		}
		}
		return installPath
		}

		// 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 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 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
		if *outputFile != "-" {
		ofile = &bytes.Buffer{}
		}

		ctx := &context{ofile, os.Stderr, compliance.FS, *stripPrefix}

		err := billOfMaterials(ctx, flags.Args()...)
		if err != nil {
		if err == failNoneRequested {
		flags.Usage()
		}
		fmt.Fprintf(os.Stderr, "%s\n", err.Error())
		os.Exit(1)
		}
		if *outputFile != "-" {
		err := os.WriteFile(outputFile, ofile.(bytes.Buffer).Bytes(), 0666)
		if err != nil {
		fmt.Fprintf(os.Stderr, "could not write output to %q: %s\n", *outputFile, err)
		os.Exit(1)
		}
		}
		os.Exit(0)
		}

		// billOfMaterials implements the bom utility.
		func billOfMaterials(ctx *context, files ...string) error {
		// Must be at least one root file.
		if len(files) < 1 {
		return failNoneRequested
		}

		// Read the license graph from the license metadata files (*.meta_lic).
		licenseGraph, err := compliance.ReadLicenseGraph(ctx.rootFS, ctx.stderr, files)
		if err != nil {
		return fmt.Errorf("Unable to read license metadata file(s) %q: %v\n", files, err)
		}
		if licenseGraph == nil {
		return failNoLicenses
		}

		// rs contains all notice resolutions.
		rs := compliance.ResolveNotices(licenseGraph)

		ni, err := compliance.IndexLicenseTexts(ctx.rootFS, licenseGraph, rs)
		if err != nil {
		return fmt.Errorf("Unable to read license text file(s) for %q: %v\n", files, err)
		}

		for path := range ni.InstallPaths() {
		fmt.Fprintln(ctx.stdout, ctx.strip(path))
		}
		return nil
		}