From 81dec9cfc46c844ba929bee7cf0333a63bc9e9e9 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 28 Aug 2020 15:05:59 -0700
Subject: [PATCH] Make wifi hidl interfaces available to the platform

The wifi hidl interfaces need apex_available: ["com.android.wifi"]
because the generated java interfaces are needed by the
com.android.wifi apex, but that causes the C interfaces to not
be available to the platform.  The unavailability was hidden
by b/154888298.  Explicitly mark them with "//apex_available:platform".

Bug: 154888298
Test: m checkbuild
Change-Id: I8959ec1454cce6817802bcc1785a34ba56adc99c
---
 wifi/1.5/Android.bp            | 1 +
 wifi/hostapd/1.3/Android.bp    | 1 +
 wifi/supplicant/1.4/Android.bp | 1 +
 3 files changed, 3 insertions(+)

diff --git a/wifi/1.5/Android.bp b/wifi/1.5/Android.bp
index 37a1cf31a4..1714ef8e73 100644
--- a/wifi/1.5/Android.bp
+++ b/wifi/1.5/Android.bp
@@ -16,6 +16,7 @@ hidl_interface {
     ],
     gen_java: true,
     apex_available: [
+        "//apex_available:platform",
         "com.android.wifi",
     ],
 }
diff --git a/wifi/hostapd/1.3/Android.bp b/wifi/hostapd/1.3/Android.bp
index aef3267d14..31faa6a9a6 100644
--- a/wifi/hostapd/1.3/Android.bp
+++ b/wifi/hostapd/1.3/Android.bp
@@ -17,6 +17,7 @@ hidl_interface {
     ],
     gen_java: true,
     apex_available: [
+        "//apex_available:platform",
         "com.android.wifi",
     ],
 }
diff --git a/wifi/supplicant/1.4/Android.bp b/wifi/supplicant/1.4/Android.bp
index 81e17387f1..f3a7cf8104 100644
--- a/wifi/supplicant/1.4/Android.bp
+++ b/wifi/supplicant/1.4/Android.bp
@@ -18,6 +18,7 @@ hidl_interface {
     ],
     gen_java: true,
     apex_available: [
+        "//apex_available:platform",
         "com.android.wifi",
     ],
 }