Jean-Baptiste Queru
64cd96ce7f
Bump DX Java heap to 2GB.
...
Change-Id: I240a24f9bb8511fea8f420f76b4541018ae79a0c
2012-04-10 08:21:21 -07:00
Stephen Smalley
56882bf9b4
Support the setting of file security contexts in OTA and update packages.
...
Pass the file_contexts configuration to the releasetools scripts
so that the security contexts of files can be properly set for OTA
and update packages.
Requires Ica5fb73d6f2ffb981b74d1896538988dbc4d9b24
Change-Id: I5a63fd61a7e74d386d0803946d06bcf2fa8a857e
2012-04-06 15:35:41 -04:00
Stephen Smalley
5042392262
Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.
...
This configuration is used to determine the file security contexts
to set on the files in the yaffs2 or ext4 image that is generated.
This is similar to the android_filesystem_config.h tables for determining
the UID/GID/mode, but as a configuration rather than code.
Change-Id: I7c6f59fe7cb8bc4c86c8790f991b12dd93a61f68
2012-04-06 15:34:37 -04:00
Raphael Moll
b6addfb250
am a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"
...
* commit 'a8dd58a8a604ed90c5fd5fb632eb2bb8b1ff8fa0':
Allow make 3.82 to be used under Cygwin 1.7
2012-03-27 17:53:32 -07:00
Raphael Moll
2696eb6d11
am 3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
...
* commit '3b1ebe7dc291175886f21ffbbccdb98b560efabf':
SDK atree: support HOST_OUT location.
2012-03-27 17:53:32 -07:00
Raphael Moll
4c45699015
Allow make 3.82 to be used under Cygwin 1.7
...
(Manual merge of 76bf62d75e
)
Change-Id: I61a6b10b4d81192dbff928780c2263931cf57c4d
2012-03-27 14:35:34 -07:00
Raphael Moll
3b1ebe7dc2
Merge "SDK atree: support HOST_OUT location."
2012-03-27 11:40:47 -07:00
Jean-Baptiste Queru
d17c89776e
am 0b6a436f: Merge "Fix build"
...
* commit '0b6a436f09f10e358c64ee977c8322b3a76fd977':
Fix build
2012-03-27 08:07:09 -07:00
Glenn Kasten
f396f56817
Fix build
...
Change-Id: I740b211588122b1198d7925c78e9a4a7aaf08784
2012-03-27 07:24:24 -07:00
Andrew Hsieh
5d9aedef30
am 2245d17d: Point to new linux prebuilt toolchain for SDK build
...
* commit '2245d17dc847ecb5371807466788552ca0198152':
Point to new linux prebuilt toolchain for SDK build
2012-03-22 11:03:14 -07:00
Andrew Hsieh
2245d17dc8
Point to new linux prebuilt toolchain for SDK build
...
Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
2012-03-22 09:55:36 -07:00
Raphael Moll
74160ed4c4
SDK atree: support HOST_OUT location.
...
Change-Id: Ib369280971b37a3eb35ac94991cdbc49dead903e
2012-03-21 22:34:48 -07:00
Ying Wang
301843ae3e
am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
...
* commit '29e44b7a8300644516b021e9e324ffe426098b3f':
Fix for "dexopt: No such file or directory" error
2012-03-20 15:20:14 -07:00
Ying Wang
29e44b7a83
Merge "Fix for "dexopt: No such file or directory" error"
2012-03-20 11:05:56 -07:00
Jean-Baptiste Queru
9950526875
am 20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
...
* commit '20b970e25227c4144c61d0d6108905616dc4f08b':
Issue warning when "make snod" with dexpreopt enabled.
2012-02-24 11:32:08 -08:00
Ying Wang
acf01ec837
Issue warning when "make snod" with dexpreopt enabled.
...
Change-Id: I481f963634dd384ed6d3de73dfeeda92b37d227e
2012-02-24 11:05:48 -08:00
Jean-Baptiste Queru
605643224e
Move AOSP to another fake version number
...
Change-Id: Ida0282d1eccaa2bdaf4ca54aaf82680efdbaa271
2012-02-15 14:04:45 -08:00
Raphael Moll
c04b56c5b0
Merge "Move Windows SDK whitelist out of main.mk"
...
This replaces the list maintained in build/core/main.mk
by 2 makefiles in sdk.git and development.git.
Pre-requisite CLs: Change Ifa8111dbae for sdk.git
and Change Ie6f728bee for development.git
(cherry-pick of 347f305181
)
Change-Id: I6d1f4c974a6425e50e3e287c66a4e8090cf814cb
2012-02-14 11:12:02 -08:00
Conley Owens
5f1c9ba0b8
Add extra environment info to build output
...
This should help us support users with build issues.
Given that they inculde the dumpvars in their error report,
we will be able to avoid asking standard questions like
"what version of Ubuntu are you using?"
Change-Id: Ib7c452d805d5e64075a44dc40e41d4605cc1ef4a
2012-02-07 11:16:42 -08:00
Haruyasu Ishida
5c97da76ad
Fix for "dexopt: No such file or directory" error
...
When common_javalib.jar is created, both LOCAL_BUILT_MODULE and
built_odex targets can be run.
If built_odex target runs before the directory is created by
LOCAL_BUILT_MODULE target, the error occurs.
Change-Id: I1ebcb27630f8373558da6acdfce95f5cdf714bbf
2012-01-27 09:25:20 +01:00
Xavier Ducrohet
4b5e4ba5fd
Remove mention of layoutopt/uix as they are gone.
2012-01-11 18:07:31 -08:00
Jean-Baptiste Queru
5ea72effbd
Use the new location of the emulator kernel
2012-01-06 17:02:24 -08:00
Jean-Baptiste Queru
a230c4d049
Reference kernel notice in the new location
2012-01-06 15:05:53 -08:00
Al Sutton
80cfc37d0f
Partial fix for emulator under Lion.
...
Don't use -Wl,-dynamic on Lion
2012-01-04 15:16:50 -08:00
Conley Owens
d38c870d2e
Get build system to work with Make 3.82
...
Note: `sort` can't seem to handle newlines in 3.82.
Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
2011-12-22 15:16:05 -08:00
Al Sutton
9ce06f11d6
Don't run ranlib on MacOS 10.7
...
Change-Id: I74f4623e6044dd804669aaa70c6e410fa8988d75
2011-12-21 13:12:33 -08:00
Atte Peltomaki
60fe963c63
build: explicitly define dependency files
...
Groundwork for distcc support in Android build system,
see distcc FAQ for details on why -MF is needed:
http://distcc.googlecode.com/svn/trunk/doc/web/faq.html
2011-12-21 09:24:09 -08:00
Bruce Beare
b056d71f79
If setupwizard is disabled, don't force it to optional
...
Change-Id: I15912ed77b88ea94feb149fdd081a309e3cf4678
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-12-19 09:51:40 -08:00
Brian Muramatsu
80fa947b03
am fea66cee: Merge "Build Support for CTS Native Tests" into ics-mr1
...
* commit 'fea66cee1cd661b6bf8ead1988cf008fa61b01a7':
Build Support for CTS Native Tests
2011-12-14 15:33:22 -08:00
Brian Muramatsu
237fa07339
Build Support for CTS Native Tests
...
Bug 4970300
Adds two new variables, CTS_TEST_CASES and CTS_TEST_XMLS, to be read
from CtsTestCaseList.mk. The CTS_TEST_CASES variable can be used to
copy any sort of file to the repository/testcases CTS directory.
The CTS_TEST_XMLS variable can be used to inject test package xmls
from any source rather than relying upon the monolithic and
mostly serial buildCts.py script.
The existing CTS_CORE_CASE_LIST is coded to only support APKs, so
it could not be retrofitted to support native tests. However, the
two new variables can do even more than CTS_CORE_CASE_LIST due to
their generality. In the future, the idea is move away from
CTS_CORE_CASE_LIST and also generate XMLs using separate tools
rather than just buildCts.py.
Change-Id: Ib52722861c37e0f4d511f9041928395bcaba5dea
2011-12-13 14:14:36 -08:00
Jean-Baptiste Queru
a2c1261e71
Set version numbers for AOSP - do not merge
...
Change-Id: I7be67f46069ed758e67066e696aa2567983fa374
2011-12-12 17:16:07 -08:00
Bruce Beare
381581613a
am 3343b27c: x86: The default ATOM BSP flags need to be in sync with the NDK ABI
...
* commit '3343b27c534fb4ea238f2feaa0d9346840ee2f92':
x86: The default ATOM BSP flags need to be in sync with the NDK ABI
2011-12-09 16:21:00 -08:00
Bruce Beare
3343b27c53
x86: The default ATOM BSP flags need to be in sync with the NDK ABI
...
Change-Id: Ic741e1795c655ace1e33ae6708219f2708358090
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-12-09 13:27:08 -08:00
Dianne Hackborn
d7b15982d2
am e73b24cc: Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
...
* commit 'e73b24ccbe728476e5bc77aaf2fd6865276cacc3':
Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
2011-12-07 10:34:21 -08:00
Dianne Hackborn
e73b24ccbe
Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
...
Change-Id: I61ccc290aec8fa7e2e68cf01bc920a65b8b9e246
2011-12-07 10:30:19 -08:00
Jean-Baptiste Queru
0cd997ff31
am 8af0efd6: Improve handling of absolute paths in out directory
...
* commit '8af0efd6a157e682d88c9a6e030f37bab9860caf':
Improve handling of absolute paths in out directory
2011-12-06 19:32:38 -08:00
Jean-Baptiste Queru
78b680458b
am ffe03c98: Set OUT_DIR based on a common base path
...
* commit 'ffe03c984b2836a9b4e4ddb5a17ec0dd26ba686c':
Set OUT_DIR based on a common base path
2011-12-06 19:32:37 -08:00
Jean-Baptiste Queru
8af0efd6a1
Improve handling of absolute paths in out directory
...
Change-Id: If6b320e274fb1cee33808424246ce2c88b9b7ef5
2011-12-06 16:33:11 -08:00
Jean-Baptiste Queru
ffe03c984b
Set OUT_DIR based on a common base path
...
Change-Id: I2c4ba8b101d4d186ed4b371b9d07b3bcf75bbcc9
Author: Jean-Baptiste Queru<jbq@google.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-12-06 14:36:49 -08:00
Marius Renn
f945235a8a
am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1
...
* commit '72db32c744744ae1ace26830ecce968b6a95e173':
Google Add-On API Documentation Fixes (5429077)
2011-11-30 09:53:05 -08:00
Tor Norbye
dc2450ca25
Build fix - include sdk/lint in build.
2011-11-28 15:05:31 -08:00
Marius Renn
b1df701ed8
Google Add-On API Documentation Fixes (5429077)
...
We no longer want a reference directory, but rather
maps_api and effects_api directories.
Change-Id: I72b3a342d0871ec4cf7010be0d2b6486ca83571b
2011-11-23 18:08:51 -08:00
Jean-Baptiste Queru
d2cbcb40c0
Restore AOSP-specific pseudo-version-numbers.
...
For great justice.
Change-Id: I5a0f722419bff676142ce975a66225f0cd418ff8
2011-11-22 12:21:00 -08:00
Svetoslav Ganov
ecca008c17
am 700b18cc: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
...
* commit '700b18cc72e75737fa5cf79896c98f12003b7735':
Add the support libraries to the platform documentation (build).
2011-11-18 10:14:02 -08:00
Svetoslav Ganov
155d855cee
Add the support libraries to the platform documentation (build).
...
Added path to the support libraries.
bug: 5629339
Change-Id: Id414597046c528617313881ea857134512d1c2ba
2011-11-17 15:13:56 -08:00
The Android Open Source Project
4115aeaef3
am 324c814c: Merge from AOSP
...
* commit '324c814c6f479bb33eb8aa05d221c8a44b8f61b9':
Add a hash-bang as the first line of a shell script
2011-11-11 16:06:02 -08:00
The Android Open Source Project
324c814c6f
Merge from AOSP
...
Change-Id: Ie444a93a1fcba693332d302de828bdc62fd61647
2011-11-11 16:03:56 -08:00
Jean-Baptiste Queru
f9b556cd51
Add a hash-bang as the first line of a shell script
...
Change-Id: I5b663b036ecb25e952ecd2d998971cc326d4ebdf
2011-11-11 14:37:31 -08:00
Ying Wang
bb5ada524c
am a032d3d0: Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
...
* commit 'a032d3d07372423176e072dfcbcf60a53f8a7d57':
Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
2011-11-11 14:36:39 -08:00
Ying Wang
a032d3d073
Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
...
Bug: 5429077
Change-Id: I8d962c803496479ba5b5e7316538aced65ee4df1
2011-11-11 10:52:12 -08:00