diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-19 12:04:48 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-19 12:04:48 +0000 |
commit | 8c2f1c3a4731adf771a846f83ecc1addee5409a1 (patch) | |
tree | 08227c7efa809e34de1272d0c05a004f8550b647 | |
parent | f50b8b00f4d40eaaeb7e0e3a398d441d27e63d54 (diff) | |
parent | afad9f774f1becf8e804cd87533b727aa2a403bc (diff) | |
download | tcpdump-android12-mainline-media-release.tar.gz |
Snap for 7474514 from afad9f774f1becf8e804cd87533b727aa2a403bc to mainline-media-releaseandroid-mainline-12.0.0_r89android-mainline-12.0.0_r74android-mainline-12.0.0_r62android-mainline-12.0.0_r46android-mainline-12.0.0_r29android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r104android12-mainline-media-release
Change-Id: Ifc9d2c1c2265bbb74354c3adc290365e9780a60e
-rw-r--r-- | Android.bp | 30 | ||||
-rw-r--r-- | METADATA | 3 | ||||
-rw-r--r-- | NOTICE | 19 |
3 files changed, 20 insertions, 32 deletions
@@ -1,16 +1,20 @@ -// Copyright (C) 2018 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +package { + default_applicable_licenses: ["external_tcpdump_license"], +} + +license { + name: "external_tcpdump_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-BSD-4-Clause-UC", + "SPDX-license-identifier-ISC", + "SPDX-license-identifier-MIT", + ], + license_text: [ + "LICENSE", + ], +} cc_binary { name: "tcpdump", diff --git a/METADATA b/METADATA new file mode 100644 index 00000000..d97975ca --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} diff --git a/NOTICE b/NOTICE deleted file mode 100644 index dea5f7d5..00000000 --- a/NOTICE +++ /dev/null @@ -1,19 +0,0 @@ -License: BSD - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - 3. The names of the authors may not be used to endorse or promote - products derived from this software without specific prior - written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |