commit 387fd1b3242eb6269226095d93ff628bd5324d25
author Linux Build Service Account <lnxbuild@localhost> Wed Apr 29 03:42:14 2020 -0700
committer Linux Build Service Account <lnxbuild@localhost> Wed Apr 29 03:42:14 2020 -0700
tree fd1395c4bd62d77b3eb6744079f31506c8e8f10a
parent 74e105971ad0e9837f9a877b9d3e69a11ab51982
parent b593d07ea6eca869d49c2f2620e6a734103f8350

Merge b593d07ea6eca869d49c2f2620e6a734103f8350 on remote branch

Change-Id: Ib5b286024e1202370fc6dbb7465da6edb66e6cf0

Android.bp

diff --git a/Android.bp b/Android.bp
index 8390a3d..410dbbc 100755
--- a/Android.bp
+++ b/Android.bp
@@ -19,10 +19,16 @@
     vendor_available: true,
     recovery_available: true,
 
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.adbd",
+    ],
+
     visibility: [
         "//bootable/recovery:__subpackages__",
         "//external/bsdiff:__subpackages__",
         "//external/puffin:__subpackages__",
+        "//system/core/adb:__subpackages__",
         "//system/update_engine:__subpackages__",
     ],
 
@@ -40,6 +46,9 @@
         linux_bionic: {
             enabled: true,
         },
+        windows: {
+            enabled: true,
+        },
     },
     stl: "none",
 }