Merge "full_x86: use telephony profile"
This commit is contained in:
@@ -22,16 +22,17 @@
|
|||||||
# If running on an emulator or some other device that has a LAN connection
|
# 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
|
# that isn't a wifi connection. This will instruct init.rc to enable the
|
||||||
# network connection so that you can use it with ADB
|
# network connection so that you can use it with ADB
|
||||||
ifdef NET_ETH0_STARTONBOOT
|
|
||||||
PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1
|
|
||||||
endif
|
|
||||||
|
|
||||||
PRODUCT_PACKAGES := \
|
PRODUCT_PACKAGES := \
|
||||||
Camera
|
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)
|
$(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.
|
# Ensure we package the BIOS files too.
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
bios.bin \
|
bios.bin \
|
||||||
|
@@ -14,10 +14,10 @@
|
|||||||
# limitations under the License.
|
# 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.
|
# It includes the base Android platform.
|
||||||
|
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk)
|
include $(SRC_TARGET_DIR)/product/generic.mk
|
||||||
|
|
||||||
# Overrides
|
# Overrides
|
||||||
PRODUCT_BRAND := generic_x86
|
PRODUCT_BRAND := generic_x86
|
||||||
|
@@ -19,7 +19,7 @@
|
|||||||
# build quite specifically for the emulator, and might not be
|
# build quite specifically for the emulator, and might not be
|
||||||
# entirely appropriate to inherit from for on-device configurations.
|
# 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
|
# Overrides
|
||||||
PRODUCT_BRAND := generic_x86
|
PRODUCT_BRAND := generic_x86
|
||||||
|
Reference in New Issue
Block a user