diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-08 16:01:55 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-08 16:01:55 +0000 |
commit | 0c293ba32a56c633e47ec2890f6325243cd34a91 (patch) | |
tree | 01242584b2c178a4029bad3070419885b9a5de35 | |
parent | da0a44965d8b163fbaa371819df7403033255af1 (diff) | |
parent | f1cb53780e02e7a9112b4aa53a132cae53a1fa15 (diff) | |
download | strace-aml_tz2_303900102.tar.gz |
Snap for 8426163 from f1cb53780e02e7a9112b4aa53a132cae53a1fa15 to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100
Change-Id: I5f742959f1f64636010c9bd176912a10c22b180e
-rw-r--r-- | Android.bp | 39 | ||||
-rw-r--r-- | METADATA | 3 | ||||
l--------- | NOTICE | 1 | ||||
-rw-r--r-- | config.h | 2 |
4 files changed, 22 insertions, 23 deletions
@@ -1,21 +1,18 @@ -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", - ], -} +// +// 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. +// cc_binary { @@ -292,6 +289,12 @@ 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 deleted file mode 100644 index d97975ca..00000000 --- a/METADATA +++ /dev/null @@ -1,3 +0,0 @@ -third_party { - license_type: NOTICE -} @@ -0,0 +1 @@ +LICENSE
\ No newline at end of file @@ -781,9 +781,7 @@ #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 |