Merge "Remove obsolete notice property." (0ea404eb) · Commits · e / os / android_build_soong

android/androidmk.go

+0 −4

Original line number	Diff line number	Diff line
		@@ -604,10 +604,6 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint
		}
		}

		if len(base.noticeFiles) > 0 {
		a.AddStrings("LOCAL_NOTICE_FILE", strings.Join(base.noticeFiles.Strings(), " "))
		}

		if host {
		makeOs := base.Os().String()
		if base.Os() == Linux \|\| base.Os() == LinuxBionic \|\| base.Os() == LinuxMusl {

android/module.go

+0 −22

Original line number	Diff line number	Diff line
		@@ -515,7 +515,6 @@ type Module interface {
		ExportedToMake() bool
		InitRc() Paths
		VintfFragments() Paths
		NoticeFiles() Paths
		EffectiveLicenseFiles() Paths

		AddProperties(props ...interface{})
		@@ -831,9 +830,6 @@ type commonProperties struct {
		// names of other modules to install on target if this module is installed
		Target_required []string `android:"arch_variant"`

		// relative path to a file to include in the list of notices for the device
		Notice *string `android:"path"`

		// The OsType of artifacts that this module variant is responsible for creating.
		//
		// Set by osMutator
		@@ -1423,7 +1419,6 @@ type ModuleBase struct {
		checkbuildFiles Paths
		packagingSpecs []PackagingSpec
		packagingSpecsDepSet *packagingSpecsDepSet
		noticeFiles Paths
		// katiInstalls tracks the install rules that were created by Soong but are being exported
		// to Make to convert to ninja rules so that Make can add additional dependencies.
		katiInstalls katiInstalls
		@@ -2054,10 +2049,6 @@ func (m *ModuleBase) Owner() string {
		return String(m.commonProperties.Owner)
		}

		func (m *ModuleBase) NoticeFiles() Paths {
		return m.noticeFiles
		}

		func (m *ModuleBase) setImageVariation(variant string) {
		m.commonProperties.ImageVariation = variant
		}
		@@ -2317,19 +2308,6 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext)
		}
		})

		m.noticeFiles = make([]Path, 0)
		optPath := OptionalPath{}
		notice := proptools.StringDefault(m.commonProperties.Notice, "")
		if module := SrcIsModule(notice); module != "" {
		optPath = ctx.ExpandOptionalSource(&notice, "notice")
		} else if notice != "" {
		noticePath := filepath.Join(ctx.ModuleDir(), notice)
		optPath = ExistentPathForSource(ctx, noticePath)
		}
		if optPath.Valid() {
		m.noticeFiles = append(m.noticeFiles, optPath.Path())
		}

		licensesPropertyFlattener(ctx)
		if ctx.Failed() {
		return

android/neverallow.go

+0 −10

Original line number	Diff line number	Diff line
		@@ -58,7 +58,6 @@ func init() {
		AddNeverAllowRules(createMakefileGoalRules()...)
		AddNeverAllowRules(createInitFirstStageRules()...)
		AddNeverAllowRules(createProhibitFrameworkAccessRules()...)
		AddNeverAllowRules(createNoticeDeprecationRules()...)
		}

		// Add a NeverAllow rule to the set of rules to apply.
		@@ -239,15 +238,6 @@ func createProhibitFrameworkAccessRules() []Rule {
		}
		}

		func createNoticeDeprecationRules() []Rule {
		return []Rule{
		NeverAllow().
		WithMatcher("notice", isSetMatcherInstance).
		NotIn("vendor/linaro/linux-firmware/").
		Because("notice has been replaced by licenses/default_applicable_licenses"),
		}
		}

		func neverallowMutator(ctx BottomUpMutatorContext) {
		m, ok := ctx.Module().(Module)
		if !ok {

apex/androidmk.go

+0 −4

Original line number	Diff line number	Diff line
		@@ -168,10 +168,6 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
		if len(newDataPaths) > 0 {
		fmt.Fprintln(w, "LOCAL_TEST_DATA :=", strings.Join(android.AndroidMkDataPaths(newDataPaths), " "))
		}

		if fi.module != nil && len(fi.module.NoticeFiles()) > 0 {
		fmt.Fprintln(w, "LOCAL_NOTICE_FILE :=", strings.Join(fi.module.NoticeFiles().Strings(), " "))
		}
		} else {
		modulePath = pathWhenActivated
		fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", pathWhenActivated)

apex/apex_test.go

+0 −2

Original line number	Diff line number	Diff line
		@@ -443,7 +443,6 @@ func TestBasicApex(t *testing.T) {
		srcs: ["mylib.cpp"],
		system_shared_libs: [],
		stl: "none",
		notice: "custom_notice",
		static_libs: ["libstatic"],
		// TODO: remove //apex_available:platform
		apex_available: [
		@@ -467,7 +466,6 @@ func TestBasicApex(t *testing.T) {
		srcs: ["mylib.cpp"],
		system_shared_libs: [],
		stl: "none",
		notice: "custom_notice_for_static_lib",
		// TODO: remove //apex_available:platform
		apex_available: [
		"//apex_available:platform",