Commit Graph

6619 Commits

Author SHA1 Message Date
The Android Automerger 5bfb01150c ICL30 2011-10-30 06:32:02 -07:00
The Android Automerger f16eae2a37 merge in ics-mr0-release history after reset to ics-mr0 2011-10-30 06:27:17 -07:00
The Android Automerger ac17e30d99 ICL28B 2011-10-28 13:47:54 -07:00
The Android Automerger b5a2406e97 ICL28 2011-10-28 09:56:13 -07:00
The Android Automerger 10ea455d47 merge in ics-mr0-release history after reset to ics-mr0 2011-10-28 09:52:15 -07:00
The Android Open Source Project d50bc1bb3c Reconcile with ics-factoryrom-2-release
Change-Id: Ieddd7ec26db003b46bfc01db728a5795cbff61ab
2011-10-28 09:43:52 -07:00
Jean-Baptiste Queru 432f8d881d Reconcile with AOSP master
Change-Id: I01bd9c391b6adaabbad233b308c5dbecfd9f2827
2011-10-28 08:23:21 -07:00
The Android Automerger fe921ceaaa ILC27B 2011-10-27 21:39:47 -07:00
The Android Automerger 55ca472480 ILC27B 2011-10-27 19:48:00 -07:00
The Android Automerger b76ac5198f ITL27 2011-10-27 19:31:15 -07:00
The Android Automerger 4e04760e39 merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-10-27 19:29:34 -07:00
The Android Automerger c81b9a7f6c ICL27B 2011-10-27 17:47:07 -07:00
Jim Huang fddf23f19e HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
While building Android with latest host gcc, it causes the following
build error:

Install: out/host/linux-x86/bin/mkbootimg
host C++: obbtool <= frameworks/base/tools/obbtool/Main.cpp
<command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
<built-in>:0:0: note: this is the location of the previous definition
cc1plus: all warnings being treated as errors

In order to make build system happy, this patch does unset macro
_FORTIFY_SOURCE and then define it in host cflags.

Change-Id: Ic37a90f05081a2c3650b3335bc87e9e895900fb2
2011-10-27 10:38:10 -07:00
The Android Automerger c3b08ce214 ICL27 2011-10-27 06:29:39 -07:00
The Android Automerger 1016c54289 merge in ics-mr0-release history after reset to ics-mr0 2011-10-27 06:27:10 -07:00
Ed Heyl 1f8f191e91 ITL26B
Change-Id: I1ab93cc9a63d5873bc4aecc17a45f474828dc981
2011-10-27 09:08:07 +00:00
Ying Wang b3e6fa5e6b Merge "new LOCAL_DEX_PREOPT option "nostripping"" into ics-mr0 2011-10-26 21:04:01 -07:00
Jeff Davidson 033fbe28c2 Support signing target_files without a recovery.fstab.
Change-Id: I7d6f511c69d589bf035ac3eb7eeee4b0e0505faa
2011-10-26 18:16:13 -07:00
The Android Automerger a7086c7f44 ICL26B 2011-10-26 16:30:12 -07:00
The Android Automerger 85ffa6904c merge in ics-mr0-release history after reset to ics-mr0 2011-10-26 16:26:04 -07:00
Scott Main 8bb6ea5995 Merge "docs: add new style for adding "deprecated" messages to dev guides" into ics-mr0 2011-10-26 13:16:13 -07:00
The Android Automerger d4bbb7dc96 ICL26 2011-10-26 06:30:20 -07:00
The Android Automerger 6c6ad63b3e merge in ics-mr0-release history after reset to ics-mr0 2011-10-26 06:27:12 -07:00
The Android Automerger c010545ba0 ICL25B 2011-10-25 12:48:34 -07:00
The Android Automerger 000a6d41e2 merge in ics-mr0-release history after reset to ics-mr0 2011-10-25 12:46:30 -07:00
The Android Automerger 2db8a9821d ICL25 2011-10-25 06:29:04 -07:00
The Android Automerger 56e8a456e9 merge in ics-mr0-release history after reset to ics-mr0 2011-10-25 06:27:15 -07:00
The Android Automerger 2d3a00db99 ICL24D 2011-10-24 20:32:11 -07:00
The Android Automerger 3ecd1bec13 merge in ics-mr0-release history after reset to ics-mr0 2011-10-24 20:27:23 -07:00
Scott Main 360240097a docs: add new style for adding "deprecated" messages to dev guides
Change-Id: I0d690a6c0880343919114370331b7c2756b6a50e
2011-10-24 16:45:58 -07:00
The Android Automerger 1bd4941268 ICL24C 2011-10-24 14:55:52 -07:00
The Android Automerger 06c5950d35 merge in ics-mr0-release history after reset to ics-mr0 2011-10-24 14:53:34 -07:00
The Android Automerger ff4ae33252 ICL24B 2011-10-24 12:57:49 -07:00
The Android Automerger 371aa2936c merge in ics-mr0-release history after reset to ics-mr0 2011-10-24 12:54:59 -07:00
Ying Wang 79e3dec83e new LOCAL_DEX_PREOPT option "nostripping"
Set "LOCAL_DEX_PREOPT := nostripping" to do dex-preopt while not strip
the classes.dex.

Bug: 5396625 5502338
Change-Id: Ie8dea4414ebeefeae89c6433b246faea27baa5e7
2011-10-24 12:29:25 -07:00
The Android Automerger 33f3251a4a ICL24 2011-10-24 06:28:08 -07:00
The Android Automerger 3efcafdd6d merge in ics-mr0-release history after reset to ics-mr0 2011-10-24 06:27:09 -07:00
The Android Automerger a73cf082c7 ICL23D 2011-10-23 16:45:00 -07:00
The Android Automerger 4f42afc8b3 merge in ics-mr0-release history after reset to ics-mr0 2011-10-23 16:44:57 -07:00
The Android Automerger 132782e866 ICL23C 2011-10-23 16:33:06 -07:00
The Android Automerger 32af96a714 merge in ics-mr0-release history after reset to ics-mr0 2011-10-23 16:32:11 -07:00
The Android Automerger aa6da3bcf4 ICL23B 2011-10-23 11:41:30 -07:00
The Android Automerger d21c08ce34 merge in ics-mr0-release history after reset to ics-mr0 2011-10-23 11:40:31 -07:00
The Android Automerger dabea14839 ICL23 2011-10-23 06:28:10 -07:00
The Android Automerger e6abadb456 merge in ics-mr0-release history after reset to ics-mr0 2011-10-23 06:27:06 -07:00
The Android Automerger a8f2f3876e ICL22 2011-10-22 16:57:57 -07:00
The Android Automerger 5a3499bfee merge in ics-mr0-release history after reset to ics-mr0 2011-10-22 16:56:22 -07:00
The Android Automerger 5a4f6d440c ICL21C 2011-10-21 23:26:12 -07:00
The Android Automerger 1651b376c2 merge in ics-mr0-release history after reset to ics-mr0 2011-10-21 23:21:56 -07:00
The Android Automerger b8382e05ef ICL21B 2011-10-21 17:04:05 -07:00