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
