Commit graph

244 commits

Author SHA1 Message Date
Chris Dearman
1272b7872a [MIPS] Use mksh for /system/bin/sh
Signed-off-by: Chris Dearman <chris@mips.com>

Change-Id: I01a6c1e2ac9de5b6d86c2aace041a0f7400f6b5e
2013-02-15 14:00:18 -08:00
Elliott Hughes
b2bbff7cba am ea852f6e: am f6b670b7: Merge "Remove more always-true ARCH_ARM_HAVE_ flags."
# Via Android Git Automerger (1) and others
* commit 'ea852f6ed3e9f251eaef4f041fbc0b09229ac924':
  Remove more always-true ARCH_ARM_HAVE_ flags.
2013-02-14 17:31:40 -08:00
Elliott Hughes
03d2aa4dd0 Remove more always-true ARCH_ARM_HAVE_ flags.
All the remaining flags appear to be actually used.

Change-Id: I0e3d84915487eda4f0e97809fc36624fef5f1848
2013-02-14 12:04:48 -08:00
Ying Wang
f05c4f7524 Resurrect generic_armv5
But only for unbundled build.
Add it to tapas arch options.

Bug: 8108463
Change-Id: I53cd63c6ab2113fee3992650b561658231ea9921
2013-01-31 11:43:14 -08:00
Jean-Baptiste Queru
2387857dad am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
* commit '968f20a4c2ffca9a0cf8870bd96c77e65ca61243':
  MIPS support to *.mk files and envsetup.sh
2012-08-10 09:23:42 -07:00
Jean-Baptiste Queru
dd14acc3f6 am e443a9e9: Merge "Modify full_mips-eng build in line with the full-eng build"
* commit 'e443a9e92f323bff5bb304e1baf8b00ed18888be':
  Modify full_mips-eng build in line with the full-eng build
2012-08-10 09:23:38 -07:00
Raghu Gandham
8da4310646 MIPS support to *.mk files and envsetup.sh
Change-Id: Iba4d046e3202524b29cfe32980927f8cc0aa8496
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-08-10 09:15:38 -07:00
Chris Dearman
1603e3a987 Modify full_mips-eng build in line with the full-eng build
Change-Id: Iebbad0c2a4f8f01b2ff8a08ea77965291a842636

Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-08-01 11:04:09 -07:00
Guang Zhu
96d9fa29cd resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp
Change-Id: I4da6c32635e67730ac595a2a04165f12c37c1c15
2012-07-11 19:36:17 -07:00
Guang Zhu
ef1335eda4 use default shell (mksh) in emulator
remove the override to use ash as shell so that mksh is the
default in 'generic' product type

Change-Id: I91d76d0fc522baf5d47096ab19ea264c9b1268e6
2012-07-11 18:35:08 -07:00
Jean-Baptiste Queru
ddb706785b am 5b7633be: am 06e515dd: Merge "This patch addresses the following issues:"
* commit '5b7633be4e107888db7b6fc3d50be6aa8eb7f95c':
  This patch addresses the following issues:
2012-06-12 08:05:22 -07:00
Keun young Park
d3da15a5ee am 6aae80a8: Merge "add mini.mk for common configurations for mini products" into jb-dev
* commit '6aae80a8d500084466c7e6d90769dda9a5b20507':
  add mini.mk for common configurations for mini products
2012-06-06 15:51:24 -07:00
Keun young Park
fd9f8bcfdb add mini.mk for common configurations for mini products
- it is used for generic pdk release

Bug: 6540216

Change-Id: I7dd21724a9484e48c66e4430cd003ffb448f075b
2012-06-06 14:15:57 -07:00
Raghu Gandham
f70dec9281 This patch addresses the following issues:
1. Fix a typo.
2. Include libffi in the MIPS list of Product Packages.
3. Default to JSC for MIPS until the MIPS support in v8 lands in aosp.
2012-06-05 15:33:37 -07:00
Keun young Park
53ba6b22f9 am 15d15136: Merge "change location of apns-conf.xml and vold.conf" into jb-dev
* commit '15d151367482b6ed47cecf1a578b365b7c6ccab3':
  change location of apns-conf.xml and vold.conf
2012-05-30 20:34:00 -07:00
Keun young Park
e581d866fb change location of apns-conf.xml and vold.conf
- from development/data to device/generic/goldfish/data

Change-Id: Iab7ad32b31b64f854412dd3cf23fd244a5306ed9
2012-05-30 16:32:30 -07:00
Jean-Baptiste Queru
fe5d7c788b am a2bfde63: am fed2587c: Merge "dalvik heapsize: Remove obsolete flag, set porperty"
* commit 'a2bfde63b767378979145cb8be55d9a305e2b4f5':
  dalvik heapsize: Remove obsolete flag, set porperty
2012-05-25 07:19:55 -07:00
Bruce Beare
5b21303927 dalvik heapsize: Remove obsolete flag, set porperty
Change-Id: I51360867171aaebce071b3391678ff6e7f191dc5
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2012-05-24 11:38:18 -07:00
Andrew Hsieh
b968c85edf Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86
Change TARGET_ARCH_VARIANT from x86-atom to x86, for the reason
that atom-specific instruciton like "movbe" isn't "generic" to
x86 Android devices and x86 host running emulator-x86, which may
crash non-atom host in VT because "movbe" isn't supported natively.

Also revert previous fix in TARGET_linux-x86.mk which conservatively
disable "movbe" across the board

Change-Id: Ief93a3585566ffae558fcdc29741e6213a048d7d
2012-05-21 14:27:59 +08:00
Jean-Baptiste Queru
44fd5580b5 am 7eb749d1: am 2d7274de: Merge "MIPS generic target support"
* commit '7eb749d134fd52e23be7218bf2ea7dfa1b1180b3':
  MIPS generic target support
2012-05-11 21:53:54 -07:00
Jean-Baptiste Queru
2d7274de30 Merge "MIPS generic target support" 2012-05-11 14:46:38 -07:00
Jean-Baptiste Queru
8ff07372c1 am 0e2bc24e: am cd99ece7: Merge "x86: customize the malloced address to be 16-byte aligned"
* commit '0e2bc24ef002ec612e94a64da297a7698acde749':
  x86: customize the malloced address to be 16-byte aligned
2012-05-11 14:12:10 -07:00
Raghu Gandham
b53cc7a82b MIPS generic target support
Change-Id: I76506eba9d11867e53069c97038996bddd7dd5a2
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
Signed-off-by: Duane Sand <duanes@mips.com>
Signed-off-by: Bhanu Chetlapalli <bhanu@mips.com>
2012-05-08 11:53:47 -07:00
Jack Ren
6f28d9750c x86: customize the malloced address to be 16-byte aligned
That can gain better memory performance than 8-byte alignment

Change-Id: Ibcc5bf7b96ed10166038357dd0c86c9171768f3e
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2012-05-08 13:38:25 +08:00
Jean-Baptiste Queru
0cfde4016d Merge 8664008c to master
Change-Id: Ia6aa11892665b8aa42e5fbc69146db251d9a8636
2012-04-24 14:47:45 -07:00
Andrew Hsieh
ecd054c609 Add goldfish audio hw to board/generic_x86
Without it, app with audio may crash x86 emulator

Change-Id: Ie9b30a2827c0a559e7cf73b7b21604f36c379483
2012-04-20 16:08:14 +08:00
Iliyan Malchev
aad195e79e vbox_x86: add a 256M ext4 cache partition
Change-Id: If88895f60308673526a579a96d5b1ed9206c0241
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-04-19 14:50:10 -07:00
Eric Laurent
55f3f8549f Fix problem with audio policy configuration file.
Having the copy of default audio_policy.conf file in generic_no_telephony.mk
doesn't work because of multiple inheritance on certain products.

Move it to board/generic/device.mk to be consistent with how the audio HAL
modules are managed.

Issue 6333980.

Change-Id: If6053ad596b6f693f43c72ba9cc54cb7a7cfa233
2012-04-13 18:58:20 -07:00
Iliyan Malchev
277e68b3af init.vbox_x86.rc: mount data & cache partitions from /dev/sdb
Change-Id: Ifa14f0be875848297883d2ee66372a355a4174e6
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-04-06 11:04:53 -07:00
Iliyan Malchev
ce7d34ca2c vbox_x86: update init.vbox_x86.rc, remove custom init.rc
-- remove local copy of init.rc (start using system/core/rootdir/init.rc)
-- sync init.vbox_x86.rc with init.goldfish.rc (at SHA
   a503456526359767ffb383a06835308f62172dde)
-- Make the following changes:
   a) add mount calls
   b) remove call to init.goldfish.sh
   c) enable service netcfg
-- inherit frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk

Change-Id: Ic5f6b2da32dc79de85f3d7b93dffb483e480e098
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-04-04 15:33:21 -07:00
Doug Zongker
2c4dc95767 Merge "optional cross-check between OTA radio images and board-info.txt" 2012-03-21 09:47:25 -07:00
Doug Zongker
9296f09277 optional cross-check between OTA radio images and board-info.txt
Adds a python script which checks the version of each radio image
added with the new add-radio-file-checked macro against a file
containing sha-1 -> version string mappings and the contents of
board-info.txt, so that the build can fail if board-info.txt and the
OTA images are out of sync.

Change-Id: Icb61dc2adefc240ced9059941582c23b629089c0
2012-03-21 09:18:15 -07:00
James Dong
e25a5198bb Added media_codecs.xml file to generic_x86 and vbox_x86 configuration files
o related-to-bug: 6132480

Change-Id: I82753468676d3b1ecba892c993de11ef779eed01
2012-03-19 14:11:00 -07:00
Andreas Huber
8fd1541c81 Make sure to copy codec setup files to their proper filesystem location on the emulator
Change-Id: I97b6944646fcabc754526ef88f7fdd63d0d1da0a
2012-03-13 09:01:51 -07:00
Xavier Ducrohet
f66089229b am 85927411: am 590737b6: am 295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '85927411d2e249aab081fc39c838dbc6e2ff93ea':
  Enable HW accelerated view framework for generic_x86 builds.
2012-02-23 07:28:46 -08:00
Todd Poynor
548f646ce4 build: goldfish: add emulator Power HAL
Change-Id: Id6de532d56dabcb8709bb3e331780c8b7f508973
Signed-off-by: Todd Poynor <toddpoynor@google.com>
2012-02-17 16:06:31 -08:00
Xavier Ducrohet
590737b674 am 295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '295cb9bceef599f851db81a3942dc78bdb679fec':
  Enable HW accelerated view framework for generic_x86 builds.
2012-02-16 16:37:51 -08:00
Xavier Ducrohet
295cb9bcee Enable HW accelerated view framework for generic_x86 builds.
Change-Id: Ib3bf3e7c08615c29c0086125552ae1a96a737b89
2012-02-16 16:35:42 -08:00
Ying Wang
d9fc5d6ea9 Remove generic_armv5 board config and product.
Bug: 6015755

We don't need to support ARMv5 in cts for master going forward.
cts is the only component that needs generic_armv5 config.

Change-Id: Iad35f78737dc30faeed247fda0e77d74cb8f815b
2012-02-14 16:50:52 -08:00
Doug Zongker
545b7996cc prefer an explicitly-set TARGET_BOARD_INFO_FILE
Change-Id: Ie667a4d0070d1f0bbdfe9fa6d96871bcceb959b8
2012-01-19 10:43:49 -08:00
Vladimir Chtchetkine
0216925157 am 2cbcd24b: Cherry-picked from e6b969f3b in master. Do not merge.
* commit '2cbcd24ba708be5e387b8bf54351f5c2df7abbec':
  Cherry-picked from e6b969f3b in master. Do not merge.
2012-01-10 16:42:47 -08:00
Vladimir Chtchetkine
2cbcd24ba7 Cherry-picked from e6b969f3b in master. Do not merge.
Add boot property enabling ADBD over QEMU

Emulator and system image now support ADBD communication over QEMUD pipe rather
than over a TCP port forwarding. However, emulator has to know ahead of time
(before system starts booting) whether or not the system image supports ADBD
over pipe to properly setup the communication. For that, we introduce a boot
property "ro.adb.qemu" that is readable by the emulator early enough for the
proper ADB communication setup.

Change-Id: I978489c5acf46177b520e775d745bcc78f469837
2012-01-10 16:31:08 -08:00
Jean-Baptiste Queru
8f8624e61f am 9caacbd7: am 5ea72eff: Use the new location of the emulator kernel
* commit '9caacbd74328624dfc753cecfc42cb29bf14bfad':
  Use the new location of the emulator kernel
2012-01-06 17:41:07 -08:00
Jean-Baptiste Queru
5ea72effbd Use the new location of the emulator kernel 2012-01-06 17:02:24 -08:00
Kenny Root
a8c9594275 Unset HAVE_TLS_REGISTER for ARMv5
Bug: 5763261
Change-Id: I0394daa4cdbad598b91a99e54ca5f830e9ee940b
2011-12-15 10:32:11 -08:00
Vladimir Chtchetkine
e6b969f3bc Add boot property enabling ADBD over QEMU
Emulator and system image now support ADBD communication over QEMUD pipe rather
than over a TCP port forwarding. However, emulator has to know ahead of time
(before system starts booting) whether or not the system image supports ADBD
over pipe to properly setup the communication. For that, we introduce a boot
property "ro.adb.qemu" that is readable by the emulator early enough for the
proper ADB communication setup.

Change-Id: I978489c5acf46177b520e775d745bcc78f469837
2011-12-13 11:31:54 -08:00
Jesse Hall
fa947d04dd am 055cf585: am 615d2ffa: Enable the OpenGL View renderer on the emulator
* commit '055cf585b567af6ced36d7227a2ae921df5782e0':
  Enable the OpenGL View renderer on the emulator
2011-12-12 17:49:18 -08:00
Jesse Hall
615d2ffa92 Enable the OpenGL View renderer on the emulator
If the emulator is run without GL acceleration enabled, the OpenGL
renderer will disable itself at runtime.

Change-Id: Ie40c7895120f51bb6a817c2f3cf7fab0a3dda292
2011-12-12 10:07:04 -08:00
Kenny Root
ab4fbffdfb Use ARM TLS register for emulator
This is dependent on having a kernel that uses CONFIG_HAS_TLS_REG=y
which is enabled in change Ic497e41270a4ad78ca55ab5674b5342e8d939e56

Change-Id: I456c270dd5b4d8fedfb423ac8e363fd37b77f8ce
2011-12-08 08:51:07 -08:00
David Turner
94431144cf emulator: Enable dex-preoptimization in emulator-specific builds
This patch re-enables dex preoptimization in emulator-specific
builds. This considerably speeds up the first-boot of SDK AVDs
since the dex optimization pass is performed during the build
instead.

This was enabled in a previous patch, then reverted due to a
bug in the build system that has been fixed since.

This patch doesn't affect any device build.

Change-Id: I3be8a9c7f51a86029fde30b7d37584cb40b4db69
2011-09-28 22:54:08 +02:00
Vladimir Chtchetkine
cdf5644268 Packages media_profiles.xml file into emulated system image
The file is required by the camera framework to properly set it up to work with
emulated camera devices.

Change-Id: I39686841030d21ef23775972aa4ee0ecd7a91c02
2011-09-21 11:01:59 -07:00
Brian Muramatsu
6824d81a00 am ae55f41c: am 89ba0f7e: am 1615c2fc: Rename generic_arm5 to generic_armv5
* commit 'ae55f41c5d74b1aa58ef5015c613541e77f55034':
  Rename generic_arm5 to generic_armv5
2011-09-09 12:04:29 -07:00
Brian Muramatsu
164285e05f am 8658fa51: am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5
* commit '8658fa51d15290cf43178d0633b53f11ff08a4aa':
  Disable Dexpreopt for generic_arm5
2011-09-09 12:04:27 -07:00
Brian Muramatsu
c5c2865751 am 5d16ff13: am 372a1e0b: am 31e27eeb: generic_arm5 product
* commit '5d16ff13d7c6c3da38ba29a412d535221cee7a60':
  generic_arm5 product
2011-09-09 12:04:25 -07:00
Brian Muramatsu
ae55f41c5d am 89ba0f7e: am 1615c2fc: Rename generic_arm5 to generic_armv5
* commit '89ba0f7e62e94fbe010bcf9aab3e1be035ffb44a':
  Rename generic_arm5 to generic_armv5
2011-09-08 11:15:38 -07:00
Brian Muramatsu
89ba0f7e62 am 1615c2fc: Rename generic_arm5 to generic_armv5
* commit '1615c2fcb60c7164cd8629e8c78cef551ebd329a':
  Rename generic_arm5 to generic_armv5
2011-09-08 11:13:50 -07:00
Brian Muramatsu
1615c2fcb6 Rename generic_arm5 to generic_armv5
Bug 5267392

Change-Id: I5129d5ba283e711a2cb5840fc0c9b707f653936a
2011-09-08 10:36:53 -07:00
Brian Muramatsu
8658fa51d1 am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5
* commit '9d014e6570deb3861b503833823e56e1c589626c':
  Disable Dexpreopt for generic_arm5
2011-09-08 10:26:29 -07:00
Brian Muramatsu
9d014e6570 am 9353a3be: Disable Dexpreopt for generic_arm5
* commit '9353a3be5fca8a83c3a60e890fbca323f9fb0e04':
  Disable Dexpreopt for generic_arm5
2011-09-08 10:24:14 -07:00
Brian Muramatsu
9353a3be5f Disable Dexpreopt for generic_arm5
Bug 5267392

After coming across another place where I would have to use
package.apk.unaligned, I decided maybe it is best to just
disable dexpreopt as was previously suggested.

Use package.apks in the CTS Makefile task.

Change-Id: Iec839a72f4b53441337523b8a9cccda657eec8e8
2011-09-07 18:12:22 -07:00
Brian Muramatsu
5d16ff13d7 am 372a1e0b: am 31e27eeb: generic_arm5 product
* commit '372a1e0ba362ba509d44a1ed4b8eb554b1da7180':
  generic_arm5 product
2011-09-07 17:13:30 -07:00
Brian Muramatsu
372a1e0ba3 am 31e27eeb: generic_arm5 product
* commit '31e27eebc3108d788d040228e5143df3e87b1424':
  generic_arm5 product
2011-09-07 17:12:16 -07:00
Brian Muramatsu
31e27eebc3 generic_arm5 product
Bug 5267392

Copied the prior generic product but tried to include
Makefiles from the generic product when possible to
avoid drifting.

