Merge branch '2990-t-blueprint' into 'v1-t' (a9a9225e) · Commits · e / os / android_build_soong

android/config.go

+0 −4

Original line number	Diff line number	Diff line
		@@ -1490,10 +1490,6 @@ func (c *config) ProductPrivateSepolicyDirs() []string {
		return c.productVariables.ProductPrivateSepolicyDirs
		}

		func (c *config) MissingUsesLibraries() []string {
		return c.productVariables.MissingUsesLibraries
		}

		func (c *deviceConfig) DeviceArch() string {
		return String(c.config.productVariables.DeviceArch)
		}

android/fixture.go

+12 −0

Original line number	Diff line number	Diff line
		@@ -586,6 +586,18 @@ func FixtureExpectsAllErrorsToMatchAPattern(patterns []string) FixtureErrorHandl
		})
		}

		// FixtureExpectsOneErrorPattern returns an error handler that will cause the test to fail
		// if there is more than one error or the error does not match the pattern.
		//
		// If the test fails this handler will call `result.FailNow()` which will exit the goroutine within
		// which the test is being run which means that the RunTest() method will not return.
		func FixtureExpectsOneErrorPattern(pattern string) FixtureErrorHandler {
		return FixtureCustomErrorHandler(func(t testing.T, result TestResult) {
		t.Helper()
		CheckErrorsAgainstExpectations(t, result.Errs, []string{pattern})
		})
		}

		// FixtureCustomErrorHandler creates a custom error handler
		func FixtureCustomErrorHandler(function func(t testing.T, result TestResult)) FixtureErrorHandler {
		return simpleErrorHandler{

android/variable.go

+0 −2

Original line number	Diff line number	Diff line
		@@ -417,8 +417,6 @@ type productVariables struct {

		TargetFSConfigGen []string `json:",omitempty"`

		MissingUsesLibraries []string `json:",omitempty"`

		EnforceProductPartitionInterface *bool `json:",omitempty"`

		EnforceInterPartitionJavaSdkLibrary *bool `json:",omitempty"`

etc/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -14,10 +14,12 @@ bootstrap_go_package {
		srcs: [
		"prebuilt_etc.go",
		"snapshot_etc.go",
		"install_symlink.go",
		],
		testSrcs: [
		"prebuilt_etc_test.go",
		"snapshot_etc_test.go",
		"install_symlink_test.go",
		],
		pluginFor: ["soong_build"],
		}

etc/install_symlink.go

0 → 100644

+92 −0

Original line number	Diff line number	Diff line
		// Copyright 2023 Google Inc. All rights reserved.
		//
		// 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 etc

		import (
		"android/soong/android"
		"path/filepath"
		"strings"
		)

		func init() {
		RegisterInstallSymlinkBuildComponents(android.InitRegistrationContext)
		}

		func RegisterInstallSymlinkBuildComponents(ctx android.RegistrationContext) {
		ctx.RegisterModuleType("install_symlink", InstallSymlinkFactory)
		}

		// install_symlink can be used to install an symlink with an arbitrary target to an arbitrary path
		// on the device.
		func InstallSymlinkFactory() android.Module {
		module := &InstallSymlink{}
		module.AddProperties(&module.properties)
		android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)
		return module
		}

		type InstallSymlinkProperties struct {
		// Where to install this symlink, relative to the partition it's installed on.
		// Which partition it's installed on can be controlled by the vendor, system_ext, ramdisk, etc.
		// properties.
		Installed_location string
		// The target of the symlink, aka where the symlink points.
		Symlink_target string
		}

		type InstallSymlink struct {
		android.ModuleBase
		properties InstallSymlinkProperties

		output android.Path
		installedPath android.InstallPath
		}

		func (m *InstallSymlink) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		if filepath.Clean(m.properties.Symlink_target) != m.properties.Symlink_target {
		ctx.PropertyErrorf("symlink_target", "Should be a clean filepath")
		return
		}
		if filepath.Clean(m.properties.Installed_location) != m.properties.Installed_location {
		ctx.PropertyErrorf("installed_location", "Should be a clean filepath")
		return
		}
		if strings.HasPrefix(m.properties.Installed_location, "../") \|\| strings.HasPrefix(m.properties.Installed_location, "/") {
		ctx.PropertyErrorf("installed_location", "Should not start with / or ../")
		return
		}

		out := android.PathForModuleOut(ctx, "out.txt")
		android.WriteFileRule(ctx, out, "")
		m.output = out

		name := filepath.Base(m.properties.Installed_location)
		installDir := android.PathForModuleInstall(ctx, filepath.Dir(m.properties.Installed_location))
		m.installedPath = ctx.InstallAbsoluteSymlink(installDir, name, m.properties.Symlink_target)
		}

		func (m *InstallSymlink) AndroidMkEntries() []android.AndroidMkEntries {
		return []android.AndroidMkEntries{{
		Class: "FAKE",
		// Need at least one output file in order for this to take effect.
		OutputFile: android.OptionalPathForPath(m.output),
		Include: "$(BUILD_PHONY_PACKAGE)",
		ExtraEntries: []android.AndroidMkExtraEntriesFunc{
		func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
		entries.AddStrings("LOCAL_SOONG_INSTALL_SYMLINKS", m.installedPath.String())
		},
		},
		}}
		}