Bug 2814482
Froyo's cts.mk was missing two lines added to Eclair's cts.mk that
are needed to build the accessibility tests and apk.
Change-Id: I05f93bc0a56b2ec1e07eab8c7a15ef7d4bb90d18
Merge commit '38d2e1dacd7c69f980a03184084469b5096edd9e' into gingerbread-plus-aosp
* commit '38d2e1dacd7c69f980a03184084469b5096edd9e':
docs: modify redirect link text
Merge commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f' into gingerbread
* commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f':
docs: modify redirect link text
Merge commit 'de6a08576487b949180c1b0ed1c19e9f7f4ef787' into gingerbread-plus-aosp
* commit 'de6a08576487b949180c1b0ed1c19e9f7f4ef787':
Fix broken interaction of JarJar and Emma.
Remove all zsh compatibility code and related comments.
Display a warning when other shell is used, to prevent the illusion
that building under Zsh is supported when it's not.
Change-Id: Ie6d43ace3a30bde99aad45b00d25007ac28d5155
JarJar, like DX, can't handle the local var corruption that Emma
performs. To fix this, I'm moving the JarJar step before the Emma
step.
Couple other minor changes:
* Improved the comment about emma hardcoding its output filename,
since this took me about an hour to track down.
* Changed one line from "Copying $<" to "Copying $@". It seems to be
the convention that such lines print the destination, not the
source, so I made it consistent.
Change-Id: I9f5c36b4f5af15daf15025b89860e942f15bb668
Merge commit '2b8ba2fa20505630fbbafaf04d20e8c6d05f3b25' into gingerbread-plus-aosp
* commit '2b8ba2fa20505630fbbafaf04d20e8c6d05f3b25':
Clean up warnings in soslim
Merge commit 'd05a47c00ec3595b25ef9f46cd8b825cd35a8dca'
* commit 'd05a47c00ec3595b25ef9f46cd8b825cd35a8dca':
Add $(TARGET_DEVICE_DIR)/system.prop to be a prerequisite
If $(TARGET_DEVICE_DIR)/system.prop exists, it should be
a prerequisite of $(INSTALLED_BUILD_PROP_TARGET),
as the following rules state.
Change-Id: Ie395b6f08cef198c3f5c733a5b6ae5a458335a9c
When copying files from file systems that support high resolution
mtime, we should not truncating the nsec part. Instead we should
increase the dst mtime by one sec to prevent dst mtime to become less
than src mtime.
Change-Id: I5cab1edd4b9783ec0e3ceb04ed833d8bbba00b19
Merge commit 'd5d6095552912726f70e4a357584150c77a819e9'
* commit 'd5d6095552912726f70e4a357584150c77a819e9':
Manual merge of change 50994 from master (DO NOT MERGE)
Merge commit '750ac4f3a43dfbb66e45517ce2502858daeab1a9' into gingerbread-plus-aosp
* commit '750ac4f3a43dfbb66e45517ce2502858daeab1a9':
Manual merge of change 50994 from master (DO NOT MERGE)
Merge commit '6069db77bbd93bdf2a4635a8a7d2ccfb90f0fa75'
* commit '6069db77bbd93bdf2a4635a8a7d2ccfb90f0fa75':
Add full-eng instead of generic-eng in the lunch menu
Merging from master because I'm bringing my maps API work into
gingerbread.
Fix and enable JarJar in Java builds.
java.mk contained a target to enable JarJar in Java builds, but it was
being bypassed. This change enabled JarJar as part of the build
process, and fixes a slight bug with the way it was set up.
Change-Id: I814e64eb30b41bf249a63d683c03040e2658fe0d
Move the image sizes into a more generic key-value file. Make them
optional. Add additional key/value pairs describing what kind of
filesystem the device uses. Pass new fs-type-related arguments in
edify scripts when mounting and reformatting partitions.
Don't include all the init.*.rc files from the regular system in
recovery -- they aren't needed, and break recovery on some devices.
Change-Id: I40e49e65f0d76f735259e4b4fef882322cd739da
Merge commit '8160d9316afc9e653ab93e14a347ef6789a0ebed'
* commit '8160d9316afc9e653ab93e14a347ef6789a0ebed':
Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
Merge commit '7d735133cd6f019ce839fa824f4507f19aff2e8f' into gingerbread-plus-aosp
* commit '7d735133cd6f019ce839fa824f4507f19aff2e8f':
Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
Merge commit '6f88d2b974eb0fef48cc4cb7f236dd2b9f449780'
* commit '6f88d2b974eb0fef48cc4cb7f236dd2b9f449780':
Change branch name to gingerbread, to match reality - DO NOT MERGE
Jean-Baptiste Queru