Change-Id: I7893adb65c37c1257bcb5224848f4cd7cd93d2f9
2011-09-07 16:12:38 -07:00
David 'Digit' Turner
9d99d7dfb8 resolved conflicts for merge of 6da54b6e to master
Change-Id: Ic1e08fffacb66e8006877b7b5c51e9e7f03d39a2
2011-08-26 00:53:34 +02:00
David 'Digit' Turner
6da54b6e0e resolved conflicts for merge of 7be88d00 to honeycomb-plus-aosp
Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
2011-08-25 23:23:32 +02:00
David 'Digit' Turner
43dd89d2a0 emulator: Enable GLES emulation libraries
This patch enables the build of OpenGLES emulation libraries
(both in the guest and the host) for any emulator-specific
product config.

+ update core/main.mk to ensure that the right path is parsed
  when building the Windows SDK

Change-Id: Ifde047f8c0ef922504a7286c8c5b57f7c79c71f8
2011-08-23 22:25:13 +02:00
Jeff Brown
e33ba4c49e Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62
2011-07-11 23:51:37 -07:00
David 'Digit' Turner
4b65598642 emulator: Enable dex-preoptimization
Backport from AOSP master.

This enables the Dex pre-optimization for emulator-specific builds.
The idea is to speed up the initial boot sequence of an SDK AVD by
avoiding the costly on-device preopt pass that is performed otherwise
the first time the AVD is launched.

Benchmarking shows reductions in first boot time from 1m30s to 40s
on a 2.4GHz Xeon when emulating the AOSP master ToT.

Change-Id: Ibf5ebe68aa4d363c9df05d2ffe7cb828ef99f922
Orig-Change-Id: I67a9ce9791220c202817864c6e83dc8fd9cbc027
2011-07-08 00:01:11 +02:00
David 'Digit' Turner
c7e3877dad emulator: Build emulator platform images as ARMv7-A
Backport from AOSP master.

Now that the emulator supports proper ARMv7 emulation, switch to
building all emulator-specific platform images using this instruction
set, in order to benefit from the noticeable speed boost provided by
Thumb-2 instructions.

Note that we don't build with NEON support because emulated NEON
instructions are currently slow, though they work.

IMPORTANT: You need to have the following emulator patch in your tree
           in order to start these platform builds easily:

           https://review.source.android.com//#change,23798

Otherwise, the alternative is to do these things:

   1/ Telling the emulator to emulate an ARMv7-A CPU, instead of
      an ARMv5TE one. This is normally done with "-qemu cortex-a8"

   2/ Using an ARMv7-A capable kernel image, which is available and
      usable with -kernel prebuilt/android-arm/kernel-qemu-armv7

Note that the emulator has a special hack that automatically enables
1/ if 2/ is being used (i.e. if the kernel image name ends with -armv7,
then emulate an ARMv7-A CPU automatically).

So in reality, only 2/ is required.

Change-Id: Id3ac7cdbda892e519af98aff1f02136f344406b8
Orig-Change-Id: I5c0245ba5e6a2bc34d0d49b2c024fffd317a5eed
2011-07-07 23:46:50 +02:00
Bruce Beare
f844ec96dd x86: qemu emulator is the default build target
Change-Id: I200536d2d997eda6a6e62eaa9050269e3c7ff6c4
Orig-Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
2011-07-07 03:45:57 +02:00
Jean-Baptiste Queru
79feb857d0 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: I7f8254bf8c1177594fbdfbdb082bdc429a4a5b25
Orig-Change-Id: Ieb1f4ed47988c8fff119ff53f1f374032da3752d
2011-07-07 03:45:57 +02:00
Bruce Beare
f7f5479b56 generic_x86 builds don't need/use the sparse ext4 format.
Orig-Change-Id: I62973b131a728c3862be4642e2d49d0fa61555ac
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07 03:45:56 +02:00
Bruce Beare
594519e655 Use ext4 file system for generic_x86 userdata partition
Orig-Change-Id: I05710c2bda521b35712513bc219fc73ed00e4617
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07 03:45:56 +02:00
David 'Digit' Turner
88d929b9e4 GB Updates for init.rc and boot command line
Change-Id: Iae0f5b1eda109f99be6c484082abebc7b51adf51
Orig-Change-Id: I0638c8834fccbdc94ec99e7592a75b6972cb53b8
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07 03:45:56 +02:00
Bruce Beare
28290a0cec Move buildspec vars to BoardConfig.mk
Orig-Change-Id: I48ed4b55e91aae51076d9c609b44bf9fa24c3ecd
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2011-07-07 03:45:56 +02:00
Bruce Beare
f7661706b0 Allow TARGET_ARCH to be set from BoardConfig.mk
Orig-Change-Id: I66aed78b763d238719822257c1f4f35301247df6
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07 03:45:56 +02:00
Jean-Baptiste Queru
bf6bb50f31 Revert "resolved conflicts for merge of 972433bd to master"
This reverts commit 5d0ec1aebb, reversing
changes made to 4839e47309.
2011-06-24 08:48:31 -07:00
David 'Digit' Turner
5d0ec1aebb resolved conflicts for merge of 972433bd to master
Change-Id: I1320aa02110af4b1cf25d2afde1bd4b587fcb10f
2011-06-24 13:45:26 +02:00
David 'Digit' Turner
972433bdad am 18447019: am 4b227c70: am f9f83ed1: Merge "emulator: Enable dex-preoptimization"
* commit '1844701942de578bab6c7f17e14ef695bb8ed7c1':
  emulator: Enable dex-preoptimization
