diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-10-20 22:12:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-10-20 22:12:40 +0000 |
| commit | 8815351118bf0e00e76fde3eaca5e5ca36ab5041 (patch) | |
| tree | ea829be00020609ed3bd823d5c1933e45d947bce /android | |
| parent | 83dec15971b573be79a5c1374366fbf8f32b3c50 (diff) | |
| parent | c6345fb7ec656e18933f654197c2a6972270fead (diff) | |
| download | build_soong-8815351118bf0e00e76fde3eaca5e5ca36ab5041.tar.gz build_soong-8815351118bf0e00e76fde3eaca5e5ca36ab5041.tar.bz2 build_soong-8815351118bf0e00e76fde3eaca5e5ca36ab5041.zip | |
Merge "Add a "license" property to ndk_headers."
Diffstat (limited to 'android')
| -rw-r--r-- | android/defs.go | 6 | ||||
| -rw-r--r-- | android/module.go | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/android/defs.go b/android/defs.go index 6e28de72..d7e2a9f7 100644 --- a/android/defs.go +++ b/android/defs.go @@ -74,6 +74,12 @@ var ( }, "error") + Cat = pctx.AndroidStaticRule("Cat", + blueprint.RuleParams{ + Command: "cat $in > $out", + Description: "concatenate licenses $out", + }) + // Used only when USE_GOMA=true is set, to restrict non-goma jobs to the local parallelism value localPool = blueprint.NewBuiltinPool("local_pool") ) diff --git a/android/module.go b/android/module.go index 572b1623..230d95ca 100644 --- a/android/module.go +++ b/android/module.go @@ -170,6 +170,7 @@ type HostOrDeviceSupported int const ( _ HostOrDeviceSupported = iota HostSupported + HostSupportedNoCross DeviceSupported HostAndDeviceSupported HostAndDeviceDefault @@ -326,8 +327,9 @@ func (a *ModuleBase) ArchSpecific() bool { func (a *ModuleBase) OsClassSupported() []OsClass { switch a.commonProperties.HostOrDeviceSupported { case HostSupported: - // TODO(ccross): explicitly mark host cross support return []OsClass{Host, HostCross} + case HostSupportedNoCross: + return []OsClass{Host} case DeviceSupported: return []OsClass{Device} case HostAndDeviceSupported: |