diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 02:04:08 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-15 02:04:08 +0000 |
commit | 5d1f4cc747f2b56430af0c74cfa54a55d624e801 (patch) | |
tree | bf32099eeded9fa1f1ba42f3b20920fdc307d962 | |
parent | f1cb53780e02e7a9112b4aa53a132cae53a1fa15 (diff) | |
parent | 43073a831a8ac38458b1c6a14595f76aa77e75bd (diff) | |
download | strace-5d1f4cc747f2b56430af0c74cfa54a55d624e801.tar.gz |
Snap for 7550930 from 43073a831a8ac38458b1c6a14595f76aa77e75bd to mainline-captiveportallogin-releaseandroid-mainline-12.0.0_r6android-mainline-12.0.0_r23android12-mainline-captiveportallogin-release
Change-Id: Iee06a2c3864724151b4d429634fb64f7dbda4ef0
-rw-r--r-- | Android.bp | 39 | ||||
-rw-r--r-- | METADATA | 3 | ||||
l--------- | NOTICE | 1 | ||||
-rw-r--r-- | config.h | 2 |
4 files changed, 23 insertions, 22 deletions
@@ -1,18 +1,21 @@ -// -// Copyright (C) 2006 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_strace_license"], +} + +license { + name: "external_strace_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-FSFAP", + "SPDX-license-identifier-MIT", + "legacy_notice", + "legacy_unencumbered", + ], + license_text: [ + "COPYING", + ], +} cc_binary { @@ -289,12 +292,6 @@ cc_binary { "linux", ], }, - mips: { - enabled: false, - }, - mips64: { - enabled: false, - }, x86: { cflags: ["-DI386=1"] + ["-DHAVE_STRUCT___OLD_KERNEL_STAT=1"], 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 120000 index 7a694c96..00000000 --- a/NOTICE +++ /dev/null @@ -1 +0,0 @@ -LICENSE
\ No newline at end of file @@ -781,7 +781,9 @@ #define HAVE_LINUX_KCMP_H 1 /* Define to 1 if you have the <linux/kvm.h> header file. */ +#if defined(__LP64__) #define HAVE_LINUX_KVM_H 1 +#endif /* Define to 1 if you have the <linux/memfd.h> header file. */ #define HAVE_LINUX_MEMFD_H 1 |