2011-06-23 05:28:08 -07:00
David 'Digit' Turner
456d16cb89 emulator: Enable dex-preoptimization
This enables the Dex pre-optimization for emulator-specific builds.
The idea is to speed up the initial boot sequence of an SDK AVD by
avoiding the costly on-device preopt pass that is performed otherwise
the first time the AVD is launched.

Benchmarking shows reductions in first boot time from 1m30s to 40s
on a 2.4GHz Xeon when emulating the AOSP master ToT.

Change-Id: I67a9ce9791220c202817864c6e83dc8fd9cbc027
2011-06-22 23:23:46 +02:00
David 'Digit' Turner
1ccb41ee12 am 1c5df439: am 4f9479bf: am 683e8e17: am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"
* commit '1c5df4396b581df771212ffad891e970702f97c9':
  emulator: Build emulator platform images as ARMv7-A
2011-06-21 15:27:10 -07:00
David 'Digit' Turner
1c5df4396b am 4f9479bf: am 683e8e17: am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"
* commit '4f9479bfdbc38e9bc06a5cf0a4bf67214fb358a8':
  emulator: Build emulator platform images as ARMv7-A
2011-06-20 09:10:58 -07:00
David 'Digit' Turner
5f5056f503 emulator: Build emulator platform images as ARMv7-A
Now that the emulator supports proper ARMv7 emulation, switch to
building all emulator-specific platform images using this instruction
set, in order to benefit from the noticeable speed boost provided by
Thumb-2 instructions.

Note that we don't build with NEON support because emulated NEON
instructions are currently slow, though they work.

IMPORTANT: You need to have the following emulator patch in your tree
           in order to start these platform builds easily:

           https://review.source.android.com//#change,23798

Otherwise, the alternative is to do these things:

   1/ Telling the emulator to emulate an ARMv7-A CPU, instead of
      an ARMv5TE one. This is normally done with "-qemu cortex-a8"

   2/ Using an ARMv7-A capable kernel image, which is available and
      usable with -kernel prebuilt/android-arm/kernel-qemu-armv7

Note that the emulator has a special hack that automatically enables
1/ if 2/ is being used (i.e. if the kernel image name ends with -armv7,
then emulate an ARMv7-A CPU automatically).

So in reality, only 2/ is required.

Change-Id: I5c0245ba5e6a2bc34d0d49b2c024fffd317a5eed
2011-06-16 00:27:26 +02:00
Ying Wang
dc31d76b5d Use TARGET_BOARD_INFO_FILE to locate board-info.txt
So board-info.txt can be inherited from the parent device.

