StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"master" was renamed "main".

Browse Source 
Test: N/A
Change-Id: I86d5578eaac260e55a9583db7ab49812b4ba1f5d
This commit is contained in:
Elliott Hughes
2024-01-09 22:02:03 +00:00
parent 539b46b6bd
commit 10363161e7
19 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -603,7 +603,7 @@ ANDROID_BUILD_ENVIRONMENT_CONFIG_DIR=build/soong \
* [Build Performance](docs/perf.md) * [Build Performance](docs/perf.md)
* [Generating CLion Projects](docs/clion.md) * [Generating CLion Projects](docs/clion.md)
* [Generating YouCompleteMe/VSCode compile\_commands.json file](docs/compdb.md) * [Generating YouCompleteMe/VSCode compile\_commands.json file](docs/compdb.md)
* Make-specific documentation: [build/make/README.md](https://android.googlesource.com/platform/build/+/master/README.md) * Make-specific documentation: [build/make/README.md](https://android.googlesource.com/platform/build/+/main/README.md)
## Developing for Soong ## Developing for Soong

6
android/api_levels.go
View File

@@ -336,7 +336,7 @@ func ApiLevelFromUser(ctx PathContext, raw string) (ApiLevel, error) {
// ApiLevelFromUser for more details. // ApiLevelFromUser for more details.
func ApiLevelFromUserWithConfig(config Config, raw string) (ApiLevel, error) { func ApiLevelFromUserWithConfig(config Config, raw string) (ApiLevel, error) {
// This logic is replicated in starlark, if changing logic here update starlark code too // This logic is replicated in starlark, if changing logic here update starlark code too
// https://cs.android.com/android/platform/superproject/+/master:build/bazel/rules/common/api.bzl;l=42;drc=231c7e8c8038fd478a79eb68aa5b9f5c64e0e061 // https://cs.android.com/android/platform/superproject/+/main:build/bazel/rules/common/api.bzl;l=42;drc=231c7e8c8038fd478a79eb68aa5b9f5c64e0e061
if raw == "" { if raw == "" {
panic("API level string must be non-empty") panic("API level string must be non-empty")
} }
@@ -449,7 +449,7 @@ func getFinalCodenamesMap(config Config) (map[string]int, error) {
err error err error
} }
// This logic is replicated in starlark, if changing logic here update starlark code too // This logic is replicated in starlark, if changing logic here update starlark code too
// https://cs.android.com/android/platform/superproject/+/master:build/bazel/rules/common/api.bzl;l=30;drc=231c7e8c8038fd478a79eb68aa5b9f5c64e0e061 // https://cs.android.com/android/platform/superproject/+/main:build/bazel/rules/common/api.bzl;l=30;drc=231c7e8c8038fd478a79eb68aa5b9f5c64e0e061
result := config.Once(finalCodenamesMapKey, func() interface{} { result := config.Once(finalCodenamesMapKey, func() interface{} {
apiLevelsMap, err := getApiLevelsMapReleasedVersions() apiLevelsMap, err := getApiLevelsMapReleasedVersions()
@@ -482,7 +482,7 @@ func GetApiLevelsMap(config Config) (map[string]int, error) {
err error err error
} }
// This logic is replicated in starlark, if changing logic here update starlark code too // This logic is replicated in starlark, if changing logic here update starlark code too
// https://cs.android.com/android/platform/superproject/+/master:build/bazel/rules/common/api.bzl;l=23;drc=231c7e8c8038fd478a79eb68aa5b9f5c64e0e061 // https://cs.android.com/android/platform/superproject/+/main:build/bazel/rules/common/api.bzl;l=23;drc=231c7e8c8038fd478a79eb68aa5b9f5c64e0e061
result := config.Once(apiLevelsMapKey, func() interface{} { result := config.Once(apiLevelsMapKey, func() interface{} {
apiLevelsMap, err := getApiLevelsMapReleasedVersions() apiLevelsMap, err := getApiLevelsMapReleasedVersions()
if err == nil { if err == nil {

2
android/module.go
View File

@@ -326,7 +326,7 @@ type commonProperties struct {
// defaults module, use the `defaults_visibility` property on the defaults module; // defaults module, use the `defaults_visibility` property on the defaults module;
// not to be confused with the `default_visibility` property on the package module. // not to be confused with the `default_visibility` property on the package module.
// //
// See https://android.googlesource.com/platform/build/soong/+/master/README.md#visibility for // See https://android.googlesource.com/platform/build/soong/+/main/README.md#visibility for
// more details. // more details.
Visibility []string Visibility []string

2
bp2build/build_conversion.go
View File

@@ -446,7 +446,7 @@ func prettyPrint(propertyValue reflect.Value, indent int, emitZeroValues bool) (
if !emitZeroValues && isZero(propertyValue) { if !emitZeroValues && isZero(propertyValue) {
// A property value being set or unset actually matters -- Soong does set default // A property value being set or unset actually matters -- Soong does set default
// values for unset properties, like system_shared_libs = ["libc", "libm", "libdl"] at // values for unset properties, like system_shared_libs = ["libc", "libm", "libdl"] at
// https://cs.android.com/android/platform/superproject/+/master:build/soong/cc/linker.go;l=281-287;drc=f70926eef0b9b57faf04c17a1062ce50d209e480 // https://cs.android.com/android/platform/superproject/+/main:build/soong/cc/linker.go;l=281-287;drc=f70926eef0b9b57faf04c17a1062ce50d209e480
// //
// In Bazel-parlance, we would use "attr.<type>(default = <default // In Bazel-parlance, we would use "attr.<type>(default = <default
// value>)" to set the default value of unset attributes. In the cases // value>)" to set the default value of unset attributes. In the cases

2
cc/kernel_headers.go
View File

@@ -34,7 +34,7 @@ func (stub *kernelHeadersDecorator) link(ctx ModuleContext, flags Flags, deps Pa
// kernel_headers retrieves the list of kernel headers directories from // kernel_headers retrieves the list of kernel headers directories from
// TARGET_BOARD_KERNEL_HEADERS and TARGET_PRODUCT_KERNEL_HEADERS variables in // TARGET_BOARD_KERNEL_HEADERS and TARGET_PRODUCT_KERNEL_HEADERS variables in
// a makefile for compilation. See // a makefile for compilation. See
// https://android.googlesource.com/platform/build/+/master/core/config.mk // https://android.googlesource.com/platform/build/+/main/core/config.mk
// for more details on them. // for more details on them.
func kernelHeadersFactory() android.Module { func kernelHeadersFactory() android.Module {
module, library := NewLibrary(android.HostAndDeviceSupported) module, library := NewLibrary(android.HostAndDeviceSupported)

2
cc/library.go
View File

@@ -1419,7 +1419,7 @@ func (library *libraryDecorator) sourceAbiDiff(ctx android.ModuleContext, refere
func (library *libraryDecorator) crossVersionAbiDiff(ctx android.ModuleContext, referenceDump android.Path, func (library *libraryDecorator) crossVersionAbiDiff(ctx android.ModuleContext, referenceDump android.Path,
baseName string, isLlndkOrNdk bool, sourceVersion, prevVersion string) { baseName string, isLlndkOrNdk bool, sourceVersion, prevVersion string) {
errorMessage := "error: Please follow https://android.googlesource.com/platform/development/+/master/vndk/tools/header-checker/README.md#configure-cross_version-abi-check to resolve the ABI difference between your source code and version " + prevVersion + "." errorMessage := "error: Please follow https://android.googlesource.com/platform/development/+/main/vndk/tools/header-checker/README.md#configure-cross_version-abi-check to resolve the ABI difference between your source code and version " + prevVersion + "."
library.sourceAbiDiff(ctx, referenceDump, baseName, prevVersion, library.sourceAbiDiff(ctx, referenceDump, baseName, prevVersion,
isLlndkOrNdk, true /* allowExtensions */, sourceVersion, errorMessage) isLlndkOrNdk, true /* allowExtensions */, sourceVersion, errorMessage)

4
cc/ndk_headers.go
View File

@@ -182,7 +182,7 @@ type versionedHeaderProperties struct {
} }
// Like ndk_headers, but preprocesses the headers with the bionic versioner: // Like ndk_headers, but preprocesses the headers with the bionic versioner:
// https://android.googlesource.com/platform/bionic/+/master/tools/versioner/README.md. // https://android.googlesource.com/platform/bionic/+/main/tools/versioner/README.md.
// //
// Unlike ndk_headers, we don't operate on a list of sources but rather a whole directory, the // Unlike ndk_headers, we don't operate on a list of sources but rather a whole directory, the
// module does not have the srcs property, and operates on a full directory (the `from` property). // module does not have the srcs property, and operates on a full directory (the `from` property).
@@ -267,7 +267,7 @@ func processHeadersWithVersioner(ctx android.ModuleContext, srcDir, outDir andro
} }
// versioned_ndk_headers preprocesses the headers with the bionic versioner: // versioned_ndk_headers preprocesses the headers with the bionic versioner:
// https://android.googlesource.com/platform/bionic/+/master/tools/versioner/README.md. // https://android.googlesource.com/platform/bionic/+/main/tools/versioner/README.md.
// Unlike the ndk_headers soong module, versioned_ndk_headers operates on a // Unlike the ndk_headers soong module, versioned_ndk_headers operates on a
// directory level specified in `from` property. This is only used to process // directory level specified in `from` property. This is only used to process
// the bionic/libc/include directory. // the bionic/libc/include directory.

2
cmd/path_interposer/main.go
View File

@@ -140,7 +140,7 @@ func Main(stdout, stderr io.Writer, interposer string, args []string, opts mainO
defer func() { <-waitForLog }() defer func() { <-waitForLog }()
} }
if config.Error { if config.Error {
return 1, fmt.Errorf("%q is not allowed to be used. See https://android.googlesource.com/platform/build/+/master/Changes.md#PATH_Tools for more information.", base) return 1, fmt.Errorf("%q is not allowed to be used. See https://android.googlesource.com/platform/build/+/main/Changes.md#PATH_Tools for more information.", base)
} }
} }

2
cmd/path_interposer/main_test.go
View File

@@ -138,7 +138,7 @@ func TestInterposer(t *testing.T) {
args: []string{"path_interposer_test_not_allowed"}, args: []string{"path_interposer_test_not_allowed"},
exitCode: 1, exitCode: 1,
err: fmt.Errorf(`"path_interposer_test_not_allowed" is not allowed to be used. See https://android.googlesource.com/platform/build/+/master/Changes.md#PATH_Tools for more information.`), err: fmt.Errorf(`"path_interposer_test_not_allowed" is not allowed to be used. See https://android.googlesource.com/platform/build/+/main/Changes.md#PATH_Tools for more information.`),
logEntry: "path_interposer_test_not_allowed", logEntry: "path_interposer_test_not_allowed",
}, },
} }

38
dexpreopt/DEXPREOPT_IMPLEMENTATION.md
View File

@@ -237,22 +237,22 @@ devices contains a superset of uses-library tags of the source manifest of the
app. app.
[make/core/dex_preopt.mk]: https://cs.android.com/android/platform/superproject/+/master:build/make/core/dex_preopt.mk [make/core/dex_preopt.mk]: https://cs.android.com/android/platform/superproject/+/main:build/make/core/dex_preopt.mk
[make/core/dex_preopt_config.mk]: https://cs.android.com/android/platform/superproject/+/master:build/make/core/dex_preopt_config.mk [make/core/dex_preopt_config.mk]: https://cs.android.com/android/platform/superproject/+/main:build/make/core/dex_preopt_config.mk
[make/core/dex_preopt_config_merger.py]: https://cs.android.com/android/platform/superproject/+/master:build/make/core/dex_preopt_config_merger.py [make/core/dex_preopt_config_merger.py]: https://cs.android.com/android/platform/superproject/+/main:build/make/core/dex_preopt_config_merger.py
[make/core/dex_preopt_odex_install.mk]: https://cs.android.com/android/platform/superproject/+/master:build/make/core/dex_preopt_odex_install.mk [make/core/dex_preopt_odex_install.mk]: https://cs.android.com/android/platform/superproject/+/main:build/make/core/dex_preopt_odex_install.mk
[soong/dexpreopt]: https://cs.android.com/android/platform/superproject/+/master:build/soong/dexpreopt [soong/dexpreopt]: https://cs.android.com/android/platform/superproject/+/main:build/soong/dexpreopt
[soong/dexpreopt/class_loader_context.go]: https://cs.android.com/android/platform/superproject/+/master:build/soong/dexpreopt/class_loader_context.go [soong/dexpreopt/class_loader_context.go]: https://cs.android.com/android/platform/superproject/+/main:build/soong/dexpreopt/class_loader_context.go
[soong/dexpreopt/config.go]: https://cs.android.com/android/platform/superproject/+/master:build/soong/dexpreopt/config.go [soong/dexpreopt/config.go]: https://cs.android.com/android/platform/superproject/+/main:build/soong/dexpreopt/config.go
[soong/dexpreopt/dexpreopt.go]: https://cs.android.com/android/platform/superproject/+/master:build/soong/dexpreopt/dexpreopt.go [soong/dexpreopt/dexpreopt.go]: https://cs.android.com/android/platform/superproject/+/main:build/soong/dexpreopt/dexpreopt.go
[soong/java]: https://cs.android.com/android/platform/superproject/+/master:build/soong/java [soong/java]: https://cs.android.com/android/platform/superproject/+/main:build/soong/java
[soong/java/app.go:deps]: https://cs.android.com/android/platform/superproject/+/master:build/soong/java/app.go?q=%22func%20\(u%20*usesLibrary\)%20deps%22 [soong/java/app.go:deps]: https://cs.android.com/android/platform/superproject/+/main:build/soong/java/app.go?q=%22func%20\(u%20*usesLibrary\)%20deps%22
[soong/java/app.go:verifyUsesLibraries]: https://cs.android.com/android/platform/superproject/+/master:build/soong/java/app.go?q=%22func%20\(u%20*usesLibrary\)%20verifyUsesLibraries%22 [soong/java/app.go:verifyUsesLibraries]: https://cs.android.com/android/platform/superproject/+/main:build/soong/java/app.go?q=%22func%20\(u%20*usesLibrary\)%20verifyUsesLibraries%22
[soong/java/bootclasspath_fragment.go]: https://cs.android.com/android/platform/superproject/+/master:build/soong/java/bootclasspath_fragment.go [soong/java/bootclasspath_fragment.go]: https://cs.android.com/android/platform/superproject/+/main:build/soong/java/bootclasspath_fragment.go
[soong/java/dexpreopt.go]: https://cs.android.com/android/platform/superproject/+/master:build/soong/java/dexpreopt.go [soong/java/dexpreopt.go]: https://cs.android.com/android/platform/superproject/+/main:build/soong/java/dexpreopt.go
[soong/java/dexpreopt_bootjars.go]: https://cs.android.com/android/platform/superproject/+/master:build/soong/java/dexpreopt_bootjars.go [soong/java/dexpreopt_bootjars.go]: https://cs.android.com/android/platform/superproject/+/main:build/soong/java/dexpreopt_bootjars.go
[soong/java/dexpreopt_config.go]: https://cs.android.com/android/platform/superproject/+/master:build/soong/java/dexpreopt_config.go [soong/java/dexpreopt_config.go]: https://cs.android.com/android/platform/superproject/+/main:build/soong/java/dexpreopt_config.go
[soong/java/java.go:addCLCFromDep]: https://cs.android.com/android/platform/superproject/+/master:build/soong/java/java.go?q=%22func%20addCLCfromDep%22 [soong/java/java.go:addCLCFromDep]: https://cs.android.com/android/platform/superproject/+/main:build/soong/java/java.go?q=%22func%20addCLCfromDep%22
[soong/java/platform_bootclasspath.go]: https://cs.android.com/android/platform/superproject/+/master:build/soong/java/platform_bootclasspath.go [soong/java/platform_bootclasspath.go]: https://cs.android.com/android/platform/superproject/+/main:build/soong/java/platform_bootclasspath.go
[soong/scripts/construct_context.py]: https://cs.android.com/android/platform/superproject/+/master:build/soong/scripts/construct_context.py [soong/scripts/construct_context.py]: https://cs.android.com/android/platform/superproject/+/main:build/soong/scripts/construct_context.py
[soong/scripts/manifest_check.py]: https://cs.android.com/android/platform/superproject/+/master:build/soong/scripts/manifest_check.py [soong/scripts/manifest_check.py]: https://cs.android.com/android/platform/superproject/+/main:build/soong/scripts/manifest_check.py

4
docs/best_practices.md
View File

@@ -285,6 +285,6 @@ types. Soong plugins are inherently tightly coupled to the build system
and will require ongoing maintenance as the build system is changed; so and will require ongoing maintenance as the build system is changed; so
plugins should be used only when absolutely required. plugins should be used only when absolutely required.
See [art/build/art.go](https://android.googlesource.com/platform/art/+/master/build/art.go) See [art/build/art.go](https://android.googlesource.com/platform/art/+/main/build/art.go)
or [external/llvm/soong/llvm.go](https://android.googlesource.com/platform/external/llvm/+/master/soong/llvm.go) or [external/llvm/soong/llvm.go](https://android.googlesource.com/platform/external/llvm/+/main/soong/llvm.go)
for examples of more complex conditionals on product variables or environment variables. for examples of more complex conditionals on product variables or environment variables.

2
docs/clion.md
View File

@@ -4,7 +4,7 @@ Soong can generate CLion projects. This is intended for source code editing
only. Build should still be done via make/m/mm(a)/mmm(a). only. Build should still be done via make/m/mm(a)/mmm(a).
Note: alternatively, you can use Note: alternatively, you can use
[aidegen to generate a Clion or VSCode project](https://android.googlesource.com/platform/tools/asuite/+/refs/heads/master/aidegen/README.md) [aidegen to generate a Clion or VSCode project](https://android.googlesource.com/platform/tools/asuite/+/refs/heads/main/aidegen/README.md)
with a single command, using the `-i c` flag. with a single command, using the `-i c` flag.
CMakeLists.txt project file generation is enabled via environment variable: CMakeLists.txt project file generation is enabled via environment variable:

4
docs/map_files.md
View File

@@ -5,8 +5,8 @@ map.txt files. These files are [linker version scripts] with comments that are
semantically meaningful to [gen_stub_libs.py]. For an example of a map file, see semantically meaningful to [gen_stub_libs.py]. For an example of a map file, see
[libc.map.txt]. [libc.map.txt].
[gen_stub_libs.py]: https://cs.android.com/android/platform/superproject/+/master:build/soong/cc/gen_stub_libs.py [gen_stub_libs.py]: https://cs.android.com/android/platform/superproject/+/main:build/soong/cc/gen_stub_libs.py
[libc.map.txt]: https://cs.android.com/android/platform/superproject/+/master:bionic/libc/libc.map.txt [libc.map.txt]: https://cs.android.com/android/platform/superproject/+/main:bionic/libc/libc.map.txt
[linker version scripts]: https://www.gnu.org/software/gnulib/manual/html_node/LD-Version-Scripts.html [linker version scripts]: https://www.gnu.org/software/gnulib/manual/html_node/LD-Version-Scripts.html
## Basic format ## Basic format

2
docs/rbe.md
View File

@@ -11,7 +11,7 @@ build actions through a worker pool sharing a central cache of build results.
To enable RBE, you need to set several environment variables before triggering To enable RBE, you need to set several environment variables before triggering
the build. You can set them through a the build. You can set them through a
[environment variables config file](https://android.googlesource.com/platform/build/soong/+/master/README.md#environment-variables-config-file). [environment variables config file](https://android.googlesource.com/platform/build/soong/+/main/README.md#environment-variables-config-file).
As an example, [build/soong/docs/rbe.json](rbe.json) is a config that enables As an example, [build/soong/docs/rbe.json](rbe.json) is a config that enables
RBE in the build. Once the config file is created, you need to let Soong load RBE in the build. Once the config file is created, you need to let Soong load
the config file by specifying `ANDROID_BUILD_ENVIRONMENT_CONFIG_DIR` environment the config file by specifying `ANDROID_BUILD_ENVIRONMENT_CONFIG_DIR` environment

12
docs/tidy.md
View File

@@ -24,7 +24,7 @@ $ WITH_TIDY=1 CLANG_ANALYZER_CHECKS=1 make
``` ```
The default global clang-tidy checks and flags are defined in The default global clang-tidy checks and flags are defined in
[build/soong/cc/config/tidy.go](https://android.googlesource.com/platform/build/soong/+/refs/heads/master/cc/config/tidy.go). [build/soong/cc/config/tidy.go](https://android.googlesource.com/platform/build/soong/+/refs/heads/main/cc/config/tidy.go).
## Module clang-tidy properties ## Module clang-tidy properties
@@ -34,7 +34,7 @@ The global default can be overwritten by module properties in Android.bp.
### `tidy`, `tidy_checks`, and `ALLOW_LOCAL_TIDY_TRUE` ### `tidy`, `tidy_checks`, and `ALLOW_LOCAL_TIDY_TRUE`
For example, in For example, in
[system/bpf/Android.bp](https://android.googlesource.com/platform/system/bpf/+/refs/heads/master/Android.bp), [system/bpf/Android.bp](https://android.googlesource.com/platform/system/bpf/+/refs/heads/main/Android.bp),
clang-tidy is enabled explicitly and with a different check list: clang-tidy is enabled explicitly and with a different check list:
``` ```
cc_defaults { cc_defaults {
@@ -69,7 +69,7 @@ disabled, although `cert-*` is selected.
Some modules might want to disable clang-tidy even when Some modules might want to disable clang-tidy even when
environment variable `WITH_TIDY=1` is set. environment variable `WITH_TIDY=1` is set.
Examples can be found in Examples can be found in
[system/netd/tests/Android.bp](https://android.googlesource.com/platform/system/netd/+/refs/heads/master/tests/Android.bp) [system/netd/tests/Android.bp](https://android.googlesource.com/platform/system/netd/+/refs/heads/main/tests/Android.bp)
``` ```
cc_test { cc_test {
name: "netd_integration_test", name: "netd_integration_test",
@@ -78,7 +78,7 @@ cc_test {
tidy: false, // cuts test build time by almost 1 minute tidy: false, // cuts test build time by almost 1 minute
``` ```
and in and in
[bionic/tests/Android.bp](https://android.googlesource.com/platform/bionic/+/refs/heads/master/tests/Android.bp). [bionic/tests/Android.bp](https://android.googlesource.com/platform/bionic/+/refs/heads/main/tests/Android.bp).
``` ```
cc_test_library { cc_test_library {
name: "fortify_disabled_for_tidy", name: "fortify_disabled_for_tidy",
@@ -97,7 +97,7 @@ The global tidy checks are enabled as warnings.
If a C/C++ module wants to be free of certain clang-tidy warnings, If a C/C++ module wants to be free of certain clang-tidy warnings,
it can chose those checks to be treated as errors. it can chose those checks to be treated as errors.
For example For example
[system/core/libsysutils/Android.bp](https://android.googlesource.com/platform/system/core/+/refs/heads/master/libsysutils/Android.bp) [system/core/libsysutils/Android.bp](https://android.googlesource.com/platform/system/core/+/refs/heads/main/libsysutils/Android.bp)
has enabled clang-tidy explicitly, selected its own tidy checks, has enabled clang-tidy explicitly, selected its own tidy checks,
and set three groups of tidy checks as errors: and set three groups of tidy checks as errors:
``` ```
@@ -130,7 +130,7 @@ to clang-tidy. This usage should now be replaced with the
Some other tidy flags examples are `-format-style=` and `-header-filter=` Some other tidy flags examples are `-format-style=` and `-header-filter=`
For example, in For example, in
[art/odrefresh/Android.bp](https://android.googlesource.com/platform/art/+/refs/heads/master/odrefresh/Android.bp), [art/odrefresh/Android.bp](https://android.googlesource.com/platform/art/+/refs/heads/main/odrefresh/Android.bp),
we found we found
``` ```
cc_defaults { cc_defaults {

2
linkerconfig/linkerconfig.go
View File

@@ -140,7 +140,7 @@ func BuildLinkerConfig(ctx android.ModuleContext, builder *android.RuleBuilder,
// linker_config generates protobuf file from json file. This protobuf file will be used from // linker_config generates protobuf file from json file. This protobuf file will be used from
// linkerconfig while generating ld.config.txt. Format of this file can be found from // linkerconfig while generating ld.config.txt. Format of this file can be found from
// https://android.googlesource.com/platform/system/linkerconfig/+/master/README.md // https://android.googlesource.com/platform/system/linkerconfig/+/main/README.md
func LinkerConfigFactory() android.Module { func LinkerConfigFactory() android.Module {
m := &linkerConfig{} m := &linkerConfig{}
m.AddProperties(&m.properties) m.AddProperties(&m.properties)

2
linkerconfig/proto/linker_config.proto
View File

@@ -16,7 +16,7 @@
// This format file defines configuration file for linkerconfig. Details on this // This format file defines configuration file for linkerconfig. Details on this
// format can be found from // format can be found from
// https://android.googlesource.com/platform/system/linkerconfig/+/master/README.md // https://android.googlesource.com/platform/system/linkerconfig/+/main/README.md
syntax = "proto3"; syntax = "proto3";

2
ui/build/path.go
View File

@@ -180,7 +180,7 @@ func SetupPath(ctx Context, config Config) {
// Compute the error message along with the process tree, including // Compute the error message along with the process tree, including
// parents, for this log line. // parents, for this log line.
procPrints := []string{ procPrints := []string{
"See https://android.googlesource.com/platform/build/+/master/Changes.md#PATH_Tools for more information.", "See https://android.googlesource.com/platform/build/+/main/Changes.md#PATH_Tools for more information.",
} }
if len(log.Parents) > 0 { if len(log.Parents) > 0 {
procPrints = append(procPrints, "Process tree:") procPrints = append(procPrints, "Process tree:")

2
ui/status/ninja_frontend/README
View File

@@ -1,3 +1,3 @@
This comes from https://android.googlesource.com/platform/external/ninja/+/master/src/frontend.proto This comes from https://android.googlesource.com/platform/external/ninja/+/main/src/frontend.proto
The only difference is the specification of a go_package. To regenerate frontend.pb.go, run regen.sh. The only difference is the specification of a go_package. To regenerate frontend.pb.go, run regen.sh.