Conley Owens
5071047d7e
Merge "HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE"
2011-10-27 10:36:13 -07:00
Ying Wang
d9ed9eba1b
am 00d1d614
: am b3e6fa5e
: Merge "new LOCAL_DEX_PREOPT option "nostripping"" into ics-mr0
...
* commit '00d1d614f6e9c29e366b2608cd37814856df5efc':
new LOCAL_DEX_PREOPT option "nostripping"
2011-10-27 04:07:59 +00:00
Ying Wang
00d1d614f6
am b3e6fa5e
: Merge "new LOCAL_DEX_PREOPT option "nostripping"" into ics-mr0
...
* commit 'b3e6fa5e6bdaf6e1e827c3e79ffda1ef796b3a1b':
new LOCAL_DEX_PREOPT option "nostripping"
2011-10-27 04:04:50 +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
50e384c01b
am 7857373b
: am 033fbe28
: Support signing target_files without a recovery.fstab.
...
* commit '7857373b7ee6d837b3df084d682ca8de4e3dc212':
Support signing target_files without a recovery.fstab.
2011-10-27 02:56:37 +00:00
Jeff Davidson
7857373b7e
am 033fbe28
: Support signing target_files without a recovery.fstab.
...
* commit '033fbe28c273fc5a99e0738d84c79ee7040b1fa0':
Support signing target_files without a recovery.fstab.
2011-10-27 02:53:26 +00:00
Jeff Davidson
033fbe28c2
Support signing target_files without a recovery.fstab.
...
Change-Id: I7d6f511c69d589bf035ac3eb7eeee4b0e0505faa
2011-10-26 18:16:13 -07:00
Xavier Ducrohet
5a866004b6
Remove last reference to layoutopt.
...
Change-Id: Ifdcf35e0bda41fbb5f04515a4b0f1c60dd130d50
2011-10-26 17:15:11 -07:00
Xavier Ducrohet
3282e9bb4d
Remove references to layoutopt from the build.
...
Change-Id: I54a41f47a380531f4b50eb26e67e8f52b63269a5
2011-10-26 16:47:40 -07:00
Omari Stephens
65216a2d3b
Revert "Remove layoutopt; replaced by the more generic "lint" tool."
...
This reverts commit 7a23d45cdc
.
2011-10-26 16:14:56 -07:00
Tor Norbye
3015409aae
Merge "Remove layoutopt; replaced by the more generic "lint" tool."
2011-10-26 15:47:11 -07:00
Tor Norbye
7a23d45cdc
Remove layoutopt; replaced by the more generic "lint" tool.
...
Change-Id: I5754d10ec7b3fd03a2eb9a70e5f73201f909e11e
2011-10-26 13:37:59 -07:00
Scott Main
530805858f
am 5e528222
: am 8bb6ea59
: Merge "docs: add new style for adding "deprecated" messages to dev guides" into ics-mr0
...
* commit '5e5282227f9bc0342f78b7d1e201842da70374a3':
docs: add new style for adding "deprecated" messages to dev guides
2011-10-26 20:21:23 +00:00
Scott Main
5e5282227f
am 8bb6ea59
: Merge "docs: add new style for adding "deprecated" messages to dev guides" into ics-mr0
...
* commit '8bb6ea5995a30df8fb94bbfa041094a5f224321c':
docs: add new style for adding "deprecated" messages to dev guides
2011-10-26 20:17:45 +00: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
Nick Kralevich
60e3a5acbe
Merge "enable PIE for dynamically linked executables"
2011-10-26 10:03:20 -07:00
Ed Heyl
a914786445
am 525389ee
: (-s ours) set ID to MR1. Please do not merge.
...
* commit '525389ee49af11b313c9652331a2fbfcaff91428':
set ID to MR1. Please do not merge.
2011-10-26 14:12:54 +00:00
Steve Block
2da72c6265
Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/#/c/143865
Bug: 5449033
Change-Id: Ie7704789e47b9553d02e3f6ed89c3ceab532119c
2011-10-25 18:14:48 +01:00
The Android Open Source Project
958e00db87
Reconcile with ics-mr0-release
...
Change-Id: Ibce8b7257faf1e0fbd89e9132b3eede5bfd07405
2011-10-25 07:30:03 -07:00
Ed Heyl
525389ee49
set ID to MR1. Please do not merge.
...
Change-Id: Ib181d19806a2589ec124b648e2d12c5350b0ce81
2011-10-25 07:23:21 -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
The Android Open Source Project
f4ce9fa299
Reconcile with ics-mr0-release
...
Change-Id: I82d822c97b43372244bb0f676120489f755939a3
2011-10-24 17:16:15 -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
Nick Kralevich
026a85b129
enable PIE for dynamically linked executables
...
Compile all programs on Android with -fPIE and -pie. This enables
PIE (Position Independent Executables), which helps protect Android
applications from exploitation due to memory management bugs.
Stop using the armelf.x linker script. This script hard codes the
load address of the executable, defeating the position independence
PIE requires.
Note: PIE *static* executables are not supported at this time and
require additional linker changes.
Bug: 5323301
Change-Id: Ieafcc9c4f142495847e163881889d371a59d0878
2011-10-24 11:37:37 -07:00
Jim Huang
59d296623b
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-24 10:23:21 -07:00
The Android Open Source Project
4fc484a7fe
Reconcile with ics-factoryrom-release ics-mr0-release
...
Change-Id: Ib5fff2dcdcfd889d707ff2eef25ba806e22f8b85
2011-10-24 06:32:01 -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
Chia-chi Yeh
e44a3e05f2
Merge "Move VpnDialogs into core.mk."
2011-10-21 16:45:29 -07:00