Change-Id: I5d99a2483b9a325e475f3c602d9e0f5d2b95e80c
2011-06-13 17:36:08 -07:00
Jean-Baptiste Queru
772a0f6794 Switch to mksh as the default shell.
Switch the emulator builds to ash to make sure it still
works, in case we find that we need to go back to using ash.

Change-Id: Id5641940b63cc4225011be1c375f4c86ec4d21cc
2011-05-18 13:49:08 -07:00
Dima Zavin
7f966f5a63 board/generic: pull in the goldfish audio hw
Change-Id: I8d38ca07951f35e71e700406589a8d021852ff31
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-26 20:13:45 -07:00
Vladimir Chtchetkine
2aced2dc94 Fix ADB, and a typo in BoardConfig.mk
Added an instruction to copy init.vbox_x86.rc to the output's root.
This is required to properly setup networking and other stuff inside
the emulator.

Change-Id: I84b11b048120a59109aa95d4f18d496a3c874911
2011-04-05 17:28:43 -07:00
Vladimir Chtchetkine
47113792e5 Increate system image size for vbox_x86 target
Default system image size of 128M is too small to contain
everything to run Android in VBox.

Change-Id: I1d08051e170817c846660d88203908d090fc4652
2011-04-04 13:41:16 -07:00
Vladimir Chtchetkine
cd4801a07c Fix the build
Change-Id: I9eedff42d4855c1f2668509cc19d388735fb57aa
2011-04-04 09:48:48 -07:00
Vladimir Chtchetkine
78305ea16f Fix build scripts for vbox_x86 target
Change-Id: Ia1f2bf9f05fcd8f07b240e15c7c01a80c6ca6829
2011-04-01 08:24:25 -07:00
Raphael
9b4660a1c6 resolved conflicts for merge of db0d59d1 to honeycomb-plus-aosp
Change-Id: Ie3f5b2986bc926407a7883b449441cb58ab70e30
2011-03-25 15:13:55 -07:00
Bruce Beare
08ee4287cc x86: qemu emulator is the default build target
Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
2011-03-24 10:55:22 -07:00
Bruce Beare
18a130e98a x86: qemu emulator is the default build target
Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
2011-03-15 07:47:48 -07:00
Iliyan Malchev
b375e71d30 build: remove prelinker build build system
This patch removes support for prelinking from the build system.  By now, the
prelinker has outlived its usefulness for several reasons.  Firstly, the
speedup that it afforded in the early days of Android is now nullified by the
speed of hardware, as well as by the presence of Zygote.  Secondly, the space
savings that come with prelinking (measued at 17MB on a recent honeycomb
stingray build) are no longer important either.  Thirdly, prelinking reduces
the effectiveness of Address-Space-Layout Randomization.  Finally, since it is
not part of the gcc suite, the prelinker needs to be maintained separately.

The patch deletes apriori, soslim, lsd, isprelinked, and iself from the source
tree.  It also removes the prelink map.

LOCAL_PRELINK_MODULE becomes a no-op.  Individual Android.mk will get cleaned
separately.  Support for prelinking will have to be removed from the recovery
code and from the dynamic loader as well.

Change-Id: I5839c9c25f7772d5183eedfe20ab924f2a7cd411
2011-03-12 14:59:46 -08:00
David Turner
6b11b58a4a am dfa82c43: am faa68200: Merge "x86: Add in the VirtualBox emulator as a separate build target"
* commit 'dfa82c438f5557c5bae3b8f8ae2dc8444edc8036':
  x86: Add in the VirtualBox emulator as a separate build target
2011-03-05 09:20:33 -08:00
Ying Wang
cdd1dc0a6f am 1fe8c892: am 65265492: Don\'t clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
* commit '1fe8c89298df6433c2f70b8ae093b90bd12eb760':
  Don't clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
2011-03-02 12:54:55 -08:00
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