Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c6b27fe authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by android code review
Browse files

Merge "full_x86: use telephony profile"

parents 06e515dd 46b48e88

target/product/full_x86.mk

+5 −4
Original line number Diff line number Diff line
@@ -22,16 +22,17 @@ 
# If running on an emulator or some other device that has a LAN connection

# that isn't a wifi connection. This will instruct init.rc to enable the

# network connection so that you can use it with ADB

ifdef NET_ETH0_STARTONBOOT

  PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1

endif



PRODUCT_PACKAGES := \

    Camera



$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)



ifdef NET_ETH0_STARTONBOOT

  PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1

endif



# Ensure we package the BIOS files too.

PRODUCT_PACKAGES += \

	bios.bin \

target/product/generic_x86.mk

+2 −2
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ 
# limitations under the License.

#



# This is a generic 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.



$(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk)

include $(SRC_TARGET_DIR)/product/generic.mk



# Overrides

PRODUCT_BRAND := generic_x86

target/product/sdk_x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
# build quite specifically for the emulator, and might not be

# entirely appropriate to inherit from for on-device configurations.



$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk)

include $(SRC_TARGET_DIR)/product/sdk.mk



# Overrides

PRODUCT_BRAND := generic_x86