diff options
| author | Colin Cross <ccross@android.com> | 2017-08-31 15:07:09 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-09-01 13:21:53 -0700 |
| commit | 5aac3629493e4df7a1e7d2b594021c380d25141f (patch) | |
| tree | cf8b1065f12d880c3cadd420807c29faab491c0e | |
| parent | 7f9036c89bca2f4b246edd9fdde005afc8051e24 (diff) | |
| download | build_soong-5aac3629493e4df7a1e7d2b594021c380d25141f.tar.gz build_soong-5aac3629493e4df7a1e7d2b594021c380d25141f.tar.bz2 build_soong-5aac3629493e4df7a1e7d2b594021c380d25141f.zip | |
Add notice property to all modules
Add a notice property to all modules which, if set, propagates to
LOCAL_NOTICE_FILE in make.
Test: m -j checkbuild, examine out/soong/Android*.mk
Change-Id: I565a5624dfd7b376b976b1a43dac5cea96869026
| -rw-r--r-- | android/androidmk.go | 3 | ||||
| -rw-r--r-- | android/module.go | 3 | ||||
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/android/androidmk.go b/android/androidmk.go index 46e7fcf2..9e541feb 100644 --- a/android/androidmk.go +++ b/android/androidmk.go @@ -232,6 +232,9 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b if amod.commonProperties.Owner != nil { fmt.Fprintln(&data.preamble, "LOCAL_MODULE_OWNER :=", *amod.commonProperties.Owner) } + if amod.commonProperties.Notice != nil { + fmt.Fprintln(&data.preamble, "LOCAL_NOTICE_FILE :=", *amod.commonProperties.Notice) + } } if host { diff --git a/android/module.go b/android/module.go index fb2e7030..bacf6663 100644 --- a/android/module.go +++ b/android/module.go @@ -162,6 +162,9 @@ type commonProperties struct { // names of other modules to install if this module is installed Required []string `android:"arch_variant"` + // relative path to a file to include in the list of notices for the device + Notice *string + // Set by TargetMutator CompileTarget Target `blueprint:"mutated"` CompilePrimary bool `blueprint:"mutated"` diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index ee722e01..50ba91ba 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -74,6 +74,7 @@ func init() { "LOCAL_PROTOC_OPTIMIZE_TYPE": "proto.type", "LOCAL_MODULE_OWNER": "owner", "LOCAL_RENDERSCRIPT_TARGET_API": "renderscript.target_api", + "LOCAL_NOTICE_FILE": "notice", }) addStandardProperties(bpparser.ListType, map[string]string{ |