Commit graph

44 commits

Author SHA1 Message Date
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
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
44fd5580b5 am 7eb749d1: am 2d7274de: Merge "MIPS generic target support"
* commit '7eb749d134fd52e23be7218bf2ea7dfa1b1180b3':
  MIPS generic target support
2012-05-11 21:53:54 -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
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
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
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
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
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
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
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
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
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
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
Chih-Chung Chang
b9e030e52d Set no camera default for emulator/generic/sim builds.
Change-Id: I3c75d093bb48a9d10952d587c3e48bbcc227f139
2010-05-10 15:00:39 +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
b6c1cf6de7 Initial Contribution 2008-10-21 07:00:00 -07:00