Commit graph

448 commits

Author SHA1 Message Date
Ying Wang
1fe8c89298 am 65265492: Don\'t clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
* commit '652654927da52f9d1d0e75b69be44701686f79e7':
  Don't clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
2011-03-01 14:56:57 -08:00
Ying Wang
652654927d Don't clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
We are deprecating use of AndroidBoard.mk. To move add-radio-file to
Android.mk, cleaning INSTALLED_RADIOIMAGE_TARGET may clean the radio
target set by other Android.mks that get included before
target/board/Android.mk.
Bug: 3500660

Change-Id: Iee19c40c18f0e9ec23bad4b6ab0e600756af615a
2011-03-01 14:16:58 -08:00
Bruce Beare
ba366c4fb3 x86: Add in the VirtualBox emulator as a separate build target
Change-Id: Icff81a757952b7652d171bc95773e177c4fd7772
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2011-03-01 13:04:21 -08:00
Ying Wang
5371de12df Fix generic_x86 image sizes.
The image build tools only accept decimals.

Change-Id: I4fc3d32a9528bdad4cfb9381cff344a1a1b6b6d5
2011-02-09 10:50:55 -08:00
Kenny Root
773f315bd8 Add system image size for X86
It was defaulting to 128M which was slightly too small for all the
applications. Increasing to 150M fits the resulting image.

Change-Id: I55957c54fbdb77090487c08ed3948988621978b3
2011-02-08 07:45:46 -08:00
Jean-Baptiste Queru
4b35d1aba0 Fix x86 build.
Change-Id: I22dc39a68911e1b5846c20e63c0f8c59521ea7f5
2011-02-03 09:55:47 -08:00
Jean-Baptiste Queru
ef7c96c988 am d3966412: am ab81ffe2: am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"
* commit 'd39664126ed27b816e91312d28b76218f6bd5efb':
  Add dnsproxyd to keep in sync with base init.rc
2011-01-29 08:01:57 -08:00
Bruce Beare
d59072d4d4 Add dnsproxyd to keep in sync with base init.rc
Change-Id: I8785cb5a5297c3cc6f3b0152fcae578a9ea89e89
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-01-27 13:32:47 -08:00
Jean-Baptiste Queru
229c35eed4 am 41c423da: am 96d3e9b3: Merge "generic_x86 builds don\'t need/use the sparse ext4 format."
* commit '41c423da9df557b87e8db490b3ed4d4b34470423':
  generic_x86 builds don't need/use the sparse ext4 format.
2010-12-29 16:02:14 -08:00
Jean-Baptiste Queru
9326ab155e am 827c662d: am e28ae87a: Merge "Use ext4 file system for generic_x86 userdata partition"
* commit '827c662d8f145e5a0492838c951dad5d96716c71':
  Use ext4 file system for generic_x86 userdata partition
2010-12-29 16:02:12 -08:00
Jean-Baptiste Queru
fb6172cf7b am 4bd05717: am 670ccf2c: Merge "GB Updates for init.rc and boot command line"
* commit '4bd05717e2156a0eeb9de81de3e8595b560f2627':
  GB Updates for init.rc and boot command line
2010-12-29 16:02:09 -08:00
Bruce Beare
4c0115d0b7 generic_x86 builds don't need/use the sparse ext4 format.
Change-Id: I62973b131a728c3862be4642e2d49d0fa61555ac
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-28 15:33:27 -08:00
Bruce Beare
1e906eff26 Use ext4 file system for generic_x86 userdata partition
Change-Id: I05710c2bda521b35712513bc219fc73ed00e4617
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-28 14:48:24 -08:00
Bruce Beare
5f276fff11 GB Updates for init.rc and boot command line
Change-Id: I0638c8834fccbdc94ec99e7592a75b6972cb53b8
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-28 14:48:23 -08:00
Jeff Brown
cbc0f4442e Delete the tuttle keymaps.
These files have been obsolete for years.

Change-Id: I489d22799dd0fd476b6afe296e24434d437ea75b
2010-11-23 16:48:26 -08:00
Jean-Baptiste Queru
cfbcd758d8 Improve setup of base products.
Split telephony into its own product, so that we can easily
add telephony support to any configuration without pulling
anything else. Use it from generic.

Split the "full" family between a (no-telephony) base,
a telephony version of the same (both of which can be used
as a starting point for on-device builds), and the true classic
full which is an emulator build.

