OSDN Git Service
Ying Wang [Thu, 8 Sep 2011 21:28:32 +0000 (14:28 -0700)]
am
d62de0f8: Merge "Provide LOCAL_RENDERSCRIPT_TARGET_API override."
* commit '
d62de0f88450e310188234ee1b3d5afdd0312b9a':
Provide LOCAL_RENDERSCRIPT_TARGET_API override.
Ying Wang [Thu, 8 Sep 2011 21:26:28 +0000 (14:26 -0700)]
Merge "Provide LOCAL_RENDERSCRIPT_TARGET_API override."
Ying Wang [Thu, 8 Sep 2011 21:18:38 +0000 (14:18 -0700)]
am
f1054bf2: Merge "Discard hidden files when rounding up resource."
* commit '
f1054bf22e3a2bde2ee587db2e29d68dada104d2':
Discard hidden files when rounding up resource.
Ying Wang [Thu, 8 Sep 2011 21:16:23 +0000 (14:16 -0700)]
Merge "Discard hidden files when rounding up resource."
Doug Zongker [Thu, 8 Sep 2011 19:05:42 +0000 (12:05 -0700)]
am
c29dfcad: Merge "save uid/gid/mode information of boot and recovery files"
* commit '
c29dfcad757727bf2c8f640c09121a2d0b55909f':
save uid/gid/mode information of boot and recovery files
Doug Zongker [Thu, 8 Sep 2011 19:04:27 +0000 (12:04 -0700)]
Merge "save uid/gid/mode information of boot and recovery files"
Raphael [Thu, 8 Sep 2011 17:17:53 +0000 (10:17 -0700)]
am
9b73fdab: Merge "Enable \'make traceview\' under Windows."
* commit '
9b73fdabc4e81ab089f3435abe411fb7aee3c1e4':
Enable 'make traceview' under Windows.
Raphael [Thu, 8 Sep 2011 17:16:44 +0000 (10:16 -0700)]
Merge "Enable 'make traceview' under Windows."
Brian Muramatsu [Thu, 8 Sep 2011 17:10:45 +0000 (10:10 -0700)]
am
d47da708: am
3eae5b7c: am
08b8e002: am
2306106d: Use package.apk.unaligned in CTS Build
* commit '
d47da7081726c0fdef468cea4ee0530ed25b55c8':
Use package.apk.unaligned in CTS Build
Brian Muramatsu [Thu, 8 Sep 2011 17:08:27 +0000 (10:08 -0700)]
am
3eae5b7c: am
08b8e002: am
2306106d: Use package.apk.unaligned in CTS Build
* commit '
3eae5b7c1b3197bed4c883a671cfea9d5d9570bf':
Use package.apk.unaligned in CTS Build
Ying Wang [Thu, 8 Sep 2011 13:41:37 +0000 (06:41 -0700)]
am
d9020c2e: Add ABI specific include path for NDK.
* commit '
d9020c2e9a5c686d6208be48daa44bfa23065b2c':
Add ABI specific include path for NDK.
Ying Wang [Wed, 7 Sep 2011 21:31:47 +0000 (14:31 -0700)]
Add ABI specific include path for NDK.
Change-Id: I37a935126b9a1e544fc5a7471cf6ca224fc89cf3
Doug Zongker [Wed, 7 Sep 2011 21:11:51 +0000 (14:11 -0700)]
save uid/gid/mode information of boot and recovery files
Save these in the target_files so we don't have to depend on using the
contents of android_filesystem_config.h at the tip of tree.
Bug:
5266067
Change-Id: Ica5dd43a2013c9db72d7c9434f9d7de1abaf18f9
Raphael [Fri, 2 Sep 2011 21:13:57 +0000 (14:13 -0700)]
Enable 'make traceview' under Windows.
Change-Id: I2b89d2ee66d0bb4a1b2bb6e4ea15d3b0419cead9
Justin Ho [Tue, 6 Sep 2011 20:19:39 +0000 (13:19 -0700)]
am
0f2e55e4: Merge "Updated dex-preopt BOOTCLASSPATH with values from init.rc Bug:
5032006"
* commit '
0f2e55e47d269250237885ea01dee4324a9a6eb1':
Updated dex-preopt BOOTCLASSPATH with values from init.rc Bug:
5032006
Justin Ho [Tue, 6 Sep 2011 20:18:22 +0000 (13:18 -0700)]
Merge "Updated dex-preopt BOOTCLASSPATH with values from init.rc Bug:
5032006"
Justin Ho [Tue, 6 Sep 2011 20:04:36 +0000 (13:04 -0700)]
Updated dex-preopt BOOTCLASSPATH with values from init.rc
Bug:
5032006
Change-Id: I6ed7e55ec2b278c0d60ad4e17208480d05af61bc
Doug Zongker [Tue, 6 Sep 2011 17:39:32 +0000 (10:39 -0700)]
am
e1a8e3ae: allow setting LOCAL_STRIP_MODULE on multi_prebuilts
* commit '
e1a8e3aef3834e8b451f2f8ae465c47ed58aba00':
allow setting LOCAL_STRIP_MODULE on multi_prebuilts
Doug Zongker [Fri, 2 Sep 2011 23:12:56 +0000 (16:12 -0700)]
allow setting LOCAL_STRIP_MODULE on multi_prebuilts
Change-Id: I4a58255381ba8a50d8f9512bf9892f5050599393
Brian Muramatsu [Fri, 2 Sep 2011 23:56:07 +0000 (16:56 -0700)]
am
08b8e002: am
2306106d: Use package.apk.unaligned in CTS Build
* commit '
08b8e0024812ea907cf3938bcd07b8dca6188eaf':
Use package.apk.unaligned in CTS Build
Brian Muramatsu [Fri, 2 Sep 2011 23:53:43 +0000 (16:53 -0700)]
am
2306106d: Use package.apk.unaligned in CTS Build
* commit '
2306106d3e2cd774ef0b2cd782442f90c402341f':
Use package.apk.unaligned in CTS Build
Brian Muramatsu [Fri, 2 Sep 2011 22:29:10 +0000 (15:29 -0700)]
Use package.apk.unaligned in CTS Build
Bug
5252989
This prevents dexopt installation failures when trying to
install CTS apks on production devices.
Change-Id: I1eeb0ac567c3be3b831c8c27dee4005ec00fd7cd
Mike Lockwood [Fri, 2 Sep 2011 21:10:21 +0000 (14:10 -0700)]
Merge "main.mk: Allow overriding subdirs via make variable TARGET_SUBDIRS" into ics-aah
Mike Lockwood [Thu, 1 Sep 2011 20:02:54 +0000 (16:02 -0400)]
main.mk: Allow overriding subdirs via make variable TARGET_SUBDIRS
Change-Id: Id7f861d73288ef732473050d1d69b20fc7c5d7d6
Signed-off-by: Mike Lockwood <lockwood@android.com>
Justin Ho [Fri, 2 Sep 2011 16:18:37 +0000 (09:18 -0700)]
am
19b22a94: Remove pinyinIME
* commit '
19b22a94132e3ef670d87a045afb64cfd00c13b6':
Remove pinyinIME
Justin Ho [Fri, 2 Sep 2011 15:00:53 +0000 (08:00 -0700)]
Remove pinyinIME
Change-Id: If83419336294eb56d5b96384a7bc9d9821888b02
Owen Lin [Fri, 2 Sep 2011 00:45:13 +0000 (17:45 -0700)]
am
0a37a63a: Merge "Replace GalleryNew3D with Gallery2 in AOSP."
* commit '
0a37a63a0e549a31a0a10ef50f4681dbbe3db045':
Replace GalleryNew3D with Gallery2 in AOSP.
Owen Lin [Fri, 2 Sep 2011 00:43:31 +0000 (17:43 -0700)]
Merge "Replace GalleryNew3D with Gallery2 in AOSP."
Justin Ho [Thu, 1 Sep 2011 21:09:46 +0000 (14:09 -0700)]
am
bdab41a1: Add image size calcuations into the script
* commit '
bdab41a16f63630672bde02af28d2e567578fb21':
Add image size calcuations into the script
Justin Ho [Thu, 1 Sep 2011 20:34:20 +0000 (13:34 -0700)]
Add image size calcuations into the script
Change-Id: Ide13a873982bae21e2b8735a235389a660abd592
Owen Lin [Thu, 1 Sep 2011 06:21:22 +0000 (14:21 +0800)]
Replace GalleryNew3D with Gallery2 in AOSP.
Change-Id: I61e35fa7e629872d2c961a8fa35d8068fb918cc6
Justin Ho [Wed, 31 Aug 2011 23:33:17 +0000 (16:33 -0700)]
am
b139b6a1: Calculate system image size at build, for harvesting later
* commit '
b139b6a1a550daa0df4e670ab3fa550be8204d2f':
Calculate system image size at build, for harvesting later
Justin Ho [Wed, 31 Aug 2011 15:36:46 +0000 (08:36 -0700)]
Calculate system image size at build, for harvesting later
Change-Id: I6bfcde0e5df3f6da453f28354839e356f9191c0e
Justin Ho [Tue, 30 Aug 2011 21:47:23 +0000 (14:47 -0700)]
am
17a27047: 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
* commit '
17a27047bb4d5f255b1c1c55864dae4425e9d6ee':
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
Justin Ho [Tue, 30 Aug 2011 21:29:18 +0000 (14:29 -0700)]
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
Stephen Hines [Tue, 30 Aug 2011 01:53:53 +0000 (18:53 -0700)]
Provide LOCAL_RENDERSCRIPT_TARGET_API override.
BUG=
5206223
This allows us to set the RS API level independent of the other SDK
versions that a developer might choose.
Change-Id: Id8b476abcbbbdaa86e04ba0ea16414cb2fa5bd15
Eino-Ville Talvala [Mon, 29 Aug 2011 22:39:37 +0000 (15:39 -0700)]
am
5d8a5cee: Merge "Add filterfw.jar to standard list of java libraries to include."
* commit '
5d8a5ceecb291b6ab6ba64f9e604db419fb81c8c':
Add filterfw.jar to standard list of java libraries to include.
Ying Wang [Mon, 29 Aug 2011 22:15:33 +0000 (15:15 -0700)]
am
45bee774: am
a1b603a5: am
4b398749: am
c5033a33: Merge "x86: remove obsolete comments"
* commit '
45bee774eb8c34df3b0e48557d17e28d78aada2a':
x86: remove obsolete comments
David 'Digit' Turner [Mon, 29 Aug 2011 22:15:31 +0000 (15:15 -0700)]
am
9a1dd170: am
3db43165: am
80d41e4b: am
a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"
* commit '
9a1dd17028d0259c799c7c81aa54c042324a29c7':
sdk: add DLL_EXTENSION as an atree variable
David 'Digit' Turner [Mon, 29 Aug 2011 22:15:19 +0000 (15:15 -0700)]
am
321ce5f8: Merge "resolved conflicts for merge of
6da54b6e to master"
* commit '
321ce5f82079bc2ea80586bd5abc8250bc296ae0':
emulator: Enable GLES emulation libraries
Eino-Ville Talvala [Mon, 29 Aug 2011 22:12:04 +0000 (15:12 -0700)]
Merge "Add filterfw.jar to standard list of java libraries to include."
Ying Wang [Mon, 29 Aug 2011 18:05:08 +0000 (11:05 -0700)]
am
a1b603a5: am
4b398749: am
c5033a33: Merge "x86: remove obsolete comments"
* commit '
a1b603a556e338d4899a62ea37810aff81ab7fa1':
x86: remove obsolete comments
David 'Digit' Turner [Mon, 29 Aug 2011 18:04:47 +0000 (11:04 -0700)]
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
David 'Digit' Turner [Mon, 29 Aug 2011 17:58:09 +0000 (10:58 -0700)]
Merge "resolved conflicts for merge of
6da54b6e to master"
Eino-Ville Talvala [Mon, 22 Aug 2011 17:42:44 +0000 (10:42 -0700)]
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
Doug Zongker [Fri, 26 Aug 2011 21:12:32 +0000 (14:12 -0700)]
am
e92f15a8: patch the /system/build.prop file last
* commit '
e92f15a85885de8db24b6f2ab536d25cf20a5ca5':
patch the /system/build.prop file last
Doug Zongker [Fri, 26 Aug 2011 20:46:40 +0000 (13:46 -0700)]
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
Ying Wang [Fri, 26 Aug 2011 19:12:48 +0000 (12:12 -0700)]
am
4b398749: am
c5033a33: Merge "x86: remove obsolete comments"
* commit '
4b3987498eb15dc654fe572aadf53396aac36479':
x86: remove obsolete comments
Ying Wang [Fri, 26 Aug 2011 19:10:45 +0000 (12:10 -0700)]
am
c5033a33: Merge "x86: remove obsolete comments"
* commit '
c5033a3357b824a8285da67357a0d289750f4a72':
x86: remove obsolete comments
Ying Wang [Fri, 26 Aug 2011 17:41:16 +0000 (10:41 -0700)]
Merge "x86: remove obsolete comments"
David 'Digit' Turner [Thu, 25 Aug 2011 22:53:34 +0000 (00:53 +0200)]
resolved conflicts for merge of
6da54b6e to master
Change-Id: Ic1e08fffacb66e8006877b7b5c51e9e7f03d39a2
John Grossman [Tue, 28 Jun 2011 00:29:32 +0000 (17:29 -0700)]
Add the default local_time hal implementation to builds.
Cherry-picked from master-tungsten:
Change-Id: I93ee0702fd48e05f75af13d7529c80d3d5b2b2cd
Change-Id: Icbc86cb26023ac862ec524603b68de8951834b92
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
David 'Digit' Turner [Thu, 25 Aug 2011 21:30:00 +0000 (14:30 -0700)]
am
80d41e4b: am
a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"
* commit '
80d41e4b7555aed399c7bd23647947d7eade3fe6':
sdk: add DLL_EXTENSION as an atree variable
David 'Digit' Turner [Thu, 25 Aug 2011 21:23:32 +0000 (23:23 +0200)]
resolved conflicts for merge of
7be88d00 to honeycomb-plus-aosp
Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
Jean-Baptiste Queru [Thu, 25 Aug 2011 20:27:54 +0000 (13:27 -0700)]
am
d7d096df: Tighten the toolchain version check
* commit '
d7d096df71c65cbcd35def83bdb4f7cc86c3f290':
Tighten the toolchain version check
David 'Digit' Turner [Thu, 25 Aug 2011 19:14:35 +0000 (12:14 -0700)]
am
a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"
* commit '
a2cc9b227ae01803dfc4bc1987071fd6eee08bb6':
sdk: add DLL_EXTENSION as an atree variable
David 'Digit' Turner [Thu, 25 Aug 2011 19:14:33 +0000 (12:14 -0700)]
am
77c6261f: Merge "emulator: Enable GLES emulation libraries"
* commit '
77c6261fb074d87b75d669dd9fb9ab5a12a52cc9':
emulator: Enable GLES emulation libraries
David 'Digit' Turner [Thu, 25 Aug 2011 19:03:03 +0000 (12:03 -0700)]
Merge "sdk: add DLL_EXTENSION as an atree variable"
David 'Digit' Turner [Thu, 25 Aug 2011 19:02:34 +0000 (12:02 -0700)]
Merge "emulator: Enable GLES emulation libraries"
Ying Wang [Thu, 25 Aug 2011 18:36:48 +0000 (11:36 -0700)]
am
6e41a748: Merge "Provide mechanism to override llvm-rs-cc headers."
* commit '
6e41a7483aea711cb81c2223724c421468872803':
Provide mechanism to override llvm-rs-cc headers.
Jean-Baptiste Queru [Fri, 8 Oct 2010 17:58:38 +0000 (10:58 -0700)]
Tighten the toolchain version check
Bug:
3076137
Change-Id: Ibd9f1f13916e31596f94a5b0a90293995da7f2cf
David 'Digit' Turner [Thu, 25 Aug 2011 12:28:03 +0000 (14:28 +0200)]
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
Ying Wang [Wed, 24 Aug 2011 17:26:41 +0000 (10:26 -0700)]
Merge "Provide mechanism to override llvm-rs-cc headers."
Stephen Hines [Wed, 24 Aug 2011 05:01:49 +0000 (22:01 -0700)]
Provide mechanism to override llvm-rs-cc headers.
Change-Id: I87fd496069a9dfde633e2d232e436fa5d7315cc0
jeffhao [Tue, 23 Aug 2011 21:30:44 +0000 (14:30 -0700)]
am
ca94f358: Removing target-api option from build.
* commit '
ca94f3583f33bb8dc5243dcbb50738fff9f945d1':
Removing target-api option from build.
jeffhao [Tue, 23 Aug 2011 21:18:24 +0000 (14:18 -0700)]
Removing target-api option from build.
This is cherry-picked from dalvik-dev.
Change-Id: I85cd23c08fcad400e6426cdaad079e91dcd9babf
David 'Digit' Turner [Tue, 23 Aug 2011 20:25:13 +0000 (22:25 +0200)]
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
Eric Laurent [Mon, 22 Aug 2011 15:31:47 +0000 (08:31 -0700)]
am
9d78854f: Merge "Fix issue
5094017: Media server crashes on ISC emulator."
* commit '
9d78854f0f36f3a209a45e3b9f99adcb0af82c94':
Fix issue
5094017: Media server crashes on ISC emulator.
Eric Laurent [Mon, 22 Aug 2011 15:29:39 +0000 (08:29 -0700)]
Merge "Fix issue
5094017: Media server crashes on ISC emulator."
David Hu [Sun, 21 Aug 2011 01:53:50 +0000 (18:53 -0700)]
am
57afbd18: Merge "GPS Location Test Build Change"
* commit '
57afbd18af79f1c29f7cdc65bb9ac0896bbafb96':
GPS Location Test Build Change
David Hu [Sun, 21 Aug 2011 01:51:20 +0000 (18:51 -0700)]
Merge "GPS Location Test Build Change"
Eric Laurent [Fri, 19 Aug 2011 16:43:49 +0000 (09:43 -0700)]
Fix issue
5094017: Media server crashes on ISC emulator.
Add audio HAL and audio policy hardware module libraries to SDK image.
Change-Id: I96501b1493974ac1738f194f9457461766ea4bff
Ying Wang [Fri, 19 Aug 2011 16:38:31 +0000 (09:38 -0700)]
am
c7fd4a5a: am
2bcdfe14: am
4651ee5d: am
7c7a8f02: Merge "Sort the results of findleaves again."
* commit '
c7fd4a5a7b33ca1ae528940e132fe301abe4fb61':
Sort the results of findleaves again.
Ying Wang [Fri, 19 Aug 2011 16:36:56 +0000 (09:36 -0700)]
am
2bcdfe14: am
4651ee5d: am
7c7a8f02: Merge "Sort the results of findleaves again."
* commit '
2bcdfe145d485fc28e86700e4ed57ac67368de25':
Sort the results of findleaves again.
Wink Saville [Fri, 19 Aug 2011 16:36:48 +0000 (09:36 -0700)]
am
adf81367: (-s ours) am
43c15339: (-s ours) Merge "DO NOT MERGE: resolved conflicts for merge of
15e199c8 to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '
adf813670802e515ec420e9b0ba0791fab95dd6f':
DO NOT MERGE: Update hc-LTE PLATFORM_VERSION from 3.2 to 3.2.2.
Ying Wang [Fri, 19 Aug 2011 16:35:50 +0000 (09:35 -0700)]
am
4651ee5d: am
7c7a8f02: Merge "Sort the results of findleaves again."
* commit '
4651ee5db200772921bad828c280d165ff3997c3':
Sort the results of findleaves again.
Wink Saville [Fri, 19 Aug 2011 16:34:14 +0000 (09:34 -0700)]
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.
Ying Wang [Fri, 19 Aug 2011 16:32:40 +0000 (09:32 -0700)]
am
7c7a8f02: Merge "Sort the results of findleaves again."
* commit '
7c7a8f023af38e7e8be7cbb6acbe1ab770cdd704':
Sort the results of findleaves again.
Wink Saville [Fri, 19 Aug 2011 16:28:34 +0000 (09:28 -0700)]
Merge "DO NOT MERGE: resolved conflicts for merge of
15e199c8 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Ying Wang [Fri, 19 Aug 2011 16:24:44 +0000 (09:24 -0700)]
Merge "Sort the results of findleaves again."
Ishida, Haruyasu [Mon, 20 Dec 2010 14:37:54 +0000 (15:37 +0100)]
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
Raphael Moll [Wed, 17 Aug 2011 18:36:25 +0000 (11:36 -0700)]
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.
Raphael Moll [Wed, 17 Aug 2011 18:29:48 +0000 (11:29 -0700)]
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.
Wink Saville [Wed, 17 Aug 2011 18:18:33 +0000 (11:18 -0700)]
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
Raphael Moll [Wed, 17 Aug 2011 18:26:07 +0000 (11:26 -0700)]
am
7d9fe517: Merge "Add sdk/rule_api to the Windows build paths."
* commit '
7d9fe5174787a5638993a15b165bc9115c16da0f':
Add sdk/rule_api to the Windows build paths.
Raphael Moll [Wed, 17 Aug 2011 18:06:39 +0000 (11:06 -0700)]
Merge "Add sdk/rule_api to the Windows build paths."
Wink Saville [Wed, 17 Aug 2011 17:03:51 +0000 (10:03 -0700)]
DO NOT MERGE: Update hc-LTE PLATFORM_VERSION from 3.2 to 3.2.2.
Change-Id: Ib30bf10669119b588c691e4cebdc8093f402e3e4
Raphael Moll [Wed, 17 Aug 2011 02:40:03 +0000 (19:40 -0700)]
Add sdk/rule_api to the Windows build paths.
Change-Id: I4976b50d829e4b26b4f9935a1a184937dd115198
Brian Swetland [Tue, 16 Aug 2011 23:15:26 +0000 (16:15 -0700)]
fix tiny android builds (add mksh)
Change-Id: I0cf5068b6e9b350259009c5ecf7f2946d05f7b2d
Ying Wang [Mon, 15 Aug 2011 18:15:51 +0000 (11:15 -0700)]
Merge "Update build to properly use prebuilt llvm-rs-cc."
Ying Wang [Thu, 11 Aug 2011 23:59:48 +0000 (16:59 -0700)]
am
6d38bdfc: resolved conflicts for merge of
a74a4811 to honeycomb-plus-aosp
* commit '
6d38bdfc7b9ff699370b4a40dcbdddce0ea713b8':
sha module is deprecated
Ying Wang [Thu, 11 Aug 2011 23:55:00 +0000 (16:55 -0700)]
resolved conflicts for merge of
a74a4811 to honeycomb-plus-aosp
Change-Id: I8400ac2bead6aa1a9902d44bf65906084ad353ad
Ying Wang [Thu, 11 Aug 2011 01:02:15 +0000 (18:02 -0700)]
am
3f5326fd: Merge "sha module is deprecated"
* commit '
3f5326fd9fe2a5c46b4e6643e2b277e7f13cac04':
sha module is deprecated
Ying Wang [Thu, 11 Aug 2011 00:50:05 +0000 (17:50 -0700)]
Merge "sha module is deprecated"
david [Tue, 15 Mar 2011 14:21:38 +0000 (14:21 +0000)]
sha module is deprecated
This patch removes the deprecated warnings from the python
scripts.
Change-Id: I052a0aab3fb28dd1d78de1307edafda6b6c35e5f
Stephen Hines [Wed, 10 Aug 2011 20:53:05 +0000 (13:53 -0700)]
Update build to properly use prebuilt llvm-rs-cc.
Change-Id: I52a83066b6c08d05d69db4f93631eeaf9c0b41c6
Ying Wang [Wed, 10 Aug 2011 23:05:51 +0000 (16:05 -0700)]
Discard hidden files when rounding up resource.
Aapt will discard the hidden files anyway.
With this change, we can avoid unnecessary rebuild if a module has only
hidden files in its resource dir.
Change-Id: Iaf0a13e038cca5fb60012c550cc90f7abbe967e1
The Android Open Source Project [Wed, 10 Aug 2011 14:28:42 +0000 (07:28 -0700)]
Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release
Change-Id: I96a28218361adfe4730e7c161cd5bd861976fbc6
The Android Automerger [Wed, 10 Aug 2011 00:47:42 +0000 (17:47 -0700)]
GWK15G
Change-Id: Ice488cd27f50a2f100e100d659c737d4bcc09f5c
android-merger [Mon, 8 Aug 2011 22:48:36 +0000 (15:48 -0700)]
GRK39
Change-Id: Ia4b60a25edae6e8525710ffd11e30308eb22d0db