tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Import the d/g/goldfish soong namespace for libwifi-hal-emu" am: 8074729bc2

Browse source 
Change-Id: Ia8275ccf8ca204af8191b3d0f6a38e1b93cc56c1
This commit is contained in:
Treehugger Robot 2020-05-18 21:27:46 +00:00 committed by Automerger Merge Worker
commit 865b8b8989
7 changed files with 21 additions and 0 deletions
Show stats 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.