commit 5394bf4be54b182ea660da1af00c91179a5ea693
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Apr 28 16:00:02 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Apr 28 16:00:02 2022 +0000
tree fb9ded0f62ba472ba9110b4d8347cbc60bb921da
parent b10e23f4a6803b7f50c7275d5c318c6563b237ac
parent b7ba111e8c54beb68b59a59f424ffe42781ee293

Snap for 8512216 from b7ba111e8c54beb68b59a59f424ffe42781ee293 to tm-frc-adbd-release

Change-Id: I12cb75cecacaf0f109f09a06c1aae7e9c6f7d775

Android.bp

diff --git a/Android.bp b/Android.bp
index 3cc8e2f..e0cd159 100644
--- a/Android.bp
+++ b/Android.bp
@@ -147,7 +147,7 @@
                 "src/common/musl/include",
             ],
         },
-        linux_glibc: {
+        host_linux: {
             cppflags: [
                 "-Wno-unused-parameter",
             ],
@@ -197,7 +197,7 @@
         darwin: {
             enabled: false,
         },
-        linux_glibc: {
+        host_linux: {
             srcs: [
                 "src/common/linux/http_upload.cc",
                 "src/common/linux/libcurl_wrapper.cc",
@@ -223,7 +223,7 @@
         darwin: {
             enabled: false,
         },
-        linux_glibc: {
+        host_linux: {
             cflags: [
                 "-Wno-missing-field-initializers",
                 "-Wno-pointer-arith",
@@ -259,7 +259,7 @@
         darwin: {
             enabled: false,
         },
-        linux_glibc: {
+        host_linux: {
             cppflags: [
                 "-DHAVE_A_OUT_H",
                 "-Wno-implicit-fallthrough",

METADATA

diff --git a/METADATA b/METADATA
index 76ed448..56a36ea 100644
--- a/METADATA
+++ b/METADATA
@@ -13,8 +13,8 @@
   }
   version: "a2d3e8b"
   last_upgrade_date { year: 2020 month: 4 day: 19 }
-  # would be NOTICE save for APSL in:
-  #   src/third_party/mac_handler/breakpad_nlist_64.cc
-  #   src/third_party/mac_headers/
+  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/"
   license_type: RECIPROCAL
 }