OSDN Git Service
Xavier Ducrohet [Tue, 18 Jan 2011 02:22:51 +0000 (18:22 -0800)]
Update SDK app list.
Change-Id: I1a99b0bd716f90688aea9b9db20e393a91ad8ad2
Ying Wang [Tue, 18 Jan 2011 17:52:07 +0000 (09:52 -0800)]
Merge "Don't increase image sizes for the release tools." into honeycomb
Xavier Ducrohet [Tue, 18 Jan 2011 17:50:54 +0000 (09:50 -0800)]
Merge "Add librs_jni to the sdk product packages." into honeycomb
Scott Main [Tue, 18 Jan 2011 02:23:21 +0000 (18:23 -0800)]
fix build
Change-Id: If4adf6b91b932f44c5456bd76fed968e9d84c556
Scott Main [Tue, 18 Jan 2011 00:44:10 +0000 (16:44 -0800)]
update sdk template... thought this was merged already,
but also re-add section for offline preview
Change-Id: I4337f06657603c71e326398dfe7b4d1507252a16
Xavier Ducrohet [Tue, 18 Jan 2011 00:39:36 +0000 (16:39 -0800)]
Add librs_jni to the sdk product packages.
This is similar to
88e76ceca0514ce4ff5558d2f5842cdfe07f811c
but the SDK build does not extend generic_no_telephony.
Change-Id: Id01178b2a89d002aca52d57ad7c9dfb4e1184216
Scott Main [Tue, 18 Jan 2011 00:15:19 +0000 (16:15 -0800)]
docs: revise preview statement and links
Change-Id: I9c0bde91c2c87c661fe877608a48a5bd577860f3
Dharmaray Kundargi [Mon, 17 Jan 2011 18:52:26 +0000 (10:52 -0800)]
Merge "add videoeditor libraries to make" into honeycomb
Dharmaray Kundargi [Mon, 17 Jan 2011 00:45:20 +0000 (16:45 -0800)]
add videoeditor libraries to make
Change-Id: I024f087bd026f709fdbfc1272c79166ad9bf5bcd
David 'Digit' Turner [Mon, 17 Jan 2011 00:08:45 +0000 (16:08 -0800)]
Merge "Add librs_jni to the generic product packages." into honeycomb
David 'Digit' Turner [Sun, 16 Jan 2011 23:15:34 +0000 (00:15 +0100)]
Add librs_jni to the generic product packages.
Without this, HC cannot start under emulation (because some RenderScript-related
classes fail to preload properly during the boot, killing Zygote, even if they
are later never used).
Change-Id: I825051603425df59b9677875eba0ae2a811649ee
Dianne Hackborn [Sun, 16 Jan 2011 19:07:28 +0000 (11:07 -0800)]
Bump API version up to 10, thus resource version up to 11.
Change-Id: I305999c2ff71cc5985d0fc50e496c40e789d3af0
Ying Wang [Fri, 14 Jan 2011 19:30:56 +0000 (11:30 -0800)]
Don't increase image sizes for the release tools.
So it keeps consistent with the command run in the makefile.
Change-Id: Id26fa3387aa9bbab88c4ef3fbd26aff0d039c2e1
Raphael [Thu, 13 Jan 2011 18:30:19 +0000 (10:30 -0800)]
Merge "Add llvm-rs-cc to the tools buildable under Windows." into honeycomb
Scott Main [Thu, 13 Jan 2011 00:50:00 +0000 (16:50 -0800)]
docs: make only the expando link not-underlined
and wait until close animation is done before collapsing the toggle
Change-Id: Ie75f99a5cf5fcc2cbf33bb46a00ce79cd688ce5c
Scott Main [Wed, 12 Jan 2011 22:33:58 +0000 (14:33 -0800)]
docs: implement toggle features for documentation content.
There existed another form of this script and styles, but it was not used.
Change-Id: I5d3bf0b4f6b8159e8f837692e9b1613aae140e24
Raphael [Wed, 12 Jan 2011 21:33:04 +0000 (13:33 -0800)]
Add llvm-rs-cc to the tools buildable under Windows.
To be able to "make llvm-rs-cc" as a Windows SDK tool, we
first need to let the build system know which folders can be
built.
Once this is done, building can be done using the mingw32
package to do cross-compiling under Linux:
$ USE_MINGW=1 make llvm-rs-cc
Change-Id: I5538f4c52c74dad18dd50b59c9bdbcd6de3fd191
Ying Wang [Wed, 12 Jan 2011 19:12:06 +0000 (11:12 -0800)]
Disable dexpreopt for unbundled build.
Change-Id: Iad0cc41cfad2533703a0dddad743720c43ddb667
Dirk Dougherty [Sat, 8 Jan 2011 01:07:43 +0000 (17:07 -0800)]
Doc change: Remove redundant dir and image.
Change-Id: I6867250f48b71d857b1cf80f28392ec9879005c7
Scott Main [Fri, 7 Jan 2011 20:08:09 +0000 (12:08 -0800)]
docs: catchup templates to non-merged changes from gingerbread,
from Change-Id: I4555c496088dd8aac77f9aa01273c3a1d52f89e0, plus
the gingerbread logo
Change-Id: I3864480b9f68679c64747888a6919314f8ac6cbf
Dianne Hackborn [Thu, 6 Jan 2011 20:47:43 +0000 (12:47 -0800)]
We. Are. Honeycomb!
Change-Id: Ife02e57541fe6be14d62619b98fddba57a8132f4
Raphael Moll [Wed, 5 Jan 2011 23:50:22 +0000 (15:50 -0800)]
am
e503fcd5: am
7e27c8e1: Merge "Pass OUT_DIR variable to atree."
* commit '
e503fcd52ec8bbcc9fd4ea4b242f73c6c2cae3d3':
Pass OUT_DIR variable to atree.
Raphael Moll [Wed, 5 Jan 2011 23:48:24 +0000 (15:48 -0800)]
am
7e27c8e1: Merge "Pass OUT_DIR variable to atree."
* commit '
7e27c8e15507d62a0ac0b094bc7cfca15f6cc509':
Pass OUT_DIR variable to atree.
Raphael Moll [Wed, 5 Jan 2011 23:35:24 +0000 (15:35 -0800)]
Merge "Pass OUT_DIR variable to atree."
Raphael Moll [Wed, 5 Jan 2011 22:58:17 +0000 (14:58 -0800)]
Pass OUT_DIR variable to atree.
Change-Id: Iabbe905341dfe970448682a9dcbb170a04ad5222
Jason parks [Wed, 5 Jan 2011 21:14:49 +0000 (13:14 -0800)]
Merge "Add the CryptKeeper to the build."
Jason parks [Wed, 5 Jan 2011 20:51:42 +0000 (14:51 -0600)]
Add the CryptKeeper to the build.
Change-Id: I094c5f24cd7f9f1241d301984badd15b38eef33a
Jing Yu [Wed, 5 Jan 2011 19:56:25 +0000 (11:56 -0800)]
Merge "Remove global inline options."
Jeff Brown [Wed, 5 Jan 2011 01:30:46 +0000 (17:30 -0800)]
Merge "Add libinput to prelink map."
Ying Wang [Tue, 4 Jan 2011 20:55:14 +0000 (12:55 -0800)]
Don't prepend ./ before the dirs to be removed
So that installclean can be done properly when OUT_DIR is set to an
obsolute path, such as /buildbot/out_dirs/git_gingerbread.
Bug:
3321625
Change-Id: I87667355aa03f31613a8f6a5e17d7e469bf5335f
Jeff Brown [Wed, 5 Jan 2011 00:01:15 +0000 (16:01 -0800)]
Add libinput to prelink map.
Change-Id: I26998d4799d26165b3f528d1cd292b212eaaab9d
Jean-Baptiste Queru [Thu, 30 Dec 2010 00:02:14 +0000 (16:02 -0800)]
am
41c423da: am
96d3e9b3: Merge "generic_x86 builds don\'t need/use the sparse ext4 format."
* commit '
41c423da9df557b87e8db490b3ed4d4b34470423':
generic_x86 builds don't need/use the sparse ext4 format.
Jean-Baptiste Queru [Thu, 30 Dec 2010 00:02:12 +0000 (16:02 -0800)]
am
827c662d: am
e28ae87a: Merge "Use ext4 file system for generic_x86 userdata partition"
* commit '
827c662d8f145e5a0492838c951dad5d96716c71':
Use ext4 file system for generic_x86 userdata partition
Jean-Baptiste Queru [Thu, 30 Dec 2010 00:02:09 +0000 (16:02 -0800)]
am
4bd05717: am
670ccf2c: Merge "GB Updates for init.rc and boot command line"
* commit '
4bd05717e2156a0eeb9de81de3e8595b560f2627':
GB Updates for init.rc and boot command line
Ying Wang [Wed, 29 Dec 2010 22:31:27 +0000 (14:31 -0800)]
Merge "Enhance product vars examining."
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:31:01 +0000 (14:31 -0800)]
am
96d3e9b3: Merge "generic_x86 builds don\'t need/use the sparse ext4 format."
* commit '
96d3e9b3108eb430a01cca41cb06baa1b8eb22ec':
generic_x86 builds don't need/use the sparse ext4 format.
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:31:00 +0000 (14:31 -0800)]
am
e28ae87a: Merge "Use ext4 file system for generic_x86 userdata partition"
* commit '
e28ae87af9a9b83ce7e1821d4840edf3b99aec0e':
Use ext4 file system for generic_x86 userdata partition
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:30:58 +0000 (14:30 -0800)]
am
670ccf2c: Merge "GB Updates for init.rc and boot command line"
* commit '
670ccf2c458ed02d2d1e548b48d2eec29cb3d958':
GB Updates for init.rc and boot command line
Ying Wang [Wed, 29 Dec 2010 22:07:38 +0000 (14:07 -0800)]
Enhance product vars examining.
Change-Id: I348629aa6e63ad24d457e91af8f75712dcf91b27
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:17:28 +0000 (14:17 -0800)]
Merge "generic_x86 builds don't need/use the sparse ext4 format."
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:17:05 +0000 (14:17 -0800)]
Merge "Use ext4 file system for generic_x86 userdata partition"
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:10:17 +0000 (14:10 -0800)]
Merge "GB Updates for init.rc and boot command line"
Mike Lockwood [Wed, 29 Dec 2010 14:07:38 +0000 (09:07 -0500)]
Add libmtp and libusbhost to prelink map
Change-Id: I7e81edcbb24778143a01039e9cb12f22a922e00a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Ying Wang [Wed, 29 Dec 2010 00:40:01 +0000 (16:40 -0800)]
Merge "LOCAL_AAPT_INCLUDE_ALL_RESOURCES"
Bruce Beare [Tue, 28 Dec 2010 23:33:22 +0000 (15:33 -0800)]
generic_x86 builds don't need/use the sparse ext4 format.
Change-Id: I62973b131a728c3862be4642e2d49d0fa61555ac
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Bruce Beare [Mon, 27 Dec 2010 21:05:23 +0000 (13:05 -0800)]
Use ext4 file system for generic_x86 userdata partition
Change-Id: I05710c2bda521b35712513bc219fc73ed00e4617
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Bruce Beare [Mon, 27 Dec 2010 20:37:52 +0000 (12:37 -0800)]
GB Updates for init.rc and boot command line
Change-Id: I0638c8834fccbdc94ec99e7592a75b6972cb53b8
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Jean-Baptiste Queru [Tue, 28 Dec 2010 21:59:33 +0000 (13:59 -0800)]
am
54c5e5b1: am
1b8c01db: Merge "Product-configurable sparse ext images."
* commit '
54c5e5b18be967a46fbee8769c392cbe0dfe7530':
Product-configurable sparse ext images.
Jean-Baptiste Queru [Tue, 28 Dec 2010 21:51:53 +0000 (13:51 -0800)]
am
1b8c01db: Merge "Product-configurable sparse ext images."
* commit '
1b8c01dbee93366e31b67529a26e1a7b6198c876':
Product-configurable sparse ext images.
Jean-Baptiste Queru [Tue, 28 Dec 2010 21:43:32 +0000 (13:43 -0800)]
Merge "Product-configurable sparse ext images."
Ying Wang [Wed, 17 Nov 2010 23:40:38 +0000 (15:40 -0800)]
Product-configurable sparse ext images.
Also pass extfs sparse image flag to the release tool.
Change-Id: I79a6a71873634a231aa8990cee22374259601505
Ying Wang [Tue, 28 Dec 2010 21:14:29 +0000 (13:14 -0800)]
LOCAL_AAPT_INCLUDE_ALL_RESOURCES
Set this flag to include all the resources in the given dirs.
Bug:
3313179
Change-Id: I68c02b24174bebe41a5948810cc2f49cc916e51c
Jing Yu [Wed, 22 Dec 2010 00:33:48 +0000 (16:33 -0800)]
Remove global inline options.
The purpose of removing global inline options is to give
compiler the opportunity to do inline optimizations and inline
tunings for Android native codes.
By removing these global inline options now, the size of
almost all native libraries are reduced. And there is no
noticable performance degradation on webkit, gcstone and
skia benchmarks.
Change-Id: I31e71f51e4f29fa6286fddb89e9eab227581c7b3
Ying Wang [Mon, 20 Dec 2010 19:42:35 +0000 (11:42 -0800)]
am
098826bf: am
099fecd7: Use PRIVATE_CXX in HOST modules.
* commit '
098826bf61cba2b14a0538100878bdb029f50790':
Use PRIVATE_CXX in HOST modules.
Ying Wang [Mon, 20 Dec 2010 19:40:33 +0000 (11:40 -0800)]
am
099fecd7: Use PRIVATE_CXX in HOST modules.
* commit '
099fecd759ce54168fe4094880d1ca748e8906b9':
Use PRIVATE_CXX in HOST modules.
Ying Wang [Mon, 20 Dec 2010 19:18:28 +0000 (11:18 -0800)]
Use PRIVATE_CXX in HOST modules.
This fixes the build error:
out/host/linux-x86/obj/SHARED_LIBRARIES/libneo_util_intermediates/neo_err.o:
file not recognized: File format not recognized
See also CL #84578
Change-Id: Ib91230c7a5c9809eb1935959eaa9be8fa7c596b9
Jean-Baptiste Queru [Fri, 17 Dec 2010 00:04:26 +0000 (16:04 -0800)]
am
28599d02: Ignore
9bfb8142 from gingerbread
* commit '
28599d022e80651c2f21274d6055b03f4154d3e1':
DO NOT MERGE: The API version changed and a bunch of stuff needs rebuilding, so just wipe $(OUT_DIR).
Jean-Baptiste Queru [Thu, 16 Dec 2010 23:43:46 +0000 (15:43 -0800)]
Ignore
9bfb8142 from gingerbread
Change-Id: Ie0ec4fc224d23516906b9ca750c5200aa7fbf63c
Jeff Hamilton [Thu, 16 Dec 2010 00:29:40 +0000 (18:29 -0600)]
DO NOT MERGE: The API version changed and a bunch of stuff needs rebuilding, so just wipe $(OUT_DIR).
Change-Id: I7b6c291db3ec09c7b53949a04cc792912004a1de
Brian Carlstrom [Wed, 15 Dec 2010 21:21:21 +0000 (13:21 -0800)]
Merge "Scrub the set of dalvik modules that are built by default"
Ying Wang [Wed, 15 Dec 2010 21:18:23 +0000 (13:18 -0800)]
Merge "Add framework includes for any aidl source."
Brian Carlstrom [Wed, 15 Dec 2010 06:35:10 +0000 (22:35 -0800)]
Scrub the set of dalvik modules that are built by default
Bug:
3009435
Change-Id: I20d88df665e48aa74c20cef7e236de377cd0d14b
Jean-Baptiste Queru [Wed, 15 Dec 2010 00:26:34 +0000 (16:26 -0800)]
am
34e82671: resolved conflicts for merge of
76aa8d0a to gingerbread-plus-aosp
* commit '
34e826718e99d56da38ecd5ffd8873997722fa92':
update API version to 9
Jean-Baptiste Queru [Wed, 15 Dec 2010 00:23:19 +0000 (16:23 -0800)]
resolved conflicts for merge of
76aa8d0a to gingerbread-plus-aosp
Change-Id: I7fa43d5b5d52b68baca3e4848cd308fea1d1fb98
Jean-Baptiste Queru [Wed, 15 Dec 2010 00:16:44 +0000 (16:16 -0800)]
update API version to 9
Change-Id: Ia573996bb910e19c8f7017ca13cf9d9d77083404
Jean-Baptiste Queru [Wed, 15 Dec 2010 00:15:12 +0000 (16:15 -0800)]
am
3463d0e1: (-s ours) resolved conflicts for merge of
c1b33081 to gingerbread-plus-aosp - DO NOT MERGE
* commit '
3463d0e1026263d9d740c3324138a346b0c9006d':
(DO NOT MERGE) Issue #
3255640: Need to bump GB to API 10 version name "2.4"
Jean-Baptiste Queru [Wed, 15 Dec 2010 00:11:06 +0000 (16:11 -0800)]
resolved conflicts for merge of
c1b33081 to gingerbread-plus-aosp - DO NOT MERGE
Change-Id: I785e36efe89cc11e2dacfb4a30901be93453f221
Dianne Hackborn [Tue, 14 Dec 2010 19:30:43 +0000 (11:30 -0800)]
(DO NOT MERGE) Issue #
3255640: Need to bump GB to API 10 version name "2.4"
We are now version 2.4, API 10.
Change-Id: I5876ee7cdd1c6e4115dbe79d426f678e8d354449
Ying Wang [Tue, 14 Dec 2010 18:57:54 +0000 (10:57 -0800)]
Add framework includes for any aidl source.
Before this change, only aidl in apps gets the framework directories in
their include path.
Change-Id: Ieeaa162f577ea280fe71e4959cc73176b4dfd8ad
David 'Digit' Turner [Tue, 14 Dec 2010 10:45:58 +0000 (02:45 -0800)]
am
efc5d814: am
15f4980d: Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread
* commit '
efc5d81428a8c7d9cf7cb7b3a5f1a8344b02a700':
Add support for custom Linux host toolchains when building the SDK.
David 'Digit' Turner [Tue, 14 Dec 2010 10:42:10 +0000 (02:42 -0800)]
am
15f4980d: Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread
* commit '
15f4980d510824113a4d2b71d70de9c67715f3dc':
Add support for custom Linux host toolchains when building the SDK.
David 'Digit' Turner [Tue, 14 Dec 2010 10:37:05 +0000 (02:37 -0800)]
Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread
Brian Carlstrom [Mon, 13 Dec 2010 21:20:21 +0000 (13:20 -0800)]
Merge "Unify target and host Java compilation"
Brian Carlstrom [Fri, 10 Dec 2010 20:10:24 +0000 (12:10 -0800)]
Unify target and host Java compilation
This changes tries to reconcile drift between
transform-java-to-classes.jar which is used to build java for the
target with transform-host-java-to-package which is used for the
host. Several packages such as libcore are built both ways and the
drift between these rules was making it hard to make common changes to
things such as warning options.
The new compile-javac definition tries to include as much as possible
from the two previous definitions. Some conflicts it sorts out:
- hardwired -g vs PRIVATE_JAVAC_DEBUG_FLAGS
- consistent order of arguments
- moving PRIVATE_JAVAC_FLAGS to end to allow override of arguments
- xlint_unchecked is always conditional based on LOCAL_WARNINGS_ENABLE
Now what differs between the two is clear in the
transform-java-to-classes and transform-host-java-to-package
definitions. Notable differences:
- the target case supplies a bootclasspath while the host case does not.
- .class files are cleaned up after jaring in the target case,
but in the cost case they are left for the sake of the vm-tests target
which expects them to be present. That should probably be fixed in the future.
- PRIVATE_EXTRA_JAR_ARGS used to package resources into the jar only
happens for the host. Its handled by add-java-resources-to-package for the
target after dxing.
Change-Id: I2fb28f688fbb632102ca63448c2ac911db0477ae
Daniel Sandler [Mon, 13 Dec 2010 17:46:17 +0000 (12:46 -0500)]
Protips: End of line.
Bug:
3248626
Change-Id: Iecf180f64df492a3bd907697cb0778e60031ed8a
David 'Digit' Turner [Fri, 10 Dec 2010 21:24:06 +0000 (22:24 +0100)]
Add support for custom Linux host toolchains when building the SDK.
This is needed in order to build Linux SDK binaries that can run
properly on Ubuntu 8.04 (Hardy). By default, the host toolchain
on 10.04 (Lucid) generates machine code that won't run on Hardy
due to GLibc ABI mistmatches.
Note that nothing happens if the new toolchain is not in the
prebuilt tree.
Change-Id: I45c1f68e37e15a0032f885df1c5c0f297b3d8642
Ying Wang [Sat, 11 Dec 2010 00:26:59 +0000 (16:26 -0800)]
am
1f22360f: am
c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread
* commit '
1f22360f60455ff9a486a6c757d1b974341c1895':
Default uninstallable modules' tag to optional
Ying Wang [Sat, 11 Dec 2010 00:21:43 +0000 (16:21 -0800)]
am
c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread
* commit '
c79736785716d56768998d64317ff90a62073868':
Default uninstallable modules' tag to optional
Ying Wang [Sat, 11 Dec 2010 00:17:59 +0000 (16:17 -0800)]
Merge "Default uninstallable modules' tag to optional" into gingerbread
Ying Wang [Fri, 10 Dec 2010 19:17:28 +0000 (11:17 -0800)]
Default uninstallable modules' tag to optional
Change-Id: I31faee42c807b3b6d7b85feea6c74860c89d45de
Jean-Baptiste Queru [Fri, 10 Dec 2010 17:01:05 +0000 (09:01 -0800)]
am
2145c46a: am
2562a40e: reconcile with open-source gingerbread
* commit '
2145c46aa288c862ac3dce50877d16c0537bcea3':
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:59:14 +0000 (08:59 -0800)]
am
89aa0ebf: (-s ours) Ignore
0c3d5d95 from gingerbread
* commit '
89aa0ebfb86d15672ab297264ee3bf9fd3e18ea1':
2.3.1
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:58:22 +0000 (08:58 -0800)]
am
2562a40e: reconcile with open-source gingerbread
* commit '
2562a40eb1afa88e8e3b97fb4c96f2241d28ec1e':
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:55:53 +0000 (08:55 -0800)]
Ignore
0c3d5d95 from gingerbread
Version number changes don't merge across codelines
Change-Id: I97e65e0ced9158da86568a32dc08f133755b9267
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:12:51 +0000 (08:12 -0800)]
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:05:23 +0000 (08:05 -0800)]
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:01:07 +0000 (08:01 -0800)]
Merge from gingerbread
Change-Id: Icfc2bb041b1360a8a0258d7de5547fded86bf7ec
Jean-Baptiste Queru [Fri, 10 Dec 2010 15:46:16 +0000 (07:46 -0800)]
reconcile with open-source gingerbread
Change-Id: I817f61141bf2c5189b13965ea9f3ead8f19d61cb
android-merger [Thu, 9 Dec 2010 18:50:19 +0000 (10:50 -0800)]
2.3.1
Change-Id: I9096a5b7a8e85274cac23d88635d3f49e6698cd8
android-merger [Thu, 9 Dec 2010 18:50:19 +0000 (10:50 -0800)]
2.3.1
Change-Id: I64c7f35bb6cdfdfef01ce396798a0235642c0486
Ying Wang [Thu, 9 Dec 2010 04:07:48 +0000 (20:07 -0800)]
Change phony target name dist_libraries to dist_files.
Any module that does not build in apps_only build should not dist for the
default goal "droid" -- they sould dist for "dist_files" instead.
Change-Id: I8696f1ea803fbd8554ec03352e0ef369f5d7be0d
Jean-Baptiste Queru [Tue, 7 Dec 2010 00:45:01 +0000 (16:45 -0800)]
am
dbd43691: am
3ef1d674: am
4985f06f: Merge "Make image-size-from-data-size not use hard coded values."
* commit '
dbd43691870fa64d1ad79371e3d796ed8e63b3b9':
Make image-size-from-data-size not use hard coded values.
Scott Main [Tue, 7 Dec 2010 00:36:53 +0000 (16:36 -0800)]
resolved conflicts for merge of
1c4fe5aa to master
Change-Id: I3c83852dfb6a80614aad145d12cd61b65829805f
Jean-Baptiste Queru [Mon, 6 Dec 2010 23:12:02 +0000 (15:12 -0800)]
am
3ef1d674: am
4985f06f: Merge "Make image-size-from-data-size not use hard coded values."
* commit '
3ef1d674806734c2e237a54815ea5c077ce8c344':
Make image-size-from-data-size not use hard coded values.
Jean-Baptiste Queru [Mon, 6 Dec 2010 23:10:35 +0000 (15:10 -0800)]
am
4985f06f: Merge "Make image-size-from-data-size not use hard coded values."
* commit '
4985f06f4e96351c77b88b20bc9ded65daefcd3e':
Make image-size-from-data-size not use hard coded values.
Jean-Baptiste Queru [Mon, 6 Dec 2010 22:58:08 +0000 (14:58 -0800)]
Merge "Make image-size-from-data-size not use hard coded values."
Brian Muramatsu [Mon, 6 Dec 2010 20:49:13 +0000 (12:49 -0800)]
Change from @ to $(hide) in CTS Build
Change-Id: Ibda485105f750e971260088785904ea420cbaa03
Lars Svensson [Mon, 6 Dec 2010 14:24:58 +0000 (15:24 +0100)]
Make image-size-from-data-size not use hard coded values.
The function image-size-from-data-size was using hard
coded values. The size of spare area and pages has become
configurable so we need to read from the variables.
Change-Id: I9461d34400ffc2cc5920860d8aa78750d559e397
Scott Main [Mon, 6 Dec 2010 03:04:18 +0000 (19:04 -0800)]
Scott Main [Mon, 6 Dec 2010 02:03:23 +0000 (18:03 -0800)]
docs: fix link
Change-Id: Id57ebbd12c16ef914ebe1d90260fdf8a5ae4587b