commit af13a8b744f6c56b4d1403ea45b3b3bdc2460e31
author Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 31 23:39:45 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 31 23:39:45 2020 +0000
tree 52f9edb77441dcefa371449095b4ebd6467ef22e
parent f60d4f9a0476e7f7207d1fd3161b8c9a1401e6ef
parent fd890289e2d1833de7f9aafe941880d44498c58b

Merge changes I3a2191b0,Ide1056b5

* changes:
  libfastboot uses usb_linux.cpp for all Linux targets
  Don't enable version lib for libadb_sysdeps

adb/Android.bp

diff --git a/adb/Android.bp b/adb/Android.bp
index 8addf95..5351b3f 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -270,6 +270,8 @@
     host_supported: true,
     compile_multilib: "both",
     min_sdk_version: "apex_inherit",
+    // This library doesn't use build::GetBuildNumber()
+    use_version_lib: false,
 
     srcs: [
         "sysdeps/env.cpp",

fastboot/Android.bp

diff --git a/fastboot/Android.bp b/fastboot/Android.bp
index 6673543..81ebf43 100644
--- a/fastboot/Android.bp
+++ b/fastboot/Android.bp
@@ -251,7 +251,7 @@
         darwin: {
             srcs: ["usb_osx.cpp"],
         },
-        linux_glibc: {
+        linux: {
             srcs: ["usb_linux.cpp"],
         },
     },