Change-Id: I616d34f2a29415b8ec997173f8e893c312ade5c2
2010-10-22 16:47:31 -07:00
Jean-Baptiste Queru
dd46ad41ff Clean up full config - DO NOT MERGE
This splits the existing full.mk in two parts:

-One is the device-independent full_base.mk
-The other is the emulator-specific device.mk

This way we'll be able to inherit from full_base.mk
for on-device builds without any emulator-specific
files getting in the way.

Change-Id: Ieb1f4ed47988c8fff119ff53f1f374032da3752d
2010-10-22 15:00:24 -07:00
Jean-Baptiste Queru
24ab0f58f4 am 85f351d1: Merge "Allow devices without AndroidBoard.mk" into gingerbread
Merge commit '85f351d1f925b265c401f1992b57dc028d462453' into gingerbread-plus-aosp

* commit '85f351d1f925b265c401f1992b57dc028d462453':
  Allow devices without AndroidBoard.mk
2010-09-15 12:56:42 -07:00
Jean-Baptiste Queru
3f4e53aa25 Allow devices without AndroidBoard.mk
A long time ago, Android.mk in devices had the same semantics
as the current AndroidBoard.mk. This eventually caused problems
(as it didn't allow having a true Android.mk there) so we switched,
and left an error behind in case people were still using the old
semantics (i.e. having an Android.mk but no AndroidBoard.mk).

Fast forward a few years to the present: we're finding that we want
to get rid of AndroidBoard.mk, so there are devices that will have
Android.mk but not AndroidBoard.mk. As this is becoming a legitimate
case, the error for it is removed, and the include for AndroidBoard.mk
is made optional.

Change-Id: Ic683419d4aaab122259715e0112660d2a6359e91
2010-09-15 11:59:33 -07:00
Jean-Baptiste Queru
eba22a05cb am 85fd5030: Revert "Fixed problem with keymap files copied to target"
Merge commit '85fd5030b11d412f345b0ed039aa9912c7973aea' into gingerbread-plus-aosp

* commit '85fd5030b11d412f345b0ed039aa9912c7973aea':
  Revert "Fixed problem with keymap files copied to target"
2010-09-01 06:23:50 -07:00
Jean-Baptiste Queru
85fd5030b1 Revert "Fixed problem with keymap files copied to target"
This reverts commit c90449f2a8.
2010-09-01 06:10:40 -07:00
Jean-Baptiste Queru
8abb5cc10f am a160e316: Merge "Fixed problem with keymap files copied to target"
Merge commit 'a160e3169e6624610fd05b2edd14b674ffb54e44' into gingerbread-plus-aosp

* commit 'a160e3169e6624610fd05b2edd14b674ffb54e44':
  Fixed problem with keymap files copied to target
2010-08-31 15:04:01 -07:00
Magnus Karlsson
c90449f2a8 Fixed problem with keymap files copied to target
Moved Android.mk and keymap files except AVRCP.kl from sdk/emulator/keymaps
to build/target/board/generic. This causes the keymap files to copied into
the system image of generic and sdk products, but not into the system image
of HW products. Originally the qwerty.kl was copied to target no matter
if the target had a qwerty keyboard or not, which is the case for e.g.
the Nexus One.

Change-Id: I7cd80497632fb3b9e7ce2f3a7888d4924a355f52
2010-08-30 16:51:28 +02:00
Jean-Baptiste Queru
f7a6ead075 Manual merge
Change-Id: Ie74c9c4931d3a1ec34bbdf4307d98c8e66c9ddd5
2010-08-25 10:01:35 -07:00
Thorsten Glaser
3d00a8c5ff For the generic board, set /system/bin/sh to mksh to test the transition
Change-Id: I778bae4060dd404e82fbf9dd5b8a2024c8268402
2010-08-24 18:08:59 -07:00
The Android Open Source Project
1778b4b11e merge from open-source master
Change-Id: I333595755ed96c753b3f01ef6715a230eee94e0d
2010-07-12 15:01:01 -07:00
The Android Open Source Project
c9d1186151 merge from open-source master
Change-Id: Iad583004b67ce1ef0651e81b57c2c95632da9845
2010-07-12 14:43:29 -07:00
Bruce Beare
cce6f923aa Move buildspec vars to BoardConfig.mk
Change-Id: I48ed4b55e91aae51076d9c609b44bf9fa24c3ecd
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-12 11:32:37 -07:00
Bruce Beare
b73dc6690b Allow TARGET_ARCH to be set from BoardConfig.mk
Change-Id: I66aed78b763d238719822257c1f4f35301247df6
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-12 09:42:10 -07:00
The Android Open Source Project
e9dc6ca1c0 merge from open-source master
Change-Id: I04fcaf990b9d0db7235ef34c3be717437bf96e19
2010-07-09 14:34:52 -07:00
Bruce Beare
df49c50c52 Update to latest (froyo) init.rc
Change-Id: Ibbf5427261dbb84cdc28c6de931e65c8cac547a6
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-08 12:12:29 -07:00
Andy McFadden
5f2b36f854 Atomic/SMP update.
Added "TARGET_CPU_SMP := true" to simulator configuration, since it's
likely the simulator will be running on SMP hardware.

Change-Id: I7527895abe70ffaece5c52fd3ffcfe4b0d698fd2
2010-06-01 08:37:16 -07:00
Chih-Chung Chang
ed43e3d784 Merge "Set no camera default for emulator/generic/sim builds." into kraken 2010-05-23 21:03:38 -07:00
Jean-Baptiste Queru
4dccdd6401 Merge "Use a different kernel boot line for the disk installer." 2010-05-14 15:47:56 -07:00
Chih-Chung Chang
b9e030e52d Set no camera default for emulator/generic/sim builds.
Change-Id: I3c75d093bb48a9d10952d587c3e48bbcc227f139
2010-05-10 15:00:39 +08:00
Bruce Beare
9d4c5b1c20 Use a different kernel boot line for the disk installer.
Change-Id: I6b20386a24e1141bfe2a252b635243c235d46865
2010-05-07 11:51:30 -07:00
Bruce Beare
a197281bc2 Use a property to enable the eth0 LAN port on the emulator
Change-Id: I26f4ec7fac9b7a8ad3013914967cf0f8fdec91ff
2010-05-05 09:52:23 -07:00
Bruce Beare
f9f1a9d764 Add support for x86 VirtualBox Emulation
To make a VirtualBox install image,
  make installer_img
2010-05-05 09:52:09 -07:00
Bruce Beare
c25e503207 generic_x86 support
Add in Makefiles and support files for x86 builds
  Based on changes by: wonjong.lee <wonjong.lee@windriver.com>
  Additional changes by: Mark Gross <mark.gross@intel.com>
  Additional changes by: Bruce Beare <brucex.j.beare@intel.com>

Change-Id: Id087411b282b1b68a0251e7f9cbbdde183549787
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-04-28 16:52:51 -07:00
Ying Wang
35b84b287f Overwrite android-info instead of appending to it
if someone changes board-info.txt, then it should be copied out to
 out/target/product/<device>/android-info.txt, instead of appending.
2009-12-03 11:25:47 -08:00
Brian Swetland
2b80317be2 only auto-generate board= requirement if a board-info file is not specified
If a board-info file is specified (as is usually the case) we should honor
its requirements.
2009-11-25 13:43:25 -08:00
Doug Zongker
e01100c7ac generalize the definition of a "radio image"
Non-HTC devices may have multiple files constituting their "radio
image".  Generalize the INSTALLED_RADIOIMAGE_TARGET variable a bit:
initially define it as empty, then let AndroidBoard.mk files add to
it.  Provide a convenience function add-radio-image for them to call
to add files.  Put all those files into the target_files zip for use
in OTA and fastboot package construction.

Note that for HTC devices, this changes the name of the radio image in
the target_files zip:  instead of "RADIO/image" it will be
"RADIO/radio.img".  Tools that use the target_files zip will need to
be changed.
2009-06-22 17:46:19 -07:00
Dianne Hackborn
ecc70d705a Define TARGET_CPU_ABI for finding native code in .apks 2009-05-22 14:54:07 -07:00
The Android Open Source Project
88b607994a auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
The Android Open Source Project
05806d7af6 auto import from //depot/cupcake/@135843 2009-03-03 18:28:14 -08:00
The Android Open Source Project
475fa12ade auto import from //branches/cupcake/...@130745 2009-02-10 15:43:57 -08:00
The Android Open Source Project
dcc08f073b Code drop from //branches/cupcake/...@124589 2008-12-17 18:03:49 -08:00
The Android Open Source Project
b6c1cf6de7 Initial Contribution 2008-10-21 07:00:00 -07:00