Raphael
1518506345
Enable 'make traceview' under Windows.
...
Change-Id: I2b89d2ee66d0bb4a1b2bb6e4ea15d3b0419cead9
2011-09-06 16:39:37 -07:00
Justin Ho
0f2e55e47d
Merge "Updated dex-preopt BOOTCLASSPATH with values from init.rc Bug: 5032006"
2011-09-06 13:18:22 -07:00
Justin Ho
0279b62d16
Updated dex-preopt BOOTCLASSPATH with values from init.rc
...
Bug: 5032006
Change-Id: I6ed7e55ec2b278c0d60ad4e17208480d05af61bc
2011-09-06 13:04:36 -07:00
Doug Zongker
e1a8e3aef3
allow setting LOCAL_STRIP_MODULE on multi_prebuilts
...
Change-Id: I4a58255381ba8a50d8f9512bf9892f5050599393
2011-09-06 10:31:37 -07:00
Justin Ho
19b22a9413
Remove pinyinIME
...
Change-Id: If83419336294eb56d5b96384a7bc9d9821888b02
2011-09-02 08:00:53 -07:00
Owen Lin
0a37a63a0e
Merge "Replace GalleryNew3D with Gallery2 in AOSP."
2011-09-01 17:43:31 -07:00
Justin Ho
bdab41a16f
Add image size calcuations into the script
...
Change-Id: Ide13a873982bae21e2b8735a235389a660abd592
2011-09-01 13:46:54 -07:00
Owen Lin
2c48877296
Replace GalleryNew3D with Gallery2 in AOSP.
...
Change-Id: I61e35fa7e629872d2c961a8fa35d8068fb918cc6
2011-09-01 14:21:22 +08:00
Justin Ho
b139b6a1a5
Calculate system image size at build, for harvesting later
...
Change-Id: I6bfcde0e5df3f6da453f28354839e356f9191c0e
2011-08-31 16:29:31 -07:00
Justin Ho
17a27047bb
Revert Ic7c40c50: Support to run dex-preopt on prebuilt apks
...
Collect some additional system image space, moving odex files to user partition on trygon-user
Change-Id: If992536ff0da14cc5b9ba51811b8a0b76f1b8f83
2011-08-30 14:29:18 -07:00
Eino-Ville Talvala
5d8a5ceecb
Merge "Add filterfw.jar to standard list of java libraries to include."
2011-08-29 15:12:04 -07:00
Ying Wang
45bee774eb
am a1b603a5
: am 4b398749
: am c5033a33
: Merge "x86: remove obsolete comments"
...
* commit 'a1b603a556e338d4899a62ea37810aff81ab7fa1':
x86: remove obsolete comments
2011-08-29 11:05:08 -07:00
David 'Digit' Turner
9a1dd17028
am 3db43165
: am 80d41e4b
: am a2cc9b22
: Merge "sdk: add DLL_EXTENSION as an atree variable"
...
* commit '3db43165b09defcbeebdbeddff158b4e1f85d5c4':
sdk: add DLL_EXTENSION as an atree variable
2011-08-29 11:04:47 -07:00
David 'Digit' Turner
321ce5f820
Merge "resolved conflicts for merge of 6da54b6e
to master"
2011-08-29 10:58:09 -07:00
Eino-Ville Talvala
76a7d82fac
Add filterfw.jar to standard list of java libraries to include.
...
Since classes from this jar are part of the public API, it should be
included by default.
Also add the jar into the dex_preopt list.
Bug: 5098987
Change-Id: Ib39deffea43714eb56630ad1d65411cfde5878fd
2011-08-26 14:22:57 -07:00
Doug Zongker
e92f15a858
patch the /system/build.prop file last
...
Works around a problem observed on a retail device: incremental update
from build 1 to build 2 partially completed, leaving a mix of files
from the two builds. (Why it booted into the regular system instead
of recovery to restart update installation is still a mystery.)
build.prop was one of the files updated, so the device reported itself
as having build 2. The device hobbled along for months in this state,
until build 3 was released and the 2-to-3 incremental package
repeatedly failed (because some of the files it was trying to patch
were build 1).
This change makes updating build.prop the very last thing does by an
incremental update script, so if installation is aborted and the
regular system starts (and works at all), it will continue reporting
itself as build 1 and be sent the 1-to-2 OTA package again.
Change-Id: I1edc1dcef2bd2495b6fd96517c2f4c574b994f27
2011-08-26 13:46:40 -07:00
Ying Wang
a1b603a556
am 4b398749
: am c5033a33
: Merge "x86: remove obsolete comments"
...
* commit '4b3987498eb15dc654fe572aadf53396aac36479':
x86: remove obsolete comments
2011-08-26 12:12:48 -07:00
Ying Wang
4b3987498e
am c5033a33
: Merge "x86: remove obsolete comments"
...
* commit 'c5033a3357b824a8285da67357a0d289750f4a72':
x86: remove obsolete comments
2011-08-26 12:10:45 -07:00
Ying Wang
c5033a3357
Merge "x86: remove obsolete comments"
2011-08-26 10:41:16 -07:00
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
3db43165b0
am 80d41e4b
: am a2cc9b22
: Merge "sdk: add DLL_EXTENSION as an atree variable"
...
* commit '80d41e4b7555aed399c7bd23647947d7eade3fe6':
sdk: add DLL_EXTENSION as an atree variable
2011-08-25 14:30:00 -07: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
80d41e4b75
am a2cc9b22
: Merge "sdk: add DLL_EXTENSION as an atree variable"
...
* commit 'a2cc9b227ae01803dfc4bc1987071fd6eee08bb6':
sdk: add DLL_EXTENSION as an atree variable
2011-08-25 12:14:35 -07: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
a2cc9b227a
Merge "sdk: add DLL_EXTENSION as an atree variable"
2011-08-25 12:03:03 -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
David 'Digit' Turner
557c51f2ea
sdk: add DLL_EXTENSION as an atree variable
...
This patch defines the DLL_EXTENSION variable to the host
shared library suffix (i.e. either ".so", ".dll" or ".dylib")
when packaging the SDK.
This is required by another patch to sdk/build/tools.atree that
will use ${DLL_EXTENSION} to copy the GLES emulation host libraries
to $SDK/tools/lib
Change-Id: I120d39e905afb453b0702d5f0eb2707f214385cc
2011-08-25 14:28:03 +02: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