p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolved conflicts for merge of 76af0657 to jb-dev-plus-aosp 

Change-Id: I4843695261abbc478fd6b505debe6fc20a06c88d
This commit is contained in:
Jean-Baptiste Queru 2012-06-12 14:57:27 -07:00
parent 82c11caca0 76af0657be
commit 12d24b5aab
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/product/full_x86.mk
View File

@ -22,13 +22,14 @@
# 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
$(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
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)
# 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