diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-12 14:57:27 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-06-12 14:57:27 -0700 |
| commit | 12d24b5aaba0752239401fc2c8b579e3b8ae97dd (patch) | |
| tree | 11684487d8812ff1df08db91d9bf49bb64adb383 /target | |
| parent | 82c11caca04bc4e14e0a33057f484635dc1ae8dc (diff) | |
| parent | 76af0657be461352ece41af3524cffc74261d21a (diff) | |
| download | build-12d24b5aaba0752239401fc2c8b579e3b8ae97dd.zip build-12d24b5aaba0752239401fc2c8b579e3b8ae97dd.tar.gz build-12d24b5aaba0752239401fc2c8b579e3b8ae97dd.tar.bz2 | |
resolved conflicts for merge of 76af0657 to jb-dev-plus-aosp
Change-Id: I4843695261abbc478fd6b505debe6fc20a06c88d
Diffstat (limited to 'target')
| -rw-r--r-- | target/product/full_x86.mk | 7 | ||||
| -rw-r--r-- | target/product/generic_x86.mk | 4 | ||||
| -rw-r--r-- | target/product/sdk_x86.mk | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/target/product/full_x86.mk b/target/product/full_x86.mk index d6a169a..9941384 100644 --- a/target/product/full_x86.mk +++ b/target/product/full_x86.mk @@ -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 \ diff --git a/target/product/generic_x86.mk b/target/product/generic_x86.mk index 86710c4..0274b5b 100644 --- a/target/product/generic_x86.mk +++ b/target/product/generic_x86.mk @@ -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 diff --git a/target/product/sdk_x86.mk b/target/product/sdk_x86.mk index 6c5e746..873d0c0 100644 --- a/target/product/sdk_x86.mk +++ b/target/product/sdk_x86.mk @@ -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 |