Ying Wang
096bb3dd00
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
2011-01-04 17:11:59 -08:00
Jean-Baptiste Queru
229c35eed4
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.
2010-12-29 16:02:14 -08:00
Jean-Baptiste Queru
9326ab155e
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
2010-12-29 16:02:12 -08:00
Jean-Baptiste Queru
fb6172cf7b
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
2010-12-29 16:02:09 -08:00
Ying Wang
b1db5a9d90
Merge "Enhance product vars examining."
2010-12-29 14:31:27 -08:00
Jean-Baptiste Queru
41c423da9d
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.
2010-12-29 14:31:01 -08:00
Jean-Baptiste Queru
827c662d8f
am e28ae87a
: Merge "Use ext4 file system for generic_x86 userdata partition"
...
* commit 'e28ae87af9a9b83ce7e1821d4840edf3b99aec0e':
Use ext4 file system for generic_x86 userdata partition
2010-12-29 14:31:00 -08:00
Jean-Baptiste Queru
4bd05717e2
am 670ccf2c
: Merge "GB Updates for init.rc and boot command line"
...
* commit '670ccf2c458ed02d2d1e548b48d2eec29cb3d958':
GB Updates for init.rc and boot command line
2010-12-29 14:30:58 -08:00
Ying Wang
f9953b4a61
Enhance product vars examining.
...
Change-Id: I348629aa6e63ad24d457e91af8f75712dcf91b27
2010-12-29 14:23:06 -08:00
Jean-Baptiste Queru
96d3e9b310
Merge "generic_x86 builds don't need/use the sparse ext4 format."
2010-12-29 14:17:28 -08:00
Jean-Baptiste Queru
e28ae87af9
Merge "Use ext4 file system for generic_x86 userdata partition"
2010-12-29 14:17:05 -08:00
Jean-Baptiste Queru
670ccf2c45
Merge "GB Updates for init.rc and boot command line"
2010-12-29 14:10:17 -08:00
Mike Lockwood
95e3d95280
Add libmtp and libusbhost to prelink map
...
Change-Id: I7e81edcbb24778143a01039e9cb12f22a922e00a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-29 09:07:38 -05:00
Ying Wang
3886c39db8
Merge "LOCAL_AAPT_INCLUDE_ALL_RESOURCES"
2010-12-28 16:40:01 -08:00
Bruce Beare
4c0115d0b7
generic_x86 builds don't need/use the sparse ext4 format.
...
Change-Id: I62973b131a728c3862be4642e2d49d0fa61555ac
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-28 15:33:27 -08:00
Bruce Beare
1e906eff26
Use ext4 file system for generic_x86 userdata partition
...
Change-Id: I05710c2bda521b35712513bc219fc73ed00e4617
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-28 14:48:24 -08:00
Bruce Beare
5f276fff11
GB Updates for init.rc and boot command line
...
Change-Id: I0638c8834fccbdc94ec99e7592a75b6972cb53b8
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-28 14:48:23 -08:00
Jean-Baptiste Queru
da26ee3126
am 54c5e5b1
: am 1b8c01db
: Merge "Product-configurable sparse ext images."
...
* commit '54c5e5b18be967a46fbee8769c392cbe0dfe7530':
Product-configurable sparse ext images.
2010-12-28 13:59:33 -08:00
Jean-Baptiste Queru
54c5e5b18b
am 1b8c01db
: Merge "Product-configurable sparse ext images."
...
* commit '1b8c01dbee93366e31b67529a26e1a7b6198c876':
Product-configurable sparse ext images.
2010-12-28 13:51:53 -08:00
Jean-Baptiste Queru
1b8c01dbee
Merge "Product-configurable sparse ext images."
2010-12-28 13:43:32 -08:00
Ying Wang
085a14698b
Product-configurable sparse ext images.
...
Also pass extfs sparse image flag to the release tool.
Change-Id: I79a6a71873634a231aa8990cee22374259601505
2010-12-28 13:41:33 -08:00
Ying Wang
8b07ed87fa
LOCAL_AAPT_INCLUDE_ALL_RESOURCES
...
Set this flag to include all the resources in the given dirs.
Bug: 3313179
Change-Id: I68c02b24174bebe41a5948810cc2f49cc916e51c
2010-12-28 13:16:06 -08:00
Ying Wang
085ff6a8ac
am 098826bf
: am 099fecd7
: Use PRIVATE_CXX in HOST modules.
...
* commit '098826bf61cba2b14a0538100878bdb029f50790':
Use PRIVATE_CXX in HOST modules.
2010-12-20 11:42:35 -08:00
Ying Wang
098826bf61
am 099fecd7
: Use PRIVATE_CXX in HOST modules.
...
* commit '099fecd759ce54168fe4094880d1ca748e8906b9':
Use PRIVATE_CXX in HOST modules.
2010-12-20 11:40:33 -08:00
Ying Wang
099fecd759
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
2010-12-20 11:18:28 -08:00
Jean-Baptiste Queru
fe2be8ed33
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).
2010-12-16 16:04:26 -08:00
Jean-Baptiste Queru
28599d022e
Ignore 9bfb8142
from gingerbread
...
Change-Id: Ie0ec4fc224d23516906b9ca750c5200aa7fbf63c
2010-12-16 15:43:57 -08:00
Jeff Hamilton
9bfb81426b
DO NOT MERGE: The API version changed and a bunch of stuff needs rebuilding, so just wipe $(OUT_DIR).
...
Change-Id: I7b6c291db3ec09c7b53949a04cc792912004a1de
2010-12-15 18:33:33 -06:00
Brian Carlstrom
a8d91ff6e3
Merge "Scrub the set of dalvik modules that are built by default"
2010-12-15 13:21:21 -08:00
Ying Wang
fe7ffc9134
Merge "Add framework includes for any aidl source."
2010-12-15 13:18:23 -08:00
Brian Carlstrom
bf66dd3485
Scrub the set of dalvik modules that are built by default
...
Bug: 3009435
Change-Id: I20d88df665e48aa74c20cef7e236de377cd0d14b
2010-12-14 22:35:10 -08:00
Jean-Baptiste Queru
b5c02ecbde
am 34e82671
: resolved conflicts for merge of 76aa8d0a
to gingerbread-plus-aosp
...
* commit '34e826718e99d56da38ecd5ffd8873997722fa92':
update API version to 9
2010-12-14 16:26:34 -08:00
Jean-Baptiste Queru
34e826718e
resolved conflicts for merge of 76aa8d0a
to gingerbread-plus-aosp
...
Change-Id: I7fa43d5b5d52b68baca3e4848cd308fea1d1fb98
2010-12-14 16:23:36 -08:00
Jean-Baptiste Queru
76aa8d0a8b
update API version to 9
...
Change-Id: Ia573996bb910e19c8f7017ca13cf9d9d77083404
2010-12-14 16:16:44 -08:00
Jean-Baptiste Queru
282d391239
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"
2010-12-14 16:15:12 -08:00
Jean-Baptiste Queru
3463d0e102
resolved conflicts for merge of c1b33081
to gingerbread-plus-aosp - DO NOT MERGE
...
Change-Id: I785e36efe89cc11e2dacfb4a30901be93453f221
2010-12-14 16:12:23 -08:00
Dianne Hackborn
c1b330818e
(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
2010-12-14 11:30:43 -08:00
Ying Wang
1214aeb75f
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
2010-12-14 10:57:54 -08:00
David 'Digit' Turner
02e172e892
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.
2010-12-14 02:45:58 -08:00
David 'Digit' Turner
efc5d81428
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.
2010-12-14 02:42:10 -08:00
David 'Digit' Turner
15f4980d51
Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread
2010-12-14 02:37:05 -08:00
Brian Carlstrom
b531c0b44c
Merge "Unify target and host Java compilation"
2010-12-13 13:20:21 -08:00
Brian Carlstrom
782695112d
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
2010-12-13 11:29:58 -08:00
Daniel Sandler
87c983ca57
Protips: End of line.
...
Bug: 3248626
Change-Id: Iecf180f64df492a3bd907697cb0778e60031ed8a
2010-12-13 12:46:17 -05:00
David 'Digit' Turner
0960ca7488
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
2010-12-13 11:52:03 +01:00
Ying Wang
953b64f48a
am 1f22360f
: am c7973678
: Merge "Default uninstallable modules\' tag to optional" into gingerbread
...
* commit '1f22360f60455ff9a486a6c757d1b974341c1895':
Default uninstallable modules' tag to optional
2010-12-10 16:26:59 -08:00
Ying Wang
1f22360f60
am c7973678
: Merge "Default uninstallable modules\' tag to optional" into gingerbread
...
* commit 'c79736785716d56768998d64317ff90a62073868':
Default uninstallable modules' tag to optional
2010-12-10 16:21:43 -08:00
Ying Wang
c797367857
Merge "Default uninstallable modules' tag to optional" into gingerbread
2010-12-10 16:17:59 -08:00
Ying Wang
2fd81cf11e
Default uninstallable modules' tag to optional
...
Change-Id: I31faee42c807b3b6d7b85feea6c74860c89d45de
2010-12-10 11:17:28 -08:00
Jean-Baptiste Queru
432b3a350a
am 2145c46a
: am 2562a40e
: reconcile with open-source gingerbread
...
* commit '2145c46aa288c862ac3dce50877d16c0537bcea3':
2010-12-10 09:01:05 -08:00