StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import the d/g/goldfish soong namespace for libwifi-hal-emu

Browse Source 
Some devices refer to libwifi-hal-emu via

BOARD_WLAN_DEVICE := emulator

we need to import the device/generic/goldfish
namespace to link the libwifi-hal-emu symbol.

Bug: 154151802
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I68b0f9bd22e50c2a86e0dbe62abc17991581703e
Merged-In: I68b0f9bd22e50c2a86e0dbe62abc17991581703e
This commit is contained in:
Roman Kiryanov
2020-05-12 15:21:41 -07:00
parent ca6e50fa2c
commit 6e0c857fe2
7 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
target/board/emulator_arm64/device.mk
View File

@@ -14,6 +14,9 @@
# limitations under the License. # limitations under the License.
# #
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps.
# Cuttlefish has GKI kernel prebuilts, so use those for the GKI boot.img. # Cuttlefish has GKI kernel prebuilts, so use those for the GKI boot.img.
ifeq ($(TARGET_PREBUILT_KERNEL),) ifeq ($(TARGET_PREBUILT_KERNEL),)
LOCAL_KERNEL := device/google/cuttlefish_kernel/5.4-arm64/kernel LOCAL_KERNEL := device/google/cuttlefish_kernel/5.4-arm64/kernel

3
target/board/generic/device.mk
View File

@@ -14,6 +14,9 @@
# limitations under the License. # limitations under the License.
# #
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps.
# NFC: # NFC:
# Provide default libnfc-nci.conf file for devices that does not have one in # Provide default libnfc-nci.conf file for devices that does not have one in
# vendor/etc because aosp system image (of aosp_$arch products) is going to # vendor/etc because aosp system image (of aosp_$arch products) is going to

3
target/board/generic_x86/device.mk
View File

@@ -14,6 +14,9 @@
# limitations under the License. # limitations under the License.
# #
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps.
ifdef NET_ETH0_STARTONBOOT ifdef NET_ETH0_STARTONBOOT
PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1
endif endif

3
target/board/generic_x86_64/device.mk
View File

@@ -14,6 +14,9 @@
# limitations under the License. # limitations under the License.
# #
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps.
ifdef NET_ETH0_STARTONBOOT ifdef NET_ETH0_STARTONBOOT
PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1
endif endif

3
target/board/generic_x86_64_arm64/device.mk
View File

@@ -13,3 +13,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps.

3
target/board/generic_x86_arm/device.mk
View File

@@ -13,3 +13,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps.

3
target/product/generic.mk
View File

@@ -14,6 +14,9 @@
# limitations under the License. # limitations under the License.
# #
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps.
# This is a generic phone product that isn't specialized for a specific device. # This is a generic phone product that isn't specialized for a specific device.
# It includes the base Android platform. # It includes the base Android platform.