Andrew Hsieh
bea6b97743
Merge "Use %zd instead of %d for variables of type ssize_t"
2012-02-29 12:19:45 -08:00
Andrew Hsieh
66a9842657
Merge "BUILD_HOST_64bit=1 to build host tools in 64-bit"
2012-02-29 12:19:26 -08:00
Steve Block
495e58502a
Revert "Remove unused notice_files target"
...
This broke the PRODUCT-sdk-(win_)sdk target of SDK builds
This reverts commit 620a5270fc
.
Change-Id: I81afe68ae98b5daac5fe136ec8d04f6fba5af9b4
2012-02-29 20:09:09 +00:00
Steve Block
620a5270fc
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
2012-02-29 16:00:58 +00:00
The Android Automerger
067153c059
IMM59
2012-02-28 15:18:24 -08:00
The Android Automerger
0a759438e9
merge in ics-mr1-release history after reset to ics-mr1
2012-02-28 15:12:45 -08:00
Doug Zongker
1807e700a5
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
2012-02-28 12:21:08 -08:00
Andrew Hsieh
ed6b815505
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
2012-02-28 10:24:39 -08:00
The Android Automerger
17e1ba6b5d
IMM56D
2012-02-27 16:10:34 -08:00
The Android Automerger
82118d78ac
merge in ics-mr1-release history after reset to ics-mr1
2012-02-27 16:09:47 -08:00
Andrew Hsieh
276053b291
Use %zd instead of %d for variables of type ssize_t
...
To generate correct 64-bit code (with -m64)
Change-Id: I7cd5e0c7e8bdcb9ea3bf73df0dcda55f1cb56eec
2012-02-27 16:06:00 -08:00
The Android Automerger
52ce071c40
IMM56C
2012-02-27 14:44:07 -08:00
The Android Automerger
dae73146eb
merge in ics-mr1-release history after reset to ics-mr1
2012-02-27 14:41:50 -08:00
The Android Automerger
8246e7fb0e
IMM56B
2012-02-27 12:31:17 -08:00
The Android Automerger
e6e8cdf716
merge in ics-mr1-release history after reset to ics-mr1
2012-02-27 12:28:07 -08:00
The Android Automerger
7a2051fd01
IMM56
2012-02-25 10:45:47 -08:00
The Android Automerger
8e86f0581c
merge in ics-mr1-release history after reset to ics-mr1
2012-02-25 10:41:34 -08:00
The Android Open Source Project
3111751dd1
am 6b1dade9: am d58f3d2b: Reconcile with ics-mr1-release
...
* commit '6b1dade9c64196afc357d2843528b5efc826a262':
2012-02-24 14:11:34 -08:00
The Android Open Source Project
6b1dade9c6
am d58f3d2b: Reconcile with ics-mr1-release
...
* commit 'd58f3d2bc47015f7a55b88ff56850b9990689e22':
2012-02-24 14:09:27 -08:00
The Android Open Source Project
d58f3d2bc4
Reconcile with ics-mr1-release
...
Change-Id: Idc7bbf210376184867a6265475e34967c00b1315
2012-02-24 14:05:46 -08:00
The Android Open Source Project
7a284f20d3
am 0e7d7f5d: am 134c0348: Reconcile with ics-mr1-release
...
* commit '0e7d7f5da314c5114f47863f5cf68e2bfcd2566e':
IMM54
2012-02-24 14:01:53 -08:00
The Android Open Source Project
0e7d7f5da3
am 134c0348: Reconcile with ics-mr1-release
...
* commit '134c0348f9643eff06e1d69f7a144a1870aa29e4':
IMM54
2012-02-24 13:59:21 -08:00
The Android Open Source Project
134c0348f9
Reconcile with ics-mr1-release
...
Change-Id: I347cd6c1e6227d2c15efdd5f855268dbe12cd497
2012-02-24 13:57:33 -08:00
Jean-Baptiste Queru
418027c87a
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.
2012-02-24 11:38:53 -08:00
Jean-Baptiste Queru
41ab528fe3
am 99505268: am 20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
...
* commit '9950526875f3b71c764a6d39623842e3c26416db':
Issue warning when "make snod" with dexpreopt enabled.
2012-02-24 11:36:52 -08:00
Jean-Baptiste Queru
9950526875
am 20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
...
* commit '20b970e25227c4144c61d0d6108905616dc4f08b':
Issue warning when "make snod" with dexpreopt enabled.
2012-02-24 11:32:08 -08:00
Jean-Baptiste Queru
20b970e252
Merge "Issue warning when "make snod" with dexpreopt enabled."
2012-02-24 11:20:15 -08:00
Ying Wang
acf01ec837
Issue warning when "make snod" with dexpreopt enabled.
...
Change-Id: I481f963634dd384ed6d3de73dfeeda92b37d227e
2012-02-24 11:05:48 -08:00
Ying Wang
92ca609cd1
Fix bug with the HOST_AR.
...
Change-Id: I28ab86d3b6e7cbd4391e2640cf8e2be269b03e76
2012-02-23 16:27:43 -08:00
The Android Open Source Project
a7a9b948e8
am 8ea62df2: am d0d7086f: Reconcile with ics-mr1-release
...
* commit '8ea62df2e67e9c0996bd000a3f3dd256bb5c0954':
2012-02-23 11:20:26 -08:00
The Android Open Source Project
a0721f0520
am 0f4616b0: am 065506ec: Reconcile with ics-mr1-release
...
* commit '0f4616b017b72deec9f0b3c20205cd447fea835d':
IMM52
2012-02-23 11:20:24 -08:00
The Android Open Source Project
2d93d69686
am 229b77b0: am 96859329: Reconcile with ics-mr1-release
...
* commit '229b77b06fe7a9b4873140c281720fddb33db4b0':
2012-02-23 11:20:00 -08:00
The Android Open Source Project
2147b6b341
am c4c305e3: am a2ca4f14: Reconcile with ics-mr1-release
...
* commit 'c4c305e331e4e5ae3f5616f79dfc597e2abfc166':
IMM48
2012-02-23 11:19:50 -08:00
The Android Automerger
ea6f0e027d
IMM54
2012-02-23 10:48:19 -08:00
The Android Automerger
3d6b6d3c74
merge in ics-mr1-release history after reset to ics-mr1
2012-02-23 10:43:30 -08:00
Xavier Ducrohet
b9abc53a7d
am 182cc516: am 87e90f4e: am fe53eeb0: Declare the emulator as a multi-touch device.
...
* commit '182cc516576668ced0d419915188c0f3f16a0bfe':
2012-02-23 08:34:50 -08:00
Jean-Baptiste Queru
fc41279b74
Merge ab0776e4
...
Change-Id: Ia73777689fcbe4849a5e29ef4e120e0d1f2ba8bf
2012-02-23 08:19:50 -08:00
The Android Open Source Project
d8e300d34e
am b384f360: am 0e511149: Reconcile with ics-mr1-release
...
* commit 'b384f3605ecae338eb28e6ef5e8bc876981058e0':
2012-02-23 07:29:09 -08:00
The Android Open Source Project
792a934893
am ae2fa4a5: am 72c4afc9: Reconcile with ics-mr1-release
...
* commit 'ae2fa4a5bec4574c5da9f32f9f637bd733ab16d0':
IMM47B
2012-02-23 07:29:00 -08:00
Xavier Ducrohet
c9471fe6c9
am 9233c075: am d9bd216e: am 295cb9bc: Enable HW accelerated view framework for generic_x86 builds.
...
* commit '9233c075d6adea37c694a6f6135f9e58af12b721':
2012-02-23 07:28:46 -08:00
Xavier Ducrohet
f66089229b
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.
2012-02-23 07:28:46 -08:00
The Android Open Source Project
8ea62df2e6
am d0d7086f: Reconcile with ics-mr1-release
...
* commit 'd0d7086fb6012b72731fcefeabe92edccaaf89eb':
2012-02-21 15:38:23 -08:00
The Android Open Source Project
0f4616b017
am 065506ec: Reconcile with ics-mr1-release
...
* commit '065506ec25b39b1abdcefb483992d71be70defb6':
IMM52
2012-02-21 15:36:39 -08:00
The Android Open Source Project
d0d7086fb6
Reconcile with ics-mr1-release
...
Change-Id: Ie9e79a16a3541f85ef9d1a7ffd4fe470c3570a16
2012-02-21 15:36:28 -08:00
The Android Open Source Project
065506ec25
Reconcile with ics-mr1-release
...
Change-Id: Ib089acee59a2ac7913b5d35185f165f777800626
2012-02-21 15:34:42 -08:00
The Android Automerger
c7887ba198
IMM52
2012-02-21 15:30:40 -08:00
The Android Automerger
f5e409b448
merge in ics-mr1-release history after reset to ics-mr1
2012-02-21 15:25:53 -08:00
The Android Open Source Project
229b77b06f
am 96859329: Reconcile with ics-mr1-release
...
* commit '96859329d3f9a7a1c9834810e16747e205ea16c7':
2012-02-21 15:15:26 -08:00
The Android Open Source Project
96859329d3
Reconcile with ics-mr1-release
...
Change-Id: I4c70661759198e26a86a1070746a9b609598a2f2
2012-02-21 15:13:23 -08:00
The Android Open Source Project
c4c305e331
am a2ca4f14: Reconcile with ics-mr1-release
...
* commit 'a2ca4f14f43636b00aba274718854e9ed851959d':
IMM48
2012-02-21 15:08:13 -08:00