The Android Open Source Project
adb70c57c2
Reconcile with ics-mr0-release
...
Change-Id: I7388dfaa2145b726609e8b30dea22740cd1b1d7b
2011-10-31 13:06:18 -07:00
The Android Open Source Project
829fa46ec4
am 8bfe131e: am db6281e8: Reconcile with ics-factoryrom-2-release
...
* commit '8bfe131e2fec4af2f463f2e1915c49b5f38a5a4d':
ITL30B
ITL30
ITL28B
ITL28
2011-10-31 19:47:48 +00:00
The Android Open Source Project
8bfe131e2f
am db6281e8: Reconcile with ics-factoryrom-2-release
...
* commit 'db6281e8bb5e258c8841c162ee9f34660912b13d':
ITL30B
ITL30
ITL28B
ITL28
2011-10-31 19:45:30 +00:00
The Android Open Source Project
db6281e8bb
Reconcile with ics-factoryrom-2-release
...
Change-Id: I7f53fdbe6acf900cdd3322d238bf6fa659c95ff0
2011-10-31 12:43:34 -07:00
The Android Automerger
6ca7cab746
ICL31
2011-10-31 06:31:30 -07:00
The Android Automerger
0fefb1f860
merge in ics-mr0-release history after reset to ics-mr0
2011-10-31 06:27:25 -07:00
Ed Heyl
52622f3d44
Merge remote branch 'goog/ics-mr1' into ics-aah
2011-10-31 05:54:41 -07:00
Joe Onorato
c72b1403e4
Add a tool to let you enforce layering between packages in a java module.
...
And build system support for it too.
Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
2011-10-30 21:37:35 -07:00
The Android Automerger
a93af2b685
ITL30B
2011-10-30 13:51:03 -07:00
The Android Automerger
3c810f8639
ITL30
2011-10-30 12:35:43 -07:00
The Android Automerger
0b0ff231cd
merge in ics-factoryrom-2-release history after reset to ics-mr0
2011-10-30 12:34:39 -07:00
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
6d907b114d
ITL28B
2011-10-28 23:24:05 -07:00
The Android Automerger
05bf9a2151
ITL28
2011-10-28 20:27:28 -07:00
The Android Open Source Project
5d8f09e5b3
Reconcile with ics-mr0-release
...
Change-Id: I8e45b4aba1157aec4a3d12cf9cd2b77610b677e9
2011-10-28 15:59:38 -07:00
The Android Automerger
ac17e30d99
ICL28B
2011-10-28 13:47:54 -07:00
The Android Open Source Project
0393a5366e
Reconcile with ics-mr0-release
...
Change-Id: I531ca70758d587d3f5d540a033009e2dffeaf301
2011-10-28 13:05:02 -07:00
Ed Heyl
c17d409dce
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
2011-10-28 19:05:44 +00: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
682967e1ee
am d50bc1bb: Reconcile with ics-factoryrom-2-release
...
* commit 'd50bc1bb3cd1ba5406dfc0b99bc3030bb8ae6ae3':
ITL27
ITL26B
2011-10-28 16:45:28 +00: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
68eb6649fe
am 432f8d88: Reconcile with AOSP master
...
* commit '432f8d881d22a4516aeac46fb0d80359a252d692':
HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
2011-10-28 15:25:49 +00: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
Mike Lockwood
2d50524a01
main.mk: Allow overriding subdirs via make variable TARGET_SUBDIRS
...
Change-Id: I9e1523833e1567a59b19482c7834fe30479a009f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-27 17:34:10 -04:00
John Grossman
a09c24db71
Add the default local_time hal implementation to builds.
...
Cherry-picked from master-tungsten:
Change-Id: I93ee0702fd48e05f75af13d7529c80d3d5b2b2cd
Change-Id: Ic45f56fc649d599cea68dd73226344c2aa0ebe2c
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
2011-10-27 17:33:47 -04: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
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
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
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
Ed Heyl
da669da43f
undo reset to ics-mr1 until we have a better method
2011-10-26 21:53:16 +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
Ed Heyl
33d15b3ea4
reset to ics-mr1, but keep history
2011-10-26 18:50:08 +00:00
Nick Kralevich
c5da1a0835
am 60e3a5ac: Merge "enable PIE for dynamically linked executables"
...
* commit '60e3a5acbe8ab2819682cb0ae05de8db17ae3c36':
enable PIE for dynamically linked executables
2011-10-26 10:05:18 -07:00
Nick Kralevich
60e3a5acbe
Merge "enable PIE for dynamically linked executables"
2011-10-26 10:03:20 -07:00
Ed Heyl
0f7a8bad1d
am a9147864: (-s ours) am 525389ee: (-s ours) set ID to MR1. Please do not merge.
...
* commit 'a914786445263135e93cf4510323bc52b8bbdc20':
set ID to MR1. Please do not merge.
2011-10-26 07:17:48 -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