David 'Digit' Turner
9d99d7dfb8
resolved conflicts for merge of 6da54b6e
to master
...
Change-Id: Ic1e08fffacb66e8006877b7b5c51e9e7f03d39a2
2011-08-26 00:53:34 +02:00
David 'Digit' Turner
6da54b6e0e
resolved conflicts for merge of 7be88d00
to honeycomb-plus-aosp
...
Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
2011-08-25 23:23:32 +02:00
David 'Digit' Turner
7be88d00bb
am 77c6261f
: Merge "emulator: Enable GLES emulation libraries"
...
* commit '77c6261fb074d87b75d669dd9fb9ab5a12a52cc9':
emulator: Enable GLES emulation libraries
2011-08-25 12:14:33 -07:00
David 'Digit' Turner
77c6261fb0
Merge "emulator: Enable GLES emulation libraries"
2011-08-25 12:02:34 -07:00
Jean-Baptiste Queru
d7d096df71
Tighten the toolchain version check
...
Bug: 3076137
Change-Id: Ibd9f1f13916e31596f94a5b0a90293995da7f2cf
2011-08-25 11:29:54 -07:00
Ying Wang
6e41a7483a
Merge "Provide mechanism to override llvm-rs-cc headers."
2011-08-24 10:26:41 -07:00
Stephen Hines
d4136c0fc6
Provide mechanism to override llvm-rs-cc headers.
...
Change-Id: I87fd496069a9dfde633e2d232e436fa5d7315cc0
2011-08-23 22:01:49 -07:00
jeffhao
ca94f3583f
Removing target-api option from build.
...
This is cherry-picked from dalvik-dev.
Change-Id: I85cd23c08fcad400e6426cdaad079e91dcd9babf
2011-08-23 14:18:24 -07:00
David 'Digit' Turner
43dd89d2a0
emulator: Enable GLES emulation libraries
...
This patch enables the build of OpenGLES emulation libraries
(both in the guest and the host) for any emulator-specific
product config.
+ update core/main.mk to ensure that the right path is parsed
when building the Windows SDK
Change-Id: Ifde047f8c0ef922504a7286c8c5b57f7c79c71f8
2011-08-23 22:25:13 +02:00
Eric Laurent
9d78854f0f
Merge "Fix issue 5094017: Media server crashes on ISC emulator."
2011-08-22 08:29:39 -07:00
David Hu
57afbd18af
Merge "GPS Location Test Build Change"
2011-08-20 18:51:20 -07:00
Eric Laurent
7ed9efaab3
Fix issue 5094017: Media server crashes on ISC emulator.
...
Add audio HAL and audio policy hardware module libraries to SDK image.
Change-Id: I96501b1493974ac1738f194f9457461766ea4bff
2011-08-19 10:03:52 -07:00
Ying Wang
c7fd4a5a7b
am 2bcdfe14
: am 4651ee5d
: am 7c7a8f02
: Merge "Sort the results of findleaves again."
...
* commit '2bcdfe145d485fc28e86700e4ed57ac67368de25':
Sort the results of findleaves again.
2011-08-19 09:36:56 -07:00
Ying Wang
2bcdfe145d
am 4651ee5d
: am 7c7a8f02
: Merge "Sort the results of findleaves again."
...
* commit '4651ee5db200772921bad828c280d165ff3997c3':
Sort the results of findleaves again.
2011-08-19 09:35:50 -07:00
Wink Saville
adf8136708
am 43c15339
: (-s ours) Merge "DO NOT MERGE: resolved conflicts for merge of 15e199c8
to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit '43c15339886bf6c6fb87527d86525da58542e790':
DO NOT MERGE: Update hc-LTE PLATFORM_VERSION from 3.2 to 3.2.2.
2011-08-19 09:34:14 -07:00
Ying Wang
4651ee5db2
am 7c7a8f02
: Merge "Sort the results of findleaves again."
...
* commit '7c7a8f023af38e7e8be7cbb6acbe1ab770cdd704':
Sort the results of findleaves again.
2011-08-19 09:32:40 -07:00
Wink Saville
43c1533988
Merge "DO NOT MERGE: resolved conflicts for merge of 15e199c8
to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-08-19 09:28:34 -07:00
Ying Wang
7c7a8f023a
Merge "Sort the results of findleaves again."
2011-08-19 09:24:44 -07:00
Ishida, Haruyasu
58e52b434b
Sort the results of findleaves again.
...
Commit d36e945
changed findleaves.py to sort the output files so that
the order is deterministic and won't cause spurious build errors when
files happen to be listed (and hence read) in different order on
e.g. add/remove the makefiles.
This correction broke after commit 4820a94
because the conversion to
a set with set() in order to remove duplicates came after sort() and
potentially altered the order of the elements.
This commit fixes makes sure findleaves.py is guaranteed to return
a sorted filename list without duplicates.
Change-Id: Ifd96d04d45641fe43d4cc4739f78a2d4d25cc212
2011-08-19 08:14:53 +02:00
Raphael Moll
88833405c4
am cfdfad3f
: am 807c7980
: am 7d9fe517
: Merge "Add sdk/rule_api to the Windows build paths."
...
* commit 'cfdfad3fcadc8bba30f00dbe2f2e835d61cde9ef':
Add sdk/rule_api to the Windows build paths.
2011-08-17 11:36:25 -07:00
Raphael Moll
cfdfad3fca
am 807c7980
: am 7d9fe517
: Merge "Add sdk/rule_api to the Windows build paths."
...
* commit '807c79802d5e8b1613bf36bb780cf3250f443aa2':
Add sdk/rule_api to the Windows build paths.
2011-08-17 11:29:48 -07:00
Wink Saville
cd34366886
DO NOT MERGE: resolved conflicts for merge of 15e199c8
to honeycomb-plus-aosp
...
Not merging this change, leaving version at 3.1.4.1.5.9.2.6.5
Change-Id: Ie9efac19da35cb72e8ae636dcfb8962a3c02ac94
2011-08-17 11:27:01 -07:00
Raphael Moll
807c79802d
am 7d9fe517
: Merge "Add sdk/rule_api to the Windows build paths."
...
* commit '7d9fe5174787a5638993a15b165bc9115c16da0f':
Add sdk/rule_api to the Windows build paths.
2011-08-17 11:26:07 -07:00
Raphael Moll
7d9fe51747
Merge "Add sdk/rule_api to the Windows build paths."
2011-08-17 11:06:39 -07:00
Wink Saville
15e199c857
DO NOT MERGE: Update hc-LTE PLATFORM_VERSION from 3.2 to 3.2.2.
...
Change-Id: Ib30bf10669119b588c691e4cebdc8093f402e3e4
2011-08-17 10:03:51 -07:00
Raphael Moll
408c7f8a8f
Add sdk/rule_api to the Windows build paths.
...
Change-Id: I4976b50d829e4b26b4f9935a1a184937dd115198
2011-08-16 19:40:03 -07:00
Brian Swetland
d1975a2946
fix tiny android builds (add mksh)
...
Change-Id: I0cf5068b6e9b350259009c5ecf7f2946d05f7b2d
2011-08-16 16:15:26 -07:00
Ying Wang
0ba51ba565
Merge "Update build to properly use prebuilt llvm-rs-cc."
2011-08-15 11:15:51 -07:00
Ying Wang
bed0a19583
am 6d38bdfc
: resolved conflicts for merge of a74a4811
to honeycomb-plus-aosp
...
* commit '6d38bdfc7b9ff699370b4a40dcbdddce0ea713b8':
sha module is deprecated
2011-08-11 16:59:48 -07:00
Ying Wang
6d38bdfc7b
resolved conflicts for merge of a74a4811
to honeycomb-plus-aosp
...
Change-Id: I8400ac2bead6aa1a9902d44bf65906084ad353ad
2011-08-11 16:55:00 -07:00
Ying Wang
a74a4811ae
am 3f5326fd
: Merge "sha module is deprecated"
...
* commit '3f5326fd9fe2a5c46b4e6643e2b277e7f13cac04':
sha module is deprecated
2011-08-10 18:02:15 -07:00
Ying Wang
3f5326fd9f
Merge "sha module is deprecated"
2011-08-10 17:50:05 -07:00
david
cad0bb9f62
sha module is deprecated
...
This patch removes the deprecated warnings from the python
scripts.
Change-Id: I052a0aab3fb28dd1d78de1307edafda6b6c35e5f
2011-08-10 17:48:04 -07:00
Stephen Hines
c963eae72c
Update build to properly use prebuilt llvm-rs-cc.
...
Change-Id: I52a83066b6c08d05d69db4f93631eeaf9c0b41c6
2011-08-10 17:01:43 -07:00
The Android Open Source Project
aac78535cd
Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release
...
Change-Id: I96a28218361adfe4730e7c161cd5bd861976fbc6
2011-08-10 07:28:42 -07:00
The Android Automerger
3fd9451190
GWK15G
...
Change-Id: Ice488cd27f50a2f100e100d659c737d4bcc09f5c
2011-08-09 17:47:42 -07:00
android-merger
cbfb43cbe2
GRK39
...
Change-Id: Ia4b60a25edae6e8525710ffd11e30308eb22d0db
2011-08-08 15:48:36 -07:00
android-merger
68afbc67ae
GRJ90C
...
Change-Id: I660b1710592f3bdc0847eb5e6b83dabfd2c7e44c
2011-08-08 15:03:14 -07:00
The Android Automerger
d39e198497
HLK36B
2011-08-05 15:04:39 -07:00
The Android Automerger
64f3d5ca2d
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-08-05 15:04:08 -07:00
The Android Automerger
d6b0cc14c5
HLK36
2011-08-05 07:03:48 -07:00
The Android Automerger
443e5fcff3
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-08-05 07:03:07 -07:00
The Android Open Source Project
b5bd482fc4
Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release
...
Change-Id: I7fac76d938aaa591a908b7a5b7cc5b5d31b79efe
2011-08-04 18:45:50 -07:00
The Android Automerger
b51a7b4462
HLK35
2011-08-04 07:03:40 -07:00
The Android Automerger
e0fe8f81c7
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-08-04 07:03:17 -07:00
Jean-Baptiste Queru
b8223caf03
am c55ebf23
: am 8dd289d3
: Ignore from gingerbread
...
* commit 'c55ebf232e1c0287ef841a5d917cb12feefba2d6':
Updating version to 2.3.7 to reflect some patches.
Bumping version to 2.3.6 to reflect a few patches.
2011-08-03 17:42:16 -07:00
The Android Automerger
21c70388af
HLK34
2011-08-03 07:03:26 -07:00
The Android Automerger
46021d319c
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-08-03 07:03:07 -07:00
Jean-Baptiste Queru
c55ebf232e
am 8dd289d3
: Ignore from gingerbread
...
* commit '8dd289d399e76f90e24383a7ffed4b667db6cbb3':
Updating version to 2.3.7 to reflect some patches.
Bumping version to 2.3.6 to reflect a few patches.
2011-08-02 17:09:58 -07:00
Jean-Baptiste Queru
8dd289d399
Ignore from gingerbread
...
We like our AOSP version numbers unchanged and a bit nutty.
Change-Id: Iddfd494bc52f13bdeb90f39393d89f554e2cfb64
2011-08-02 17:04:57 -07:00