Merge changes I406c5bef,Ibde685d7,I1c09412d,I9bec563c,I34f06abd into pi-dev (7921d2d2) · Commits · e / os / android_build_soong

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@ bootstrap_go_package {
		"android/config_test.go",
		"android/expand_test.go",
		"android/namespace_test.go",
		"android/neverallow_test.go",
		"android/paths_test.go",
		"android/prebuilt_test.go",
		"android/util_test.go",

android/namespace_test.go

+1 −10

Original line number	Diff line number	Diff line
		@@ -628,7 +628,7 @@ func setupTestExpectErrs(bps map[string]string) (ctx *TestContext, errs []error)

		func setupTest(t testing.T, bps map[string]string) (ctx TestContext) {
		ctx, errs := setupTestExpectErrs(bps)
		failIfErrored(t, errs)
		FailIfErrored(t, errs)
		return ctx
		}

		@@ -692,12 +692,3 @@ func newTestModule() Module {
		InitAndroidModule(m)
		return m
		}

		func failIfErrored(t *testing.T, errs []error) {
		if len(errs) > 0 {
		for _, err := range errs {
		t.Error(err)
		}
		t.FailNow()
		}
		}

android/neverallow.go

+8 −2

Original line number	Diff line number	Diff line
		@@ -46,9 +46,15 @@ func registerNeverallowMutator(ctx RegisterMutatorsContext) {
		}

		var neverallows = []*rule{
		neverallow().in("vendor", "device").with("vndk.enabled", "true").
		neverallow().
		in("vendor", "device").
		with("vndk.enabled", "true").
		without("vendor", "true").
		because("the VNDK can never contain a library that is device dependent."),
		neverallow().with("vndk.enabled", "true").without("owner", "").
		neverallow().
		with("vndk.enabled", "true").
		without("vendor", "true").
		without("owner", "").
		because("a VNDK module can never have an owner."),
		neverallow().notIn("libcore").with("no_standard_libs", "true"),

android/neverallow_test.go

0 → 100644

+217 −0

Original line number	Diff line number	Diff line
		// Copyright 2018 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 android

		import (
		"io/ioutil"
		"os"
		"testing"
		)

		var neverallowTests = []struct {
		name string
		fs map[string][]byte
		expectedError string
		}{
		{
		name: "no vndk.enabled under vendor directory",
		fs: map[string][]byte{
		"vendor/Blueprints": []byte(`
		cc_library {
		name: "libvndk",
		vendor_available: true,
		vndk: {
		enabled: true,
		},
		}`),
		},
		expectedError: "VNDK can never contain a library that is device dependent",
		},
		{
		name: "no vndk.enabled under device directory",
		fs: map[string][]byte{
		"device/Blueprints": []byte(`
		cc_library {
		name: "libvndk",
		vendor_available: true,
		vndk: {
		enabled: true,
		},
		}`),
		},
		expectedError: "VNDK can never contain a library that is device dependent",
		},
		{
		name: "vndk-ext under vendor or device directory",
		fs: map[string][]byte{
		"device/Blueprints": []byte(`
		cc_library {
		name: "libvndk1_ext",
		vendor: true,
		vndk: {
		enabled: true,
		},
		}`),
		"vendor/Blueprints": []byte(`
		cc_library {
		name: "libvndk2_ext",
		vendor: true,
		vndk: {
		enabled: true,
		},
		}`),
		},
		expectedError: "",
		},

		{
		name: "no enforce_vintf_manifest.cflags",
		fs: map[string][]byte{
		"Blueprints": []byte(`
		cc_library {
		name: "libexample",
		product_variables: {
		enforce_vintf_manifest: {
		cflags: ["-DSHOULD_NOT_EXIST"],
		},
		},
		}`),
		},
		expectedError: "manifest enforcement should be independent",
		},
		{
		name: "libhidltransport enforce_vintf_manifest.cflags",
		fs: map[string][]byte{
		"Blueprints": []byte(`
		cc_library {
		name: "libhidltransport",
		product_variables: {
		enforce_vintf_manifest: {
		cflags: ["-DSHOULD_NOT_EXIST"],
		},
		},
		}`),
		},
		expectedError: "",
		},

		{
		name: "no treble_linker_namespaces.cflags",
		fs: map[string][]byte{
		"Blueprints": []byte(`
		cc_library {
		name: "libexample",
		product_variables: {
		treble_linker_namespaces: {
		cflags: ["-DSHOULD_NOT_EXIST"],
		},
		},
		}`),
		},
		expectedError: "nothing should care if linker namespaces are enabled or not",
		},
		{
		name: "libc_bionic_ndk treble_linker_namespaces.cflags",
		fs: map[string][]byte{
		"Blueprints": []byte(`
		cc_library {
		name: "libc_bionic_ndk",
		product_variables: {
		treble_linker_namespaces: {
		cflags: ["-DSHOULD_NOT_EXIST"],
		},
		},
		}`),
		},
		expectedError: "",
		},
		}

		func TestNeverallow(t *testing.T) {
		buildDir, err := ioutil.TempDir("", "soong_neverallow_test")
		if err != nil {
		t.Fatal(err)
		}
		defer os.RemoveAll(buildDir)

		config := TestConfig(buildDir, nil)

		for _, test := range neverallowTests {
		t.Run(test.name, func(t *testing.T) {
		_, errs := testNeverallow(t, config, test.fs)

		if test.expectedError == "" {
		FailIfErrored(t, errs)
		} else {
		FailIfNoMatchingErrors(t, test.expectedError, errs)
		}
		})
		}
		}

		func testNeverallow(t testing.T, config Config, fs map[string][]byte) (TestContext, []error) {
		ctx := NewTestContext()
		ctx.RegisterModuleType("cc_library", ModuleFactoryAdaptor(newMockCcLibraryModule))
		ctx.PostDepsMutators(registerNeverallowMutator)
		ctx.Register()

		ctx.MockFileSystem(fs)

		_, errs := ctx.ParseBlueprintsFiles("Blueprints")
		if len(errs) > 0 {
		return ctx, errs
		}

		_, errs = ctx.PrepareBuildActions(config)
		return ctx, errs
		}

		type mockProperties struct {
		Vendor_available *bool

		Vndk struct {
		Enabled *bool
		Support_system_process *bool
		Extends *string
		}

		Product_variables struct {
		Enforce_vintf_manifest struct {
		Cflags []string
		}

		Treble_linker_namespaces struct {
		Cflags []string
		}
		}
		}

		type mockCcLibraryModule struct {
		ModuleBase
		properties mockProperties
		}

		func newMockCcLibraryModule() Module {
		m := &mockCcLibraryModule{}
		m.AddProperties(&m.properties)
		InitAndroidModule(m)
		return m
		}

		func (p *mockCcLibraryModule) DepsMutator(ctx BottomUpMutatorContext) {
		}

		func (p *mockCcLibraryModule) GenerateAndroidBuildActions(ModuleContext) {
		}

android/prebuilt_test.go

+2 −11

Original line number	Diff line number	Diff line
		@@ -138,9 +138,9 @@ func TestPrebuilts(t *testing.T) {
		})

		_, errs := ctx.ParseBlueprintsFiles("Blueprints")
		fail(t, errs)
		FailIfErrored(t, errs)
		_, errs = ctx.PrepareBuildActions(config)
		fail(t, errs)
		FailIfErrored(t, errs)

		foo := ctx.ModuleForTests("foo", "")

		@@ -231,12 +231,3 @@ func (s *sourceModule) DepsMutator(ctx BottomUpMutatorContext) {

		func (s *sourceModule) GenerateAndroidBuildActions(ctx ModuleContext) {
		}

		func fail(t *testing.T, errs []error) {
		if len(errs) > 0 {
		for _, err := range errs {
		t.Error(err)
		}
		t.FailNow()
		}
		}