OSDN Git Service
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 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 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
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 [Tue, 28 Feb 2012 23:18:24 +0000 (15:18 -0800)]
IMM59
The Android Automerger [Tue, 28 Feb 2012 23:12:45 +0000 (15:12 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Doug Zongker [Tue, 28 Feb 2012 20:21:08 +0000 (12:21 -0800)]
don't generate retouch commands in OTA scripts
Doing ASLR at OTA time is now obsolete; we can stop emitting this code
in OTA scripts.
Change-Id: I2bcf8ef0697ea5590120f89dcd302f273daf531e
Andrew Hsieh [Tue, 28 Feb 2012 05:03:30 +0000 (21:03 -0800)]
BUILD_HOST_64bit=1 to build host tools in 64-bit
By default we build tool in 32-bit. This flag allow individual tool and its
dependencies to be built in 64-bit (eg. Emulator). Fixes to resolve 64-bit
porting issues (in other git) will be submitted seperately.
Change-Id: I486cf7ddac727d3c374ed890857d497c3a69e598
The Android Automerger [Tue, 28 Feb 2012 00:10:34 +0000 (16:10 -0800)]
IMM56D
The Android Automerger [Tue, 28 Feb 2012 00:09:47 +0000 (16:09 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Andrew Hsieh [Tue, 28 Feb 2012 00:06:00 +0000 (16:06 -0800)]
Use %zd instead of %d for variables of type ssize_t
To generate correct 64-bit code (with -m64)
Change-Id: I7cd5e0c7e8bdcb9ea3bf73df0dcda55f1cb56eec
The Android Automerger [Mon, 27 Feb 2012 22:44:07 +0000 (14:44 -0800)]
IMM56C
The Android Automerger [Mon, 27 Feb 2012 22:41:50 +0000 (14:41 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Mon, 27 Feb 2012 20:31:17 +0000 (12:31 -0800)]
IMM56B
The Android Automerger [Mon, 27 Feb 2012 20:28:07 +0000 (12:28 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 25 Feb 2012 18:45:47 +0000 (10:45 -0800)]
IMM56
The Android Automerger [Sat, 25 Feb 2012 18:41:34 +0000 (10:41 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Fri, 24 Feb 2012 22:11:34 +0000 (14:11 -0800)]
The Android Open Source Project [Fri, 24 Feb 2012 22:09:27 +0000 (14:09 -0800)]
am
d58f3d2b: Reconcile with ics-mr1-release
* commit '
d58f3d2bc47015f7a55b88ff56850b9990689e22':
The Android Open Source Project [Fri, 24 Feb 2012 22:05:46 +0000 (14:05 -0800)]
Reconcile with ics-mr1-release
Change-Id: Idc7bbf210376184867a6265475e34967c00b1315
The Android Open Source Project [Fri, 24 Feb 2012 22:01:53 +0000 (14:01 -0800)]
am
0e7d7f5d: am
134c0348: Reconcile with ics-mr1-release
* commit '
0e7d7f5da314c5114f47863f5cf68e2bfcd2566e':
IMM54
The Android Open Source Project [Fri, 24 Feb 2012 21:59:21 +0000 (13:59 -0800)]
am
134c0348: Reconcile with ics-mr1-release
* commit '
134c0348f9643eff06e1d69f7a144a1870aa29e4':
IMM54
The Android Open Source Project [Fri, 24 Feb 2012 21:57:33 +0000 (13:57 -0800)]
Reconcile with ics-mr1-release
Change-Id: I347cd6c1e6227d2c15efdd5f855268dbe12cd497
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:38:53 +0000 (11:38 -0800)]
am
41ab528f: am
99505268: am
20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
* commit '
41ab528fe3533847fecddb0c6ee7884b17f35279':
Issue warning when "make snod" with dexpreopt enabled.
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:36:52 +0000 (11:36 -0800)]
am
99505268: am
20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
* commit '
9950526875f3b71c764a6d39623842e3c26416db':
Issue warning when "make snod" with dexpreopt enabled.
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:32:08 +0000 (11:32 -0800)]
am
20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
* commit '
20b970e25227c4144c61d0d6108905616dc4f08b':
Issue warning when "make snod" with dexpreopt enabled.
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:20:14 +0000 (11:20 -0800)]
Merge "Issue warning when "make snod" with dexpreopt enabled."
Ying Wang [Fri, 24 Feb 2012 19:05:48 +0000 (11:05 -0800)]
Issue warning when "make snod" with dexpreopt enabled.
Change-Id: I481f963634dd384ed6d3de73dfeeda92b37d227e
Ying Wang [Fri, 24 Feb 2012 00:27:43 +0000 (16:27 -0800)]
Fix bug with the HOST_AR.
Change-Id: I28ab86d3b6e7cbd4391e2640cf8e2be269b03e76
The Android Open Source Project [Thu, 23 Feb 2012 19:20:26 +0000 (11:20 -0800)]
The Android Open Source Project [Thu, 23 Feb 2012 19:20:24 +0000 (11:20 -0800)]
am
0f4616b0: am
065506ec: Reconcile with ics-mr1-release
* commit '
0f4616b017b72deec9f0b3c20205cd447fea835d':
IMM52
The Android Open Source Project [Thu, 23 Feb 2012 19:20:00 +0000 (11:20 -0800)]
The Android Open Source Project [Thu, 23 Feb 2012 19:19:50 +0000 (11:19 -0800)]
am
c4c305e3: am
a2ca4f14: Reconcile with ics-mr1-release
* commit '
c4c305e331e4e5ae3f5616f79dfc597e2abfc166':
IMM48
The Android Automerger [Thu, 23 Feb 2012 18:48:19 +0000 (10:48 -0800)]
IMM54
The Android Automerger [Thu, 23 Feb 2012 18:43:30 +0000 (10:43 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Xavier Ducrohet [Thu, 23 Feb 2012 16:34:50 +0000 (08:34 -0800)]
am
182cc516: am
87e90f4e: am
fe53eeb0: Declare the emulator as a multi-touch device.
* commit '
182cc516576668ced0d419915188c0f3f16a0bfe':
Jean-Baptiste Queru [Thu, 23 Feb 2012 16:19:50 +0000 (08:19 -0800)]
Merge
ab0776e4
Change-Id: Ia73777689fcbe4849a5e29ef4e120e0d1f2ba8bf
The Android Open Source Project [Thu, 23 Feb 2012 15:29:09 +0000 (07:29 -0800)]
The Android Open Source Project [Thu, 23 Feb 2012 15:29:00 +0000 (07:29 -0800)]
am
ae2fa4a5: am
72c4afc9: Reconcile with ics-mr1-release
* commit '
ae2fa4a5bec4574c5da9f32f9f637bd733ab16d0':
IMM47B
Xavier Ducrohet [Thu, 23 Feb 2012 15:28:46 +0000 (07:28 -0800)]
am
9233c075: am
d9bd216e: am
295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '
9233c075d6adea37c694a6f6135f9e58af12b721':
Xavier Ducrohet [Thu, 23 Feb 2012 15:28:46 +0000 (07:28 -0800)]
am
85927411: am
590737b6: am
295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '
85927411d2e249aab081fc39c838dbc6e2ff93ea':
Enable HW accelerated view framework for generic_x86 builds.
The Android Open Source Project [Tue, 21 Feb 2012 23:38:23 +0000 (15:38 -0800)]
am
d0d7086f: Reconcile with ics-mr1-release
* commit '
d0d7086fb6012b72731fcefeabe92edccaaf89eb':
The Android Open Source Project [Tue, 21 Feb 2012 23:36:39 +0000 (15:36 -0800)]
am
065506ec: Reconcile with ics-mr1-release
* commit '
065506ec25b39b1abdcefb483992d71be70defb6':
IMM52
The Android Open Source Project [Tue, 21 Feb 2012 23:36:28 +0000 (15:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie9e79a16a3541f85ef9d1a7ffd4fe470c3570a16
The Android Open Source Project [Tue, 21 Feb 2012 23:34:42 +0000 (15:34 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib089acee59a2ac7913b5d35185f165f777800626
The Android Automerger [Tue, 21 Feb 2012 23:30:40 +0000 (15:30 -0800)]
IMM52
The Android Automerger [Tue, 21 Feb 2012 23:25:53 +0000 (15:25 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 21 Feb 2012 23:15:26 +0000 (15:15 -0800)]
am
96859329: Reconcile with ics-mr1-release
* commit '
96859329d3f9a7a1c9834810e16747e205ea16c7':
The Android Open Source Project [Tue, 21 Feb 2012 23:13:23 +0000 (15:13 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4c70661759198e26a86a1070746a9b609598a2f2
The Android Open Source Project [Tue, 21 Feb 2012 23:08:13 +0000 (15:08 -0800)]
am
a2ca4f14: Reconcile with ics-mr1-release
* commit '
a2ca4f14f43636b00aba274718854e9ed851959d':
IMM48
The Android Open Source Project [Tue, 21 Feb 2012 23:06:21 +0000 (15:06 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3f6da4c538fdb160bed6228d1d57026c7e9c12eb
Doug Zongker [Tue, 21 Feb 2012 20:59:33 +0000 (12:59 -0800)]
Merge "releasetools: Fix image size checking"
Mathias Agopian [Tue, 21 Feb 2012 20:52:15 +0000 (12:52 -0800)]
Merge "frameworks/base refactoring"
Kenny Root [Tue, 21 Feb 2012 20:52:12 +0000 (12:52 -0800)]
Merge "Enable TLS register by default for ARMv7a arch"
Andrew Boie [Tue, 14 Feb 2012 17:32:52 +0000 (09:32 -0800)]
releasetools: Fix image size checking
A block of code that should be evaluated for all
image types was instead only being run for yaffs
partitions.
Change-Id: I83ccbd7fa3c1bc02b9bba0832701ecc258e40a7d
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Kenny Root [Tue, 21 Feb 2012 17:17:18 +0000 (09:17 -0800)]
Enable TLS register by default for ARMv7a arch
Everything that is based on ARMv7a should have a cp15 TLS register.
Enable it by default so it's not accidentally missed in newer board
configurations. In fact, this could be enabled for ARMv6 as well, but we
currently don't distinguish between ARMv5 and ARMv6 in the build system.
This can still be disabled by setting it to "false" in the board
configuration, but this shouldn't ever be needed.
Change-Id: Ic2918f32899c8bcfa482f92c98f5a192fa318470
Mathias Agopian [Tue, 21 Feb 2012 01:03:12 +0000 (17:03 -0800)]
frameworks/base refactoring
add libandroidfw.so to the build
Change-Id: If84e8afd5056a5ac66c3c9e116d821a8a5a571dd
Xavier Ducrohet [Sun, 19 Feb 2012 15:46:07 +0000 (07:46 -0800)]
am
87e90f4e: am
fe53eeb0: Declare the emulator as a multi-touch device.
* commit '
87e90f4e3b05aaa6d759f744fc8f835b9394b6e3':
Todd Poynor [Sat, 18 Feb 2012 05:54:30 +0000 (21:54 -0800)]
Merge "build: goldfish: add emulator Power HAL"
Todd Poynor [Sat, 18 Feb 2012 04:37:21 +0000 (20:37 -0800)]
Merge "build: Add default/legacy Power HAL"
Mathias Agopian [Sat, 18 Feb 2012 03:41:13 +0000 (19:41 -0800)]
frameworks/base refactoring: build fix
Change-Id: If9f1b8a6a9eafa9ea17a3b994941c5c369be2130
Xavier Ducrohet [Sat, 18 Feb 2012 01:10:32 +0000 (17:10 -0800)]
am
c06eaa4c: am
fe53eeb0: Declare the emulator as a multi-touch device.
* commit '
c06eaa4cadd32825a8b3a1bda7bba83ceccb7e00':
Declare the emulator as a multi-touch device.
Xavier Ducrohet [Sat, 18 Feb 2012 01:08:29 +0000 (17:08 -0800)]
am
fe53eeb0: Declare the emulator as a multi-touch device.
* commit '
fe53eeb07617540dc4a920561f4bd2d4f8ae0aa9':
Declare the emulator as a multi-touch device.
Xavier Ducrohet [Sat, 18 Feb 2012 01:08:29 +0000 (17:08 -0800)]
am
fe53eeb0: Declare the emulator as a multi-touch device.
* commit '
fe53eeb07617540dc4a920561f4bd2d4f8ae0aa9':
Declare the emulator as a multi-touch device.
Xavier Ducrohet [Sat, 18 Feb 2012 01:05:52 +0000 (17:05 -0800)]
Declare the emulator as a multi-touch device.
Also add the default handheld features.
Change-Id: I768094e5e9ef474ee4f6cce5c87c37b3681926ee
The Android Automerger [Sat, 18 Feb 2012 00:42:18 +0000 (16:42 -0800)]
IMM48
The Android Automerger [Sat, 18 Feb 2012 00:36:53 +0000 (16:36 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Todd Poynor [Sat, 18 Feb 2012 00:06:31 +0000 (16:06 -0800)]
build: goldfish: add emulator Power HAL
Change-Id: Id6de532d56dabcb8709bb3e331780c8b7f508973
Signed-off-by: Todd Poynor <toddpoynor@google.com>
John Grossman [Fri, 17 Feb 2012 19:49:31 +0000 (11:49 -0800)]
Merge "Attempt to fix the emulator."
Scott Anderson [Fri, 17 Feb 2012 19:24:01 +0000 (11:24 -0800)]
Merge "Remove simg2img from user_tags.mk"
John Grossman [Fri, 17 Feb 2012 16:55:18 +0000 (08:55 -0800)]
Attempt to fix the emulator.
I failed to add the default HAL for the new local_time HAL to the
emulator build. Emulator experts have advised me that this is the
correct place to do so; hopefully it will fix the emulator's startup.
See bug
6029440
Change-Id: Ib0ab8a226628105c72ffcf7ae511d390630ea045
The Android Open Source Project [Fri, 17 Feb 2012 17:04:04 +0000 (09:04 -0800)]
am
0e511149: Reconcile with ics-mr1-release
* commit '
0e51114927aecac7a283eee4d6449709027224d5':
The Android Open Source Project [Fri, 17 Feb 2012 17:02:41 +0000 (09:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ia3e6e7211e43f82053ebbdd87f4bfacf13d2495a
The Android Open Source Project [Fri, 17 Feb 2012 16:11:33 +0000 (08:11 -0800)]
am
72c4afc9: Reconcile with ics-mr1-release
* commit '
72c4afc998d6362d94acfa943349091993edad11':
IMM47B
The Android Open Source Project [Fri, 17 Feb 2012 16:09:26 +0000 (08:09 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4b9445667934514a9c04ed8df17f422d7c3755aa
Xavier Ducrohet [Fri, 17 Feb 2012 02:26:45 +0000 (18:26 -0800)]
Merge "Make sure the emulator system image define the features it supports."
Xavier Ducrohet [Fri, 17 Feb 2012 00:40:53 +0000 (16:40 -0800)]
am
d9bd216e: am
295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '
d9bd216ea7d3030b84c61d551b87781269e418a7':
Xavier Ducrohet [Fri, 17 Feb 2012 00:39:53 +0000 (16:39 -0800)]
am
590737b6: am
295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '
590737b674a1e9254863e36f45956a9c309db68f':
Enable HW accelerated view framework for generic_x86 builds.
Xavier Ducrohet [Fri, 17 Feb 2012 00:38:39 +0000 (16:38 -0800)]
am
295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '
295cb9bceef599f851db81a3942dc78bdb679fec':
Enable HW accelerated view framework for generic_x86 builds.
Xavier Ducrohet [Fri, 17 Feb 2012 00:37:51 +0000 (16:37 -0800)]
am
295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
* commit '
295cb9bceef599f851db81a3942dc78bdb679fec':
Enable HW accelerated view framework for generic_x86 builds.
Xavier Ducrohet [Fri, 17 Feb 2012 00:35:42 +0000 (16:35 -0800)]
Enable HW accelerated view framework for generic_x86 builds.
Change-Id: Ib3bf3e7c08615c29c0086125552ae1a96a737b89
The Android Automerger [Fri, 17 Feb 2012 00:29:10 +0000 (16:29 -0800)]
IMM47B
The Android Automerger [Fri, 17 Feb 2012 00:24:21 +0000 (16:24 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Todd Poynor [Sat, 11 Feb 2012 02:33:58 +0000 (18:33 -0800)]
build: Add default/legacy Power HAL
Change-Id: Ifa1e87c2f45dab3bb7aa07db12c8cfb5a8a38063
Signed-off-by: Todd Poynor <toddpoynor@google.com>
John Grossman [Fri, 10 Feb 2012 22:36:13 +0000 (14:36 -0800)]
Add the default local_time HAL to the base product.
Change-Id: I951718d2de13a2e92d41effac75bb75ea4c9fafe
Svetoslav Ganov [Thu, 16 Feb 2012 21:07:50 +0000 (13:07 -0800)]
Merge "Adding shell commands for manipulating content via content providers."
OSDN Git Service
