Commit Graph

7433 Commits

Author SHA1 Message Date
Raphael Moll
3b1ebe7dc2 Merge "SDK atree: support HOST_OUT location." 2012-03-27 11:40:47 -07:00
Jean-Baptiste Queru
0b6a436f09 Merge "Fix build" 2012-03-27 07:37:58 -07:00
Glenn Kasten
f396f56817 Fix build
Change-Id: I740b211588122b1198d7925c78e9a4a7aaf08784
2012-03-27 07:24:24 -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
29e44b7a83 Merge "Fix for "dexopt: No such file or directory" error" 2012-03-20 11:05:56 -07:00
Jean-Baptiste Queru
20b970e252 Merge "Issue warning when "make snod" with dexpreopt enabled." 2012-02-24 11:20:15 -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
e77542205f Merge "Merge "Move Windows SDK whitelist out of main.mk"" 2012-02-14 13:08:14 -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
Jean-Baptiste Queru
458735839a Merge "Add extra environment info to build output" 2012-02-13 14:23:32 -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
Jean-Baptiste Queru
9a7419153e Merge "Add annotations to the sdk build." 2012-02-02 13:43:07 -08:00
Xavier Ducrohet
d79f950820 Add annotations to the sdk build.
Change-Id: I22ab1e737f05f6134ec9701c8ed69642a3708fbf
2012-02-02 13:41:19 -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
Jean-Baptiste Queru
7a8efe57a9 Merge "Remove non-existent AlarmProvider to fix SDK build." 2012-01-24 07:50:02 -08:00
Ying Wang
c3dbeb5df1 Remove non-existent AlarmProvider to fix SDK build.
Change-Id: Ifcd087b9022f29b4b7065a72cafbbc6b3704860b
2012-01-23 10:53:23 -08:00
Jean-Baptiste Queru
96a228bd79 Merge "Remove mention of layoutopt/uix as they are gone." 2012-01-12 14:07:20 -08: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
The Android Open Source Project
6c2c5d8eec Reconcile with ics-mr1-release
Change-Id: I4efd2763f8ae4da60277edc110ff8649869a35e7
2011-12-16 08:07:59 -08:00
The Android Automerger
a9819e2ff1 IML74K 2011-12-16 00:15:10 -08:00
The Android Automerger
e9db408701 IML74J 2011-12-15 21:43:32 -08:00
The Android Automerger
b7ae1edc6b IML74I 2011-12-15 20:50:23 -08:00
The Android Automerger
d1e01804de merge in ics-mr1-release history after reset to ics-mr1 2011-12-15 20:49:52 -08:00
The Android Automerger
61a6402f08 IML74H 2011-12-15 20:18:19 -08:00
Scott Main
96f696d901 am c4e8801c: am 50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
* commit 'c4e8801c2d059aa68e59069c5cc03adb2d464e6b':
  docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
2011-12-15 20:10:46 -08:00
Scott Main
c4e8801c2d am 50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
* commit '50d6f97c46934014894a43d3610029f579145713':
  docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
2011-12-15 20:09:04 -08:00
Scott Main
50d6f97c46 docs: revise space wrapping to avoid "new" tags from breaking new lines alone
Temp fix

Change-Id: If99ce3442ec179a46fe3bbe0a06f690527d05eb5
2011-12-15 20:06:32 -08:00
Scott Main
a9255cfa7c am 0af80fb4: am 0f429ebe: docs: fix bug in script for tab cookies
* commit '0af80fb409708d86b360e842bc834b3cbe4bc443':
  docs: fix bug in script for tab cookies
2011-12-15 19:16:13 -08:00
Scott Main
0af80fb409 am 0f429ebe: docs: fix bug in script for tab cookies
* commit '0f429ebe63acbf8ccc1efe3c4185151eb15a4783':
  docs: fix bug in script for tab cookies
2011-12-15 19:14:31 -08:00
Scott Main
0f429ebe63 docs: fix bug in script for tab cookies
Change-Id: I09a49764f66673b3f55032158efd44c228832e8f
2011-12-15 19:12:17 -08:00
Scott Main
b90afc2cf0 am 9839afdd: am 1d42360a: docs: style and script changes for android u classes
* commit '9839afddfcade4db1989718216b592aed76e73e7':
  docs: style and script changes for android u classes
2011-12-15 17:39:41 -08:00
Scott Main
9839afddfc am 1d42360a: docs: style and script changes for android u classes
* commit '1d42360a028b2d55f6d4d29bd99e8ef3de6e8402':
  docs: style and script changes for android u classes
2011-12-15 17:37:35 -08:00
Scott Main
1d42360a02 docs: style and script changes for android u classes
Change-Id: I5866541bb9dd41329aa02328b805959c8f675f8c
2011-12-15 17:34:40 -08:00
The Android Automerger
f4d94af870 IML75 2011-12-14 22:16:29 -08:00
The Android Automerger
8aa133d092 merge in ics-mr1-release history after reset to ics-mr1 2011-12-14 22:13:33 -08:00
The Android Open Source Project
c7185534d3 Reconcile with ics-mr1-release
Change-Id: I13575fbc40df854f574e7eaf8cfee6153ab3a342
2011-12-14 19:57:24 -08:00
The Android Automerger
769631608c IML74G 2011-12-14 19:28:43 -08:00
The Android Open Source Project
efe3034c71 Reconcile with ics-mr1-release
Change-Id: I93d6301506cdc1b3f549b7cf4dbc8a8b3adeca2b
2011-12-14 16:05:28 -08:00
The Android Automerger
9b9360c421 IML74F 2011-12-14 15:56:03 -08:00
The Android Automerger
0fb6a79220 IML74E 2011-12-14 15:44:48 -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
fea66cee1c Merge "Build Support for CTS Native Tests" into ics-mr1 2011-12-14 15:31:35 -08:00