* commit '2e94aa25d458e96d6503b88c52e81c65fb34a9d0':
docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by default, and apply 200 to the Resources tab.
This actually affects only
the SDK tab, which previously did not allow resizing---now it does.
Also add a couple new templates to allow either 190 or 200 pixel-wide
side navigation by default, and apply 200 to the Resources tab.
Change-Id: I4555c496088dd8aac77f9aa01273c3a1d52f89e0
Merge commit '9d32bd5b03c92e9220ff6cca029a587f5f3c754c' into gingerbread-plus-aosp
* commit '9d32bd5b03c92e9220ff6cca029a587f5f3c754c':
docs: css tweak to Ps in sidebox. DO NOT MERGE.
Merge commit 'c0aa1e1b305d85baef1dcedabbea1d084f3ed54a' into gingerbread-plus-aosp
* commit 'c0aa1e1b305d85baef1dcedabbea1d084f3ed54a':
remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
Merge commit 'bb2b82bd557b157fea5e280ef50ee782d15ac032' into gingerbread-plus-aosp
* commit 'bb2b82bd557b157fea5e280ef50ee782d15ac032':
Fix userdata partition's ext4 mount point to data.
Merge commit '8317e66433903badaec8ebd2b9ec2b8153f3d612'
* commit '8317e66433903badaec8ebd2b9ec2b8153f3d612':
make info_dict and GetTypeAndDevice available to device extensions
Merge commit '96a57e737707d05333dced5b657c4ef21c44088a' into gingerbread-plus-aosp
* commit '96a57e737707d05333dced5b657c4ef21c44088a':
make info_dict and GetTypeAndDevice available to device extensions
Merge commit '954a5e606ba6af5aef514c2c4c0d3ea2554b48f9'
* commit '954a5e606ba6af5aef514c2c4c0d3ea2554b48f9':
Add a workaround for a platform JAR parsing bug.
Merge commit 'e7f8140e6df19840a6f2c4bc7063cc6c484b140f' into gingerbread-plus-aosp
* commit 'e7f8140e6df19840a6f2c4bc7063cc6c484b140f':
Add a workaround for a platform JAR parsing bug.
Merge commit '7978d50edb9c4da0b8f4076412f092418da6e372' into gingerbread
* commit '7978d50edb9c4da0b8f4076412f092418da6e372':
Add a workaround for a platform JAR parsing bug.
The java.util.jar implementation through Android 1.6 has a
bug where if the signature file in META-INF is a multiple
of 1024 bytes, it will throw an IOException attempting to
read it.
If signapk would produce a CERT.SF in a multiple of 1024
bytes, add an extra CRLF to the end of the file.
Bug: 3019677
Change-Id: I23d4a36e12e224be600d3ac39379b5b5a022a628
Merge commit '780c2372706c5250079cb7d759f6530691dd9143' into gingerbread-plus-aosp
* commit '780c2372706c5250079cb7d759f6530691dd9143':
accommodate both new and old target-files when creating incrementals (do not merge)
Merge commit 'c0434ac8b504df8a2f2a2828dc9b3f804c3dda72' into gingerbread-plus-aosp
* commit 'c0434ac8b504df8a2f2a2828dc9b3f804c3dda72':
add recovery.fstab as dependency so it triggers rebuild (do not merge)
Make recovery image depend on the fstab file so it gets rebuilt when
fstab changes. Add support for "emmc" fstab partition type to
edify_generator.
Change-Id: Ic5df4e86c24321bf7d82a644e3e4770352e4f64b
Include the recovery.fstab file in the recovery image. Remove the
global fs_type and partition_type values from the target-files
key/value dict, and parse the recovery.fstab file instead to find
types for each partition.
(Cherrypicked from gingerbread w/some edits to resolve conflicts.)
Change-Id: Ic3ed85ac5672d8fe20280dacf43d5b82053311bb
Merge commit '258bf46ea6bb4f25d01fab1b783238589e5bbec4' into gingerbread-plus-aosp
* commit '258bf46ea6bb4f25d01fab1b783238589e5bbec4':
support for per-partition fs_type (do not merge)
Include the recovery.fstab file in the recovery image. Remove the
global fs_type and partition_type values from the target-files
key/value dict, and parse the recovery.fstab file instead to find
types for each partition.
Change-Id: I35ee2dd0989441dc2a704b63c1b32e598049acb5
Merge commit '918ccff37260270d0eef3a3a7bfc2410c46d931a' into gingerbread-plus-aosp
* commit '918ccff37260270d0eef3a3a7bfc2410c46d931a':
consolidate target_files metadata into one key-value file
Instead of separate files for recovery api version, tool extensions,
and mkyaffs2 options, put those all in the generic key-value file.
Change-Id: Ib642311632844d52e4895fd4747093fc7e86232d
Merge commit 'c77a9ad444d49e2ad777678cf5671f0a94f44ffb' into gingerbread-plus-aosp
* commit 'c77a9ad444d49e2ad777678cf5671f0a94f44ffb':
store user-visible image sizes in target-files
Do the yaffs-specific adjustments to image sizes in common.CheckSize,
instead of baking it into the image size stored in the target-files
package. Remove the special fs_type flag and fold it into the
"info_dict" we have for saving key-value pairs from the build system.
Change-Id: I6e63f3330f6277d9a946b22e66cadeb51203ba14
Merge commit '8e8ff4cad905a5b4eed7659152f075f9a5c038b1' into gingerbread-plus-aosp
* commit '8e8ff4cad905a5b4eed7659152f075f9a5c038b1':
support for ext4/EMMC in target_files and OTA generation
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: Ic1c651f754ed00ba1cffe8cf56c43f7f3b0ebfd7
Merge commit '6022a9786f745dc41f92e71e16b5b95a7cfd81b7' into gingerbread-plus-aosp
* commit '6022a9786f745dc41f92e71e16b5b95a7cfd81b7':
DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off.
Merge commit '27ce8811835e9bbc9e230a618e883d30d0101c9e' into gingerbread-plus-aosp
* commit '27ce8811835e9bbc9e230a618e883d30d0101c9e':
DO NOT MERGE - Remove extra printf
Merge commit '25ab3dcce40bc2d19eeb99c7b36eeab52e4fa582' into gingerbread-plus-aosp
* commit '25ab3dcce40bc2d19eeb99c7b36eeab52e4fa582':
DO NOT MERGE - Add a -knowntags option to droiddoc
This lets us remove the special cases in Comment.java and specify additional
tags to not warn about for the big docs build.
Change-Id: I25ad651616f162919c56daa2d4bdf6333c9dd87d
Merge commit 'ea5d7a9de7660bef5b9c68f6372a92d4b2f2f1f6' into gingerbread-plus-aosp
* commit 'ea5d7a9de7660bef5b9c68f6372a92d4b2f2f1f6':
move File and Difference classes into common script
This makes them accessible from device-specific extensions (so they
can be used to send radio images as binary patches, for instance).
Change-Id: I2f2174b93b4265abf9400f9e5a0982caca0771e9
Merge commit '9314823c06d4434bf18d589c2fdea490428becf8'
* commit '9314823c06d4434bf18d589c2fdea490428becf8':
return to using subprocess for running commands
Merge commit '93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9' into gingerbread-plus-aosp
* commit '93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9':
return to using subprocess for running commands
Reverts Ic4f1c747 and fixes the problem by splitting the extra_flags
argument (it wasn't working before because it was getting one argument
"-c 4096 -s 128" instead of four arguments "-c", "4096", "-s", "128"
and mkyaffs2image apparently just ignores that bogus argument?)
Change-Id: Ib1e08d634aa68bfab0f7e09680d407f2cee0797d
Remove the remaining (unused and untested) support for generating
amend scripts. This means that you won't be able to OTA directly from
cupcake to gingerbread.
Change-Id: Iaf5295db92a42b336960d05295f48b67cb729337
Merge commit 'cd7c775ece6854765ae3208818e76d9d11724713' into gingerbread-plus-aosp
* commit 'cd7c775ece6854765ae3208818e76d9d11724713':
fix the build still
Merge commit '0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb' into gingerbread-plus-aosp
* commit '0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb':
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit 'aa6dbe2144196bb6f9c1b6b539126250f9ef8af6' into gingerbread-plus-aosp
* commit 'aa6dbe2144196bb6f9c1b6b539126250f9ef8af6':
Try to fix system.img in update zip file.
Merge commit '485bd44d0d78f9f612075e17db1adb281741c84f'
* commit '485bd44d0d78f9f612075e17db1adb281741c84f':
Fix mkyaffs2image extra flags in the release tools.
Merge commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d' into gingerbread-plus-aosp
* commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d':
Fix mkyaffs2image extra flags in the release tools.
Merge commit '0962b71980b7e850a1ef87766ae12de16ab2efb4' into gingerbread-plus-aosp
* commit '0962b71980b7e850a1ef87766ae12de16ab2efb4':
DO NOT MERGE: Fix the build by ignoring directories that don't exist.
Merge commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd' into gingerbread-plus-aosp
* commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd':
Add support for multiple html directories to droiddoc.
The goal for adding this support is to allow droiddoc to pull html
files both from the static content and from content generated at
build time.
Change-Id: I5d4b2432aa78b0b3559daacedfb7a29675701f33
Merge commit 'ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51' into gingerbread-plus-aosp
* commit 'ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51':
Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
Merge commit '065521be4fd6965058fbd599bb43fe13101fee7c' into gingerbread-plus-aosp
* commit '065521be4fd6965058fbd599bb43fe13101fee7c':
Backport ext4 support from master [DO NOT MERGE]
Merge commit '240782f2bdc804fb5635a4bb7fbcfb104d48ddb3'
* commit '240782f2bdc804fb5635a4bb7fbcfb104d48ddb3':
update carousel icon for nexus one dev phone
Merge commit 'b7256fd6851d90c088b8cc1603fa62faa95714de'
* commit 'b7256fd6851d90c088b8cc1603fa62faa95714de':
Doc change: Add nexus one to dev phones image.
Merge commit '6eea9363f4aeaa861f2e021ea3c9494cb49a83b6' into gingerbread-plus-aosp
* commit '6eea9363f4aeaa861f2e021ea3c9494cb49a83b6':
update carousel icon for nexus one dev phone
Merge commit 'be4696e073b93e0e65f767e77166a08efd67c6cb' into gingerbread-plus-aosp
* commit 'be4696e073b93e0e65f767e77166a08efd67c6cb':
Doc change: Add nexus one to dev phones image.
Merge commit '4f2436dc3513f671935811bfa0c7e6c2c15505be' into gingerbread
* commit '4f2436dc3513f671935811bfa0c7e6c2c15505be':
update carousel icon for nexus one dev phone
Merge commit '7589398cf9127987a768ccfb3dbb9cde54d00f02' into gingerbread
* commit '7589398cf9127987a768ccfb3dbb9cde54d00f02':
Doc change: Add nexus one to dev phones image.
Merge commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0' into gingerbread-plus-aosp
* commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0':
Tracking merge of dalvik-dev to gingerbread
ASLR for shared libraries is controlled by "-a" in ota_from_target_files.
Binary files are self-contained (supported by apriori/soslim).
Signed-off-by: Hristo Bojinov <hristo@google.com>
Change-Id: I500e325bf4a70a8d69a2ab9b2938e83dadb4e65d
androideabi target is already in upstream GCC. The arm-linux-
androideabi toolchain can be built directly from upstream GCC.
Switching from old special tailored arm-eabi toolchain to the new
arm-linux-androideabi toolchain make us closer to the opensource
community and friendly to all toolchain developers.
kernel still uses arm-eabi toolchain. So we add arm-eabi toolchain
path to PATH.
The arm-linux-androideabi-4.4.x toolchain is built with the same
source as the latest arm-eabi-4.4.3 toolchain except for the
target change patches.
Change-Id: I1e5f2fe2faeee08f913f37e0ba93e84d2654a8ff
Change-Id: I5147d687750a50cfc186e99a9a8c88d3b2eb1692
If PRODUCT_PROPERTY_OVERRIDES has set default locale, buildinfo.sh skips setting them.
http://b/issue?id=2243115
Merge commit '21bd43a3d9600f25a1d52bde639e0d701cfa86f2'
* commit '21bd43a3d9600f25a1d52bde639e0d701cfa86f2':
docs: ensure code-ified links in qv are the proper color
Merge commit '81f42236e2971caac9354686d7acbe40f3fe0f4e' into gingerbread-plus-aosp
* commit '81f42236e2971caac9354686d7acbe40f3fe0f4e':
docs: ensure code-ified links in qv are the proper color
Merge commit '9269a711753f2523acd3fe5ae661559f754a1bd0' into gingerbread
* commit '9269a711753f2523acd3fe5ae661559f754a1bd0':
docs: ensure code-ified links in qv are the proper color
Merge commit '84843e6843f0429f0729deb5670c22da0dcc5507'
* commit '84843e6843f0429f0729deb5670c22da0dcc5507':
Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
Merge commit 'd7324cc356e9c67d878d156ca81928ab2ef220f5' into gingerbread-plus-aosp
* commit 'd7324cc356e9c67d878d156ca81928ab2ef220f5':
Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
Produce an event logs tag file for everything we know about, in order
to properly allocate numbers. Then produce a file that's filtered
for what's going to be installed.
Change-Id: Id0778aec0b4d045e8ff91ba2c9c8265e860eaba5
Merge commit '39a6a64471b28032d2037d9472d58dc0a77ef313'
* commit '39a6a64471b28032d2037d9472d58dc0a77ef313':
Create systemtarball either with bz2 or gz
Merge commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f' into gingerbread
* commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f':
docs: modify redirect link text
