diff options
| author | Bruce Beare <bruce.j.beare@intel.com> | 2012-05-01 14:38:18 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-06-12 14:34:53 -0700 |
| commit | 46b48e88feda8531b6bf76e634bf16e1f60072f8 (patch) | |
| tree | 54226045097b61fc1681091629ac335a240d9c70 | |
| parent | 06e515dd77731c1752b2ea3b1b586bcd893f0927 (diff) | |
| download | build-46b48e88feda8531b6bf76e634bf16e1f60072f8.tar.gz | |
full_x86: use telephony profile
Author: Bruce Beare <bruce.j.beare@intel.com>
Change-Id: I3c086f3f38049e9a7cc2e653aa0ee0d2a2ca1a79
| -rw-r--r-- | target/product/full_x86.mk | 9 | ||||
| -rw-r--r-- | target/product/generic_x86.mk | 4 | ||||
| -rw-r--r-- | target/product/sdk_x86.mk | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/target/product/full_x86.mk b/target/product/full_x86.mk index c7a4cfb955..fcbb970e11 100644 --- a/target/product/full_x86.mk +++ b/target/product/full_x86.mk @@ -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 \ diff --git a/target/product/generic_x86.mk b/target/product/generic_x86.mk index 86710c41d1..0274b5b24d 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 6c5e7467cf..873d0c0069 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 |