Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3eb2312d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Clean up package names."

parents 0b21bf60 414719e9

android/androidmk.go

+2 −0
Original line number Diff line number Diff line
@@ -505,6 +505,8 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint 
	// TODO(b/151177513): Does this code need to set LOCAL_MODULE_IS_CONTAINER ?

	if amod.commonProperties.Effective_package_name != nil {

		a.SetString("LOCAL_LICENSE_PACKAGE_NAME", *amod.commonProperties.Effective_package_name)

	} else if len(amod.commonProperties.Effective_licenses) > 0 {

		a.SetString("LOCAL_LICENSE_PACKAGE_NAME", strings.Join(amod.commonProperties.Effective_licenses, " "))

	}

	a.SetString("LOCAL_MODULE_CLASS", a.Class)

	a.SetString("LOCAL_PREBUILT_MODULE_FILE", a.OutputFile.String())

licenses/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ package { 


license {

    name: "Android-Apache-2.0",

    package_name: "Android",

    license_kinds: ["SPDX-license-identifier-Apache-2.0"],

    copyright_notice: "Copyright (C) The Android Open Source Project",

    license_text: ["LICENSE"],