diff options
| author | Steve Block <steveblock@google.com> | 2012-06-27 01:07:19 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-06-27 16:48:31 +0100 |
| commit | f55aeb0668076ada7378d76bc5a0ac1d29ed8089 (patch) | |
| tree | 5fd76baf5ad5839ce4133872c1adb14911373132 /core/notice_files.mk | |
| parent | 1cc65fd6eff62bbe0bf99c006398416a142bdbbf (diff) | |
| download | build-f55aeb0668076ada7378d76bc5a0ac1d29ed8089.zip build-f55aeb0668076ada7378d76bc5a0ac1d29ed8089.tar.gz build-f55aeb0668076ada7378d76bc5a0ac1d29ed8089.tar.bz2 | |
Don't fail if a target of type NONE has a NOTICE file present
Targets of type NONE are used extensively in Android makefiles which have been
auto-generated from gyp build files. The gyp generator uses such targets to
represent gyp targets which don't produce an output file. Typically, many such
targets exist in a single Android makefile.
We use a generated Android makefile for Chromium. This project has a NOTICE
file, intended to be installed with a SHARED_LIBRARY target. However, the build
fails when processing the targets of type NONE, as it does not know where
to install the NOTICE file.
This change causes the NOTICE to be ignored in this case, rather than failing
the build.
Change-Id: I70cf9a406e4a1c932f8a734f53491f7c5281ee17
Diffstat (limited to 'core/notice_files.mk')
| -rw-r--r-- | core/notice_files.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/notice_files.mk b/core/notice_files.mk index 74beb49..ee50394 100644 --- a/core/notice_files.mk +++ b/core/notice_files.mk @@ -4,6 +4,11 @@ notice_file:=$(strip $(wildcard $(LOCAL_PATH)/NOTICE)) +ifeq ($(LOCAL_MODULE_CLASS),NONE) + # We ignore NOTICE files for modules of type NONE. + notice_file := +endif + ifdef notice_file # This relies on the name of the directory in PRODUCT_OUT matching where |