openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am 0c6b27fe: Merge "full_x86: use telephony profile" 

* commit '0c6b27fe83a810c5a91c3aa1a4ffc0348d24b5cd':
  full_x86: use telephony profile
This commit is contained in:
Jean-Baptiste Queru 2012-06-12 14:43:56 -07:00 committed by Android Git Automerger
parent 5b7633be4e 0c6b27fe83
commit 76af0657be
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/product/full_x86.mk
View File

@ -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 \

4
target/product/generic_x86.mk
View File

@ -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

2
target/product/sdk_x86.mk
View File

@ -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