OSDN Git Service
Ying Wang [Fri, 16 Mar 2012 18:17:48 +0000 (11:17 -0700)]
Swicth to toolchain gcc-4.6
Change-Id: Iead6fe6f194821b565971bc2cac026b7d9aebe78
The Android Automerger [Fri, 16 Mar 2012 21:27:23 +0000 (14:27 -0700)]
JRM75C
The Android Automerger [Thu, 15 Mar 2012 23:37:40 +0000 (16:37 -0700)]
JRM75B
The Android Automerger [Thu, 15 Mar 2012 16:05:29 +0000 (09:05 -0700)]
JRM75
The Android Automerger [Thu, 15 Mar 2012 15:55:23 +0000 (08:55 -0700)]
merge in jb-release history after reset to master
Glenn Kasten [Wed, 14 Mar 2012 23:42:17 +0000 (16:42 -0700)]
Merge "Use pathmap.mk for system/media includes"
Glenn Kasten [Tue, 13 Mar 2012 22:23:33 +0000 (15:23 -0700)]
Use pathmap.mk for system/media includes
Currently these point to the old location.
Another CL will move them to the new location.
Change-Id: I61dd732981a9a7a3f4a2c1cc01dc072f4fb6a2b8
Andreas Huber [Wed, 14 Mar 2012 15:15:18 +0000 (08:15 -0700)]
Merge "Make sure to copy codec setup files to their proper filesystem location on the emulator"
The Android Automerger [Wed, 14 Mar 2012 14:10:29 +0000 (07:10 -0700)]
JRM74
The Android Automerger [Wed, 14 Mar 2012 13:59:48 +0000 (06:59 -0700)]
merge in jb-release history after reset to master
Ying Wang [Wed, 14 Mar 2012 02:49:59 +0000 (19:49 -0700)]
Fix tests build.
Use the conditional only after the tests build variant is phased out.
Change-Id: Ide691700dda4bbf56c6f81f923d1b8c5eb196b85
Ying Wang [Wed, 14 Mar 2012 02:13:19 +0000 (19:13 -0700)]
Merge "Add build goal "tests"."
Ying Wang [Wed, 14 Mar 2012 01:58:27 +0000 (18:58 -0700)]
Add build goal "tests".
Bug:
5368571
The phony build goal "tests" will eventually replace the build variant
tests.
Change-Id: Ia656f2cf2260feeaa8fa32e9221b7f9ce0990262
Romain Guy [Tue, 13 Mar 2012 23:56:17 +0000 (16:56 -0700)]
Make adbs work again on Darwin x86.
We don't support building on Darwin PPC so let's always assume x86.
Change-Id: I079a4040f1c0a144d4cdd1e2b3d2a183c00bf7b0
The Android Automerger [Tue, 13 Mar 2012 23:08:58 +0000 (16:08 -0700)]
JRM73C
Andrew Hsieh [Tue, 13 Mar 2012 22:48:21 +0000 (15:48 -0700)]
Merge "Point to new linux prebuilt toolchain for SDK build"
Ying Wang [Tue, 13 Mar 2012 20:00:46 +0000 (13:00 -0700)]
Merge "Remove system partition files from the test zip file."
The Android Automerger [Tue, 13 Mar 2012 18:45:34 +0000 (11:45 -0700)]
JRM73B
Ying Wang [Tue, 13 Mar 2012 18:22:04 +0000 (11:22 -0700)]
Remove system partition files from the test zip file.
Bug:
6157562
Change-Id: I581c6db7d47b42617f8ef6097ccd0aae52c7e1b4
Andreas Huber [Tue, 13 Mar 2012 16:01:51 +0000 (09:01 -0700)]
Make sure to copy codec setup files to their proper filesystem location on the emulator
Change-Id: I97b6944646fcabc754526ef88f7fdd63d0d1da0a
The Android Automerger [Tue, 13 Mar 2012 14:10:56 +0000 (07:10 -0700)]
JRM73
The Android Automerger [Tue, 13 Mar 2012 13:59:32 +0000 (06:59 -0700)]
merge in jb-release history after reset to master
Andrew Hsieh [Tue, 13 Mar 2012 09:17:35 +0000 (02:17 -0700)]
Point to new linux prebuilt toolchain for SDK build
Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
Svetoslav Ganov [Mon, 12 Mar 2012 23:49:58 +0000 (16:49 -0700)]
Adding clean variables for some variables used in CTS.
1. A CTS package can specify the test runner used to launch
its tests from the device. This is useful for preparing
and cleaning the device through some shell commands if
necessary.
bug:
5946699
Change-Id: Ib1d6454c4274b1c37323235c9b3a195f3b9d8131
The Android Automerger [Mon, 12 Mar 2012 23:04:28 +0000 (16:04 -0700)]
JRM72B
Ying Wang [Mon, 12 Mar 2012 19:12:38 +0000 (12:12 -0700)]
Merge "Fix build caused by 168380"
Keun young Park [Mon, 12 Mar 2012 19:10:42 +0000 (12:10 -0700)]
Fix build caused by 168380
Change-Id: Iebda5669f48fe505146b8f2f8b35d06621d4b0e6
Keun young Park [Mon, 12 Mar 2012 18:57:39 +0000 (11:57 -0700)]
Merge "changes to add pdk1 / pdk2 build for PDK build - additional files will be added to pdk/build Bug:
6079146"
Keun young Park [Mon, 27 Feb 2012 23:49:23 +0000 (15:49 -0800)]
changes to add pdk1 / pdk2 build for PDK build
- additional files will be added to pdk/build
Bug:
6079146
Change-Id: Ieb5fcab8002193250d770b923f60ec7333ce84e5
The Android Automerger [Mon, 12 Mar 2012 14:11:00 +0000 (07:11 -0700)]
JRM72
The Android Automerger [Mon, 12 Mar 2012 13:59:46 +0000 (06:59 -0700)]
merge in jb-release history after reset to master
Jean-Michel Trivi [Sat, 10 Mar 2012 02:52:00 +0000 (18:52 -0800)]
Include the downmix effect in the platform
Change-Id: Ifc05bb7edc06994623848adf568524a98f0f316a
The Android Automerger [Fri, 9 Mar 2012 21:50:09 +0000 (13:50 -0800)]
JRM68D
Chih-Chung Chang [Fri, 9 Mar 2012 09:20:58 +0000 (01:20 -0800)]
Merge "Remove Camera package (it's merged into Gallery package)."
The Android Automerger [Fri, 9 Mar 2012 04:18:21 +0000 (20:18 -0800)]
JRM68C
The Android Automerger [Thu, 8 Mar 2012 23:54:34 +0000 (15:54 -0800)]
JRM68B
Mathias Agopian [Thu, 8 Mar 2012 22:45:34 +0000 (14:45 -0800)]
Merge "update include paths to new location"
Mathias Agopian [Thu, 8 Mar 2012 22:45:28 +0000 (14:45 -0800)]
Merge "add frameworks/native include paths"
The Android Automerger [Thu, 8 Mar 2012 15:10:04 +0000 (07:10 -0800)]
JRM68
The Android Automerger [Thu, 8 Mar 2012 14:59:26 +0000 (06:59 -0800)]
merge in jb-release history after reset to master
Chih-Chung Chang [Thu, 8 Mar 2012 12:06:26 +0000 (20:06 +0800)]
Remove Camera package (it's merged into Gallery package).
Change-Id: I6808438055d256bd5e2ac607ccafe5c9e5e9311a
Scott Anderson [Thu, 8 Mar 2012 01:15:06 +0000 (17:15 -0800)]
Rename help function in envsetup.sh to be hmm
Bash has a built-in command "help" that is useful for getting
help on bash commands without wading through the bash man page
(e.g. "help test" will give you the syntax for those "if [ ]"
expressions). Overwriting a built-in with a convenience function
is not good.
The function "hmm" was added recently that serves much the same
purpose as help. It seems like a good idea to remove the new
"hmm" command and rename "help" to be "hmm" so we no longer
overwrite the built-in.
Change-Id: I2079b3e6a10715956ec077d31e817a939c6ee4a0
Signed-off-by: Scott Anderson <saa@android.com>
Roman Nurik [Thu, 8 Mar 2012 01:05:22 +0000 (17:05 -0800)]
am
8caffd62: am
0d1630a3: am
d9ca90b4: Add SDK template and assets for Android Design
* commit '
8caffd622d3ee322040baa9f1a70eedfb74c11f0':
Roman Nurik [Thu, 8 Mar 2012 01:05:15 +0000 (17:05 -0800)]
am
52f25665: am
a23a3d83: am
d9ca90b4: Add SDK template and assets for Android Design
* commit '
52f256655855e0a03653a007cb4279eb1c152c5e':
Add SDK template and assets for Android Design
Dirk Dougherty [Thu, 8 Mar 2012 00:48:24 +0000 (16:48 -0800)]
Dirk Dougherty [Thu, 8 Mar 2012 00:48:23 +0000 (16:48 -0800)]
am
460eebe3: am
79736c72: am
7d114b19: doc change: assets for play
* commit '
460eebe3b7161cc3d74eba0ab6381dd4894bfffc':
doc change: assets for play
Ying Wang [Thu, 8 Mar 2012 00:00:27 +0000 (16:00 -0800)]
Merge "Update llvm-rs-cc build to use unified headers in all cases."
Stephen Hines [Wed, 7 Mar 2012 05:48:36 +0000 (21:48 -0800)]
Update llvm-rs-cc build to use unified headers in all cases.
Change-Id: I66a2cc5f762b7d170f4bfc6c88f8c7df11be4f4b
The Android Automerger [Wed, 7 Mar 2012 23:48:34 +0000 (15:48 -0800)]
JRM67B
The Android Automerger [Wed, 7 Mar 2012 15:07:31 +0000 (07:07 -0800)]
JRM67
The Android Automerger [Wed, 7 Mar 2012 14:59:19 +0000 (06:59 -0800)]
merge in jb-release history after reset to master
Roman Nurik [Tue, 6 Mar 2012 22:54:16 +0000 (14:54 -0800)]
am
0d1630a3: am
d9ca90b4: Add SDK template and assets for Android Design
* commit '
0d1630a34dc6ecf59c67ee4a51569fe7e933649d':
Roman Nurik [Tue, 6 Mar 2012 22:43:02 +0000 (14:43 -0800)]
am
a23a3d83: am
d9ca90b4: Add SDK template and assets for Android Design
* commit '
a23a3d83143911358dd917a9f7f4cd9b097e4af8':
Add SDK template and assets for Android Design
Roman Nurik [Tue, 6 Mar 2012 22:41:33 +0000 (14:41 -0800)]
am
d9ca90b4: Add SDK template and assets for Android Design
* commit '
d9ca90b4b9bd631329e6241b1ac4824ad0821639':
Add SDK template and assets for Android Design
Roman Nurik [Tue, 6 Mar 2012 22:41:13 +0000 (14:41 -0800)]
am
d9ca90b4: Add SDK template and assets for Android Design
* commit '
d9ca90b4b9bd631329e6241b1ac4824ad0821639':
Add SDK template and assets for Android Design
Roman Nurik [Tue, 6 Mar 2012 20:25:34 +0000 (12:25 -0800)]
Add SDK template and assets for Android Design
Change-Id: Id7a953bf59e5e05242c46cdfb2b425e80424fc2f
The Android Automerger [Tue, 6 Mar 2012 15:08:52 +0000 (07:08 -0800)]
JRM66
The Android Automerger [Tue, 6 Mar 2012 14:59:29 +0000 (06:59 -0800)]
merge in jb-release history after reset to master
Dirk Dougherty [Tue, 6 Mar 2012 06:56:21 +0000 (22:56 -0800)]
Dirk Dougherty [Tue, 6 Mar 2012 06:55:15 +0000 (22:55 -0800)]
am
79736c72: am
7d114b19: doc change: assets for play
* commit '
79736c72c219b283c38282ef6d42b662195c126d':
doc change: assets for play
Dirk Dougherty [Tue, 6 Mar 2012 05:39:25 +0000 (21:39 -0800)]
am
7d114b19: doc change: assets for play
* commit '
7d114b195d2224ba8c6f8e156467b969317e0bf9':
doc change: assets for play
Dirk Dougherty [Tue, 6 Mar 2012 05:39:00 +0000 (21:39 -0800)]
am
7d114b19: doc change: assets for play
* commit '
7d114b195d2224ba8c6f8e156467b969317e0bf9':
doc change: assets for play
Dirk Dougherty [Mon, 5 Mar 2012 04:34:56 +0000 (20:34 -0800)]
doc change: assets for play
Change-Id: I58647fd0059c5de54dd7665527a73f61e0d2dd32
Mathias Agopian [Tue, 6 Mar 2012 02:45:37 +0000 (18:45 -0800)]
update include paths to new location
Change-Id: I13dfa74f35ee778615cdb9459fc2e18bc37d62a1
Mathias Agopian [Tue, 6 Mar 2012 00:08:15 +0000 (16:08 -0800)]
Merge "add a name for opengl tests include paths"
Mathias Agopian [Tue, 6 Mar 2012 00:04:31 +0000 (16:04 -0800)]
add frameworks/native include paths
Change-Id: I1ede8075dc77f77f5a9bc4a53663d4a74842ab36
Mathias Agopian [Tue, 6 Mar 2012 00:01:41 +0000 (16:01 -0800)]
add a name for opengl tests include paths
Change-Id: I4fd30376bcc9549da9391cde99b884eab305d5dd
The Android Automerger [Mon, 5 Mar 2012 23:13:05 +0000 (15:13 -0800)]
JRM65C
The Android Automerger [Mon, 5 Mar 2012 19:55:24 +0000 (11:55 -0800)]
JRM65B
The Android Automerger [Mon, 5 Mar 2012 15:10:11 +0000 (07:10 -0800)]
JRM65
The Android Automerger [Mon, 5 Mar 2012 14:59:37 +0000 (06:59 -0800)]
merge in jb-release history after reset to master
The Android Open Source Project [Sat, 3 Mar 2012 00:48:33 +0000 (16:48 -0800)]
The Android Open Source Project [Sat, 3 Mar 2012 00:44:17 +0000 (16:44 -0800)]
am
719c9e02: Reconcile with ics-mr1-release
* commit '
719c9e027297693d8874a4c3f8864387b9a93154':
The Android Open Source Project [Sat, 3 Mar 2012 00:41:32 +0000 (16:41 -0800)]
Reconcile with ics-mr1-release
Change-Id: I2484dad4a2ab183880aeede3685b6e0bae83ab82
The Android Open Source Project [Sat, 3 Mar 2012 00:37:54 +0000 (16:37 -0800)]
am
c8b150cf: am
f1b829d1: Reconcile with ics-mr1-release
* commit '
c8b150cfc913c1c97e6205c571ef4a3a96fd2dd5':
IMM62
The Android Open Source Project [Sat, 3 Mar 2012 00:35:21 +0000 (16:35 -0800)]
am
f1b829d1: Reconcile with ics-mr1-release
* commit '
f1b829d19d71df2228a7af2a253877edeaa0f2f0':
IMM62
The Android Open Source Project [Sat, 3 Mar 2012 00:32:47 +0000 (16:32 -0800)]
Reconcile with ics-mr1-release
Change-Id: I7b6a55cf5ad81aa9ddfd4706a4f5998d3153534e
Brian Muramatsu [Fri, 2 Mar 2012 23:13:04 +0000 (15:13 -0800)]
Merge "Include CTS Build Rules"
Brian Muramatsu [Fri, 2 Mar 2012 22:37:08 +0000 (14:37 -0800)]
Include CTS Build Rules
Change-Id: Ieacee8ff6215b22222ea9ea6a1e62fce62daad77
Raphael Moll [Fri, 2 Mar 2012 20:40:04 +0000 (12:40 -0800)]
SDK: Also read sdk/build/tools.OS.atree
This allows us to have per-host OS (or OS + arch) atree files in case we
need to get tools which source varies per host OS, example:
- sdk/build/tools.linux.atree
- sdk/build/tools.linux-x86_64.atree
- sdk/build/tools.windows.atree
etc.
Change-Id: I9a1256548345fb866b0750fce6810913413dd946
The Android Automerger [Fri, 2 Mar 2012 19:55:21 +0000 (11:55 -0800)]
IMM62
The Android Automerger [Fri, 2 Mar 2012 19:49:21 +0000 (11:49 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 2 Mar 2012 04:10:35 +0000 (20:10 -0800)]
JRM61C
The Android Open Source Project [Fri, 2 Mar 2012 00:46:20 +0000 (16:46 -0800)]
The Android Open Source Project [Thu, 1 Mar 2012 23:51:17 +0000 (15:51 -0800)]
am
440370a6: am
2ab3572b: Reconcile with ics-mr1-release
* commit '
440370a609a3170af14e9546d42a539206327335':
IMM59
IMM56D
IMM56C
IMM56B
IMM56
The Android Automerger [Thu, 1 Mar 2012 22:57:11 +0000 (14:57 -0800)]
JRM61B
The Android Open Source Project [Thu, 1 Mar 2012 18:43:33 +0000 (10:43 -0800)]
am
0f03bad3: Reconcile with ics-mr1-release
* commit '
0f03bad3fe7e82838c3bedf220fcf1c1056f6ffb':
The Android Open Source Project [Thu, 1 Mar 2012 18:39:57 +0000 (10:39 -0800)]
Reconcile with ics-mr1-release
Change-Id: I33df3a369f056bd2369452fd056e0de355e6f9b4
The Android Open Source Project [Thu, 1 Mar 2012 18:14:18 +0000 (10:14 -0800)]
am
2ab3572b: Reconcile with ics-mr1-release
* commit '
2ab3572ba3431e45b7dbedaa4573b00fa80826b2':
IMM59
IMM56D
IMM56C
IMM56B
IMM56
The Android Open Source Project [Thu, 1 Mar 2012 18:11:36 +0000 (10:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: I1e421d10ac99db335b199dfa0806d7e244d0c1e9
The Android Automerger [Thu, 1 Mar 2012 15:08:08 +0000 (07:08 -0800)]
JRM61
The Android Automerger [Thu, 1 Mar 2012 14:59:24 +0000 (06:59 -0800)]
merge in jb-release history after reset to master
The Android Automerger [Thu, 1 Mar 2012 00:40:53 +0000 (16:40 -0800)]
JRM60B
Andrew Hsieh [Wed, 29 Feb 2012 20:19:45 +0000 (12:19 -0800)]
Merge "Use %zd instead of %d for variables of type ssize_t"
Andrew Hsieh [Wed, 29 Feb 2012 20:19:26 +0000 (12:19 -0800)]
Merge "BUILD_HOST_64bit=1 to build host tools in 64-bit"
Steve Block [Wed, 29 Feb 2012 19:18:08 +0000 (19:18 +0000)]
Revert "Remove unused notice_files target"
This broke the PRODUCT-sdk-(win_)sdk target of SDK builds
This reverts commit
620a5270fc77431b773f3cfe948c467e03a2c72e.
Change-Id: I81afe68ae98b5daac5fe136ec8d04f6fba5af9b4
Steve Block [Wed, 29 Feb 2012 14:59:15 +0000 (14:59 +0000)]
Remove unused notice_files target
The notice_files target generates $(TARGET_OUT_INTERMEDIATES)/NOTICE.txt and
$(TARGET_OUT_INTERMEDIATES)/NOTICE.html. The former is not needed and the
latter is an explicit dependency of $(TARGET_OUT_INTERMEDIATES)/NOTICE.html.gz.
We can therefore remove the target and the logic to generate NOTICE.txt.
Change-Id: I6179c049bebe590c7298e8be0a30e30265423468
The Android Automerger [Wed, 29 Feb 2012 15:08:37 +0000 (07:08 -0800)]
JRM60
The Android Automerger [Wed, 29 Feb 2012 14:59:28 +0000 (06:59 -0800)]
merge in jb-release history after reset to master
The Android Automerger [Tue, 28 Feb 2012 23:18:24 +0000 (15:18 -0800)]
IMM59