diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-12 14:43:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-12 14:43:56 -0700 |
| commit | 76af0657be461352ece41af3524cffc74261d21a (patch) | |
| tree | 41059518c105f520439dd4f92b4cda3c2707a283 /target/product | |
| parent | 5b7633be4e107888db7b6fc3d50be6aa8eb7f95c (diff) | |
| parent | 0c6b27fe83a810c5a91c3aa1a4ffc0348d24b5cd (diff) | |
| download | build-76af0657be461352ece41af3524cffc74261d21a.zip build-76af0657be461352ece41af3524cffc74261d21a.tar.gz build-76af0657be461352ece41af3524cffc74261d21a.tar.bz2 | |
am 0c6b27fe: Merge "full_x86: use telephony profile"
* commit '0c6b27fe83a810c5a91c3aa1a4ffc0348d24b5cd':
full_x86: use telephony profile
Diffstat (limited to 'target/product')
| -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 c7a4cfb..fcbb970 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 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 |