Merge commit '77070aa757806d1617d707db4d2bd7931b2353fc'
* commit '77070aa757806d1617d707db4d2bd7931b2353fc':
Turn dalvikvm host builds on by default when linux is the host OS.
Merge commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e' into gingerbread-plus-aosp
* commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e':
Turn dalvikvm host builds on by default when linux is the host OS.
Previously host builds were only enabled under user and user-debug
builds. This will make it easier for Androids to find out if they've
inadvertently broken host compatibility in native code.
Change-Id: Id1f2d5e189c4c1b6462fe03bab1b0f75e98a599c
Merge commit '1020d271c67b062e95b61c4eb9f1f5168e2b6197' into gingerbread-plus-aosp
* commit '1020d271c67b062e95b61c4eb9f1f5168e2b6197':
Add new downloads UI to core build.
Merge commit 'c05d0000bb3e91a21c2cc7cbd85232f1afc7a8d2' into gingerbread-plus-aosp
* commit 'c05d0000bb3e91a21c2cc7cbd85232f1afc7a8d2':
Only turn host build on for linux
Merge commit '852f43bd29da34ff15799b88c3db166428cea6d8' into gingerbread-plus-aosp
* commit '852f43bd29da34ff15799b88c3db166428cea6d8':
Include dalvik+libcore dependencies in core product definitions.
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
Since host module tag is defaulted to optional now, we have to explicitly
add those modules to the SDK product config file.
Change-Id: I8f6c4dcb17ef7716ae3590d6e96ddd5d07cc0582
Merge commit '85fd5030b11d412f345b0ed039aa9912c7973aea' into gingerbread-plus-aosp
* commit '85fd5030b11d412f345b0ed039aa9912c7973aea':
Revert "Fixed problem with keymap files copied to target"
Merge commit '8abb5cc10f295940e6706c72e2e0c93bf0de01e8'
* commit '8abb5cc10f295940e6706c72e2e0c93bf0de01e8':
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
Merge commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410' into gingerbread-plus-aosp
* commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410':
Build without OpenCore by default, remove obsolete opt-in to stagefright.
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
Merge commit 'f7a6ead075a9b1edc85eeeca646ced42f112f331'
* commit 'f7a6ead075a9b1edc85eeeca646ced42f112f331':
For the generic board, set /system/bin/sh to mksh to test the transition
By inheriting from full, this will be more self-maintaining, and
automatically gets a better-configured variant (e.g. it has locales,
a date format, etc...).
Change-Id: I67b6c2d9f9b7d20cb89154906c3f3d6a5391c838
Merge commit 'c9d118615161d8b94d4abedac86e3bdf510b251b'
* commit 'c9d118615161d8b94d4abedac86e3bdf510b251b':
Allow TARGET_ARCH to be set from BoardConfig.mk
Merge commit '6f2bb44b4b3551738c429a25f99e42aca8913f4f'
* commit '6f2bb44b4b3551738c429a25f99e42aca8913f4f':
Use stagefright (instead of OpenCore) authoring engine by default
Merge commit 'c1ab82ae6b26d12cf6d5cdad1bd0ffc0d3acfb9b' into gingerbread-plus-aosp
* commit 'c1ab82ae6b26d12cf6d5cdad1bd0ffc0d3acfb9b':
Use stagefright (instead of OpenCore) authoring engine by default
Merge commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e'
* commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e':
Remove now unnecessary property overrides to opt into stagefright.
Merge commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a' into gingerbread-plus-aosp
* commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a':
Remove now unnecessary property overrides to opt into stagefright.
Merge commit 'c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6' into gingerbread-plus-aosp
* commit 'c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6':
Add a tapas command.
Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
Merge commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1' into froyo-plus-aosp
* commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1':
Add a tapas command.
Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
Added "TARGET_CPU_SMP := true" to simulator configuration, since it's
likely the simulator will be running on SMP hardware.
Change-Id: I7527895abe70ffaece5c52fd3ffcfe4b0d698fd2
Merge commit '0c5363c8571eef11eeb21a575da941565c34191e' into kraken
* commit '0c5363c8571eef11eeb21a575da941565c34191e':
Add QuickSearchBox to the SDK build.
Merge commit '8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7' into froyo-plus-aosp
* commit '8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7':
Add QuickSearchBox to the SDK build.
With this CL, run "make APP-{appname}" to build unbundled app in
the unbundled app src tree.
See http://b/issue?id=2667113
Change-Id: I1d753db795142508bc841ae66b4408220ab687c5
Merge commit 'bc12cd04b878a9c3520abd21600c2078c930adc3' into kraken
* commit 'bc12cd04b878a9c3520abd21600c2078c930adc3':
Use a different kernel boot line for the disk installer.
Use a property to enable the eth0 LAN port on the emulator
Merge commit 'f9e275b0c785aa8ed83606e5b98f37d2050a528e' into kraken
* commit 'f9e275b0c785aa8ed83606e5b98f37d2050a528e':
Add support for x86 VirtualBox Emulation
Merge commit 'ae4e14556bb3a789c4263ebba7ed42b3035e13f6' into kraken
* commit 'ae4e14556bb3a789c4263ebba7ed42b3035e13f6':
Adapt to new location of libcore
Make expr more POSIXy
generic_x86 support
Remove obsolete machine-setup.html reference.
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>
Merge commit '19e9fff37e4d3309557d07cf963dc577ca49fcf0' into kraken
* commit '19e9fff37e4d3309557d07cf963dc577ca49fcf0':
Add camera sounds to the emulator system image build.
Merge commit '74134a503fc908b28ad0ff87e1291698fbceb9cf' into froyo-plus-aosp
* commit '74134a503fc908b28ad0ff87e1291698fbceb9cf':
Add camera sounds to the emulator system image build.
Merge commit 'f96cb307e3c6d0eb08fd3e4a17d1d1af7c46d385' into froyo-plus-aosp
* commit 'f96cb307e3c6d0eb08fd3e4a17d1d1af7c46d385':
Add Protips to all builds.
While the generic config is limited by its need to be inherited
by various configurations, the full config can afford some extra
settings by virtue of being essentially a "leaf" config (though
obviously it can be conbined with hardware-specific configurations
to run on specific devices).
Bug: 2533998
Change-Id: Ia95f0ce5305ada4ae6cdf69911fa9a0eeabf0900
Alas, poor AlarmClock! I knew, him, Froyo: a fellow
of infinite alarm, of most excellent punctuality: he hath
warned me of a meeting a thousand times, and now, how
abhorred in my build it is! My Droid rings at
it. Here hung those beeps that I have snoozed I know
not how oft. Where be your chimes now? Your
roosters? Your songs? Your flashes of alert,
that were wont to set the table on a buzz? Not one
now, to post your own notification? Quite ongoing?
commit b03d5f537dee393affddf89663ae6977a5512d98
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 17 14:00:37 2009 -0800
Update cleanspec to facilitate incremental building with full stagefright lib.
commit b92560a1989f8b9cb27a8772cec5346d3d90dc84
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 17 13:31:48 2009 -0800
Enable building stagefright in all builds, make stagefright the default player.
Merge commit '6f6b2090cfb981b0c52b0c9271753968a6e94cc2'
* commit '6f6b2090cfb981b0c52b0c9271753968a6e94cc2':
Add the LiveWallpaper sample as prebuilt to the SDK system image.
Merge commit 'c1cd624b3a4c0528ea386a12f20b6049f12c3858'
* commit 'c1cd624b3a4c0528ea386a12f20b6049f12c3858':
Add gallery to the SDK build now that it's split from the Camera app.
Merge commit '35b84b287f9cba2d098d28eb0e3b44abd6ae131a' into eclair-mr2
* commit '35b84b287f9cba2d098d28eb0e3b44abd6ae131a':
Overwrite android-info instead of appending to it
Merge commit '2b80317be27e5450d7212b10777992d782dcf90e' into eclair-mr2
* commit '2b80317be27e5450d7212b10777992d782dcf90e':
only auto-generate board= requirement if a board-info file is not specified
Merge commit '743c19373a1c78bf2cc4d1c0dfd905e27ff598c6' into eclair
* commit '743c19373a1c78bf2cc4d1c0dfd905e27ff598c6':
Add TTS files and Accessibility app to the SDK system image.
Merge commit '981bafb11bf73806f78676d7a1bdc98e3c92bd16'
* commit '981bafb11bf73806f78676d7a1bdc98e3c92bd16':
AI 150131: Remove English/Chinese IME from OpenWnn.
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.
Merge commit '0347423753fb5d7207aa1ea93a8429f59468eb41'
* commit '0347423753fb5d7207aa1ea93a8429f59468eb41':
build 'updater' binary for use in OTA packages
Add VpnServices to PRODUCT_PACKAGES.
Merge commit 'fcae4f838d75fd3352198ac1c881cc1c97f51aab'
* commit 'fcae4f838d75fd3352198ac1c881cc1c97f51aab':
Adding TtsService and PicoTts so they get included.
WebSearchProvider is an open implementation of fetching suggestions and
launching searches to third party web search engines. This should be
available along with GoogleSearch in all builds which include the
GoogleSearch package.
Merge commit '663c2cadef9a52dd1a9025f1fe22c5d84a3e004f'
* commit '663c2cadef9a52dd1a9025f1fe22c5d84a3e004f':
AI 147564: Merge back from search branch to donut. Notes:
- all public apis and framework changes have been reviewed by relevant folks in our branch (e.g romainguy)
- all new public apis are @hidden; they will still get reviewed by api council once we're in git
- other than that, it's mostly GlobalSearch and search dialog stuff, a new apps provider, and some tweaks
to the contacts provider that was reviewed by jham
Automated import of CL 147564
all of the builds. Fix that.
We really need to get this generic_with_google product out of
build/target and into vendor/google, but that can come later.
Original author: joeo
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146824
all of the builds. Fix that.
We really need to get this generic_with_google product out of
build/target and into vendor/google, but that can come later.
Original author: joeo
Merged from: //branches/cupcake/...
Automated import of CL 146738
all of the builds. Fix that.
We really need to get this generic_with_google product out of
build/target and into vendor/google, but that can come later.
BUG=1786404
Automated import of CL 146687
framework classes to deal with the new property. Also update various
documentation that mentions the default ringtones.
Use the build property as the default alert when the user has not chosen
an alert for an alarm. This is also used if the alarm alert is null when
the alarm fires.
BUG=1723684
Automated import of CL 145870
Jesse Wilson