Snap for 8730993 from 5c069a8915093a3af6bb26639a4ac8aa0db2badb to mainline-tzdata3-release
Change-Id: If720d6e74868df76b6d841d6d13c80fc279bf1cf
diff --git a/Android.bp b/Android.bp
index e0cd159..b37e26f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -92,11 +92,6 @@
"src/common/android/include",
],
},
- musl: {
- local_include_dirs: [
- "src/common/musl/include",
- ],
- },
},
// Work around b/25435766 core2md segfault.
arch: {
@@ -137,18 +132,9 @@
darwin: {
enabled: false,
},
- glibc: {
+ linux_glibc: {
cppflags: [
"-DHAVE_A_OUT_H",
- ],
- },
- musl: {
- local_include_dirs: [
- "src/common/musl/include",
- ],
- },
- host_linux: {
- cppflags: [
"-Wno-unused-parameter",
],
srcs: [
@@ -197,7 +183,7 @@
darwin: {
enabled: false,
},
- host_linux: {
+ linux_glibc: {
srcs: [
"src/common/linux/http_upload.cc",
"src/common/linux/libcurl_wrapper.cc",
@@ -223,7 +209,7 @@
darwin: {
enabled: false,
},
- host_linux: {
+ linux_glibc: {
cflags: [
"-Wno-missing-field-initializers",
"-Wno-pointer-arith",
@@ -259,7 +245,7 @@
darwin: {
enabled: false,
},
- host_linux: {
+ linux_glibc: {
cppflags: [
"-DHAVE_A_OUT_H",
"-Wno-implicit-fallthrough",
diff --git a/METADATA b/METADATA
index 56a36ea..76ed448 100644
--- a/METADATA
+++ b/METADATA
@@ -13,8 +13,8 @@
}
version: "a2d3e8b"
last_upgrade_date { year: 2020 month: 4 day: 19 }
- license_note: "would be NOTICE save for APSL in:\n"
- " src/third_party/mac_handler/breakpad_nlist_64.cc\n"
- " src/third_party/mac_headers/"
+ # would be NOTICE save for APSL in:
+ # src/third_party/mac_handler/breakpad_nlist_64.cc
+ # src/third_party/mac_headers/
license_type: RECIPROCAL
}
diff --git a/OWNERS b/OWNERS
index 110c7f3..0083bf9 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,4 @@
set noparent
+benchan@google.com
+vapier@google.com
siyuanh@google.com
diff --git a/src/common/musl/include/stab.h b/src/common/musl/include/stab.h
deleted file mode 100644
index 98b25e1..0000000
--- a/src/common/musl/include/stab.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) 2012, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * 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.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_BREAKPAD_COMMON_MUSL_INCLUDE_STAB_H
-#define GOOGLE_BREAKPAD_COMMON_MUSL_INCLUDE_STAB_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-#define _STAB_CODE_LIST \
- _STAB_CODE_DEF(UNDF,0x00) \
- _STAB_CODE_DEF(GSYM,0x20) \
- _STAB_CODE_DEF(FNAME,0x22) \
- _STAB_CODE_DEF(FUN,0x24) \
- _STAB_CODE_DEF(STSYM,0x26) \
- _STAB_CODE_DEF(LCSYM,0x28) \
- _STAB_CODE_DEF(MAIN,0x2a) \
- _STAB_CODE_DEF(PC,0x30) \
- _STAB_CODE_DEF(NSYMS,0x32) \
- _STAB_CODE_DEF(NOMAP,0x34) \
- _STAB_CODE_DEF(OBJ,0x38) \
- _STAB_CODE_DEF(OPT,0x3c) \
- _STAB_CODE_DEF(RSYM,0x40) \
- _STAB_CODE_DEF(M2C,0x42) \
- _STAB_CODE_DEF(SLINE,0x44) \
- _STAB_CODE_DEF(DSLINE,0x46) \
- _STAB_CODE_DEF(BSLINE,0x48) \
- _STAB_CODE_DEF(BROWS,0x48) \
- _STAB_CODE_DEF(DEFD,0x4a) \
- _STAB_CODE_DEF(EHDECL,0x50) \
- _STAB_CODE_DEF(MOD2,0x50) \
- _STAB_CODE_DEF(CATCH,0x54) \
- _STAB_CODE_DEF(SSYM,0x60) \
- _STAB_CODE_DEF(SO,0x64) \
- _STAB_CODE_DEF(LSYM,0x80) \
- _STAB_CODE_DEF(BINCL,0x82) \
- _STAB_CODE_DEF(SOL,0x84) \
- _STAB_CODE_DEF(PSYM,0xa0) \
- _STAB_CODE_DEF(EINCL,0xa2) \
- _STAB_CODE_DEF(ENTRY,0xa4) \
- _STAB_CODE_DEF(LBRAC,0xc0) \
- _STAB_CODE_DEF(EXCL,0xc2) \
- _STAB_CODE_DEF(SCOPE,0xc4) \
- _STAB_CODE_DEF(RBRAC,0xe0) \
- _STAB_CODE_DEF(BCOMM,0xe2) \
- _STAB_CODE_DEF(ECOMM,0xe4) \
- _STAB_CODE_DEF(ECOML,0xe8) \
- _STAB_CODE_DEF(NBTEXT,0xf0) \
- _STAB_CODE_DEF(NBDATA,0xf2) \
- _STAB_CODE_DEF(NBBSS,0xf4) \
- _STAB_CODE_DEF(NBSTS,0xf6) \
- _STAB_CODE_DEF(NBLCS,0xf8) \
- _STAB_CODE_DEF(LENG,0xfe)
-
-enum __stab_debug_code {
-#define _STAB_CODE_DEF(x,y) N_##x = y,
-_STAB_CODE_LIST
-#undef _STAB_CODE_DEF
-};
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-#endif // GOOGLE_BREAKPAD_COMMON_MUSL_INCLUDE_STAB_H
