Merge ""master" was renamed "main"." into main (b087a045) · Commits · e / os / android_build_soong

README.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -603,7 +603,7 @@ ANDROID_BUILD_ENVIRONMENT_CONFIG_DIR=build/soong \
		* [Build Performance](docs/perf.md)
		* [Generating CLion Projects](docs/clion.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

android/api_levels.go

+3 −3

Original line number	Diff line number	Diff line
		@@ -336,7 +336,7 @@ func ApiLevelFromUser(ctx PathContext, raw string) (ApiLevel, error) {
		// ApiLevelFromUser for more details.
		func ApiLevelFromUserWithConfig(config Config, raw string) (ApiLevel, error) {
		// 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 == "" {
		panic("API level string must be non-empty")
		}
		@@ -449,7 +449,7 @@ func getFinalCodenamesMap(config Config) (map[string]int, error) {
		err error
		}
		// 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{} {
		apiLevelsMap, err := getApiLevelsMapReleasedVersions()

		@@ -482,7 +482,7 @@ func GetApiLevelsMap(config Config) (map[string]int, error) {
		err error
		}
		// 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{} {
		apiLevelsMap, err := getApiLevelsMapReleasedVersions()
		if err == nil {

android/module.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -326,7 +326,7 @@ type commonProperties struct {
		// defaults module, use the `defaults_visibility` property on the defaults 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.
		Visibility []string

bp2build/build_conversion.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -446,7 +446,7 @@ func prettyPrint(propertyValue reflect.Value, indent int, emitZeroValues bool) (
		if !emitZeroValues && isZero(propertyValue) {
		// 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
		// 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
		// value>)" to set the default value of unset attributes. In the cases

cc/kernel_headers.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ func (stub *kernelHeadersDecorator) link(ctx ModuleContext, flags Flags, deps Pa
		// kernel_headers retrieves the list of kernel headers directories from
		// TARGET_BOARD_KERNEL_HEADERS and TARGET_PRODUCT_KERNEL_HEADERS variables in
		// 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.
		func kernelHeadersFactory() android.Module {
		module, library := NewLibrary(android.HostAndDeviceSupported)