Commit Graph

6711 Commits

Author SHA1 Message Date
Ying Wang 9e33168a69 Merge "Unify the user image building code" 2011-10-31 17:21:04 -07:00
Ying Wang bd93d425ae Unify the user image building code
Bug: 5398808

Before this change we have duplicate code in the Makefile and the
python-based releasetool. That's a real headache to maintain.

Change-Id: I8ddf04a79c6886540e89d990f723d8f77c9dd883
2011-10-31 17:11:35 -07:00
The Android Open Source Project a82aba2c02 am 26bec4db: am adb70c57: Reconcile with ics-mr0-release
* commit '26bec4db6139e30dd35b5cb200f05934c5610c5f':
  ICL31
  ICL30
2011-10-31 22:13:40 +00:00
The Android Open Source Project cdc4457282 am 84d697e3: am 8bfe131e: am db6281e8: Reconcile with ics-factoryrom-2-release
* commit '84d697e325ab97b1a8caa6bd028e9e35cb44a7d1':
  ITL30B
  ITL30
  ITL28B
  ITL28
2011-10-31 22:13:35 +00:00
The Android Open Source Project 26bec4db61 am adb70c57: Reconcile with ics-mr0-release
* commit 'adb70c57c265f8e4e1f2306d5d91025a0683347e':
  ICL31
  ICL30
2011-10-31 20:08:16 +00:00
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 84d697e325 am 8bfe131e: am db6281e8: Reconcile with ics-factoryrom-2-release
* commit '8bfe131e2fec4af2f463f2e1915c49b5f38a5a4d':
  ITL30B
  ITL30
  ITL28B
  ITL28
2011-10-31 19:47:56 +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
The Android Open Source Project 5557599ced am 6b3e56d0: am 5d8f09e5: Reconcile with ics-mr0-release
* commit '6b3e56d0d03e471e295098246c9362c731e8e513':
  ICL28B
2011-10-31 12:26:07 +00: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 6b3e56d0d0 am 5d8f09e5: Reconcile with ics-mr0-release
* commit '5d8f09e5b36ba3ecee88cecb701ec526f0ac5398':
  ICL28B
2011-10-28 23:01:24 +00: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 Open Source Project fbbf8c8ba9 am 99e8d56d: am 0393a536: Reconcile with ics-mr0-release
* commit '99e8d56da6745f7e3e8c13a80db2f34623d11f79':
  ICL28
  ILC27B
  ILC27B
  ICL27B
  ICL27
  ICL26B
  ICL26
  ICL25B
2011-10-28 22:27:42 +00:00
The Android Automerger ac17e30d99 ICL28B 2011-10-28 13:47:54 -07:00
The Android Open Source Project 99e8d56da6 am 0393a536: Reconcile with ics-mr0-release
* commit '0393a5366e080dad0fec2e431a20ee34518f7bb5':
  ICL28
  ILC27B
  ILC27B
  ICL27B
  ICL27
  ICL26B
  ICL26
  ICL25B
  ICL25
  ICL24D
  ICL24C
  ICL24B
2011-10-28 20:06:24 +00:00
The Android Open Source Project 0393a5366e Reconcile with ics-mr0-release
Change-Id: I531ca70758d587d3f5d540a033009e2dffeaf301
2011-10-28 13:05:02 -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 0ac31d61a4 am d27bedac: am 682967e1: am d50bc1bb: Reconcile with ics-factoryrom-2-release
* commit 'd27bedaca1cac3ccdb2c3a69e51af8745d2b30d1':
  ITL27
  ITL26B
2011-10-28 16:48:11 +00:00
The Android Open Source Project d27bedaca1 am 682967e1: am d50bc1bb: Reconcile with ics-factoryrom-2-release
* commit '682967e1eef28e5a4d8e0cc1076ef9d4be9bdfc5':
  ITL27
  ITL26B
2011-10-28 16:46:52 +00: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 e7d25da929 am 9a3dfc06: am 68eb6649: am 432f8d88: Reconcile with AOSP master
* commit '9a3dfc06b94a59bdc7005a8a944996c956527c19':
2011-10-28 15:28:28 +00:00
Jean-Baptiste Queru 9a3dfc06b9 am 68eb6649: am 432f8d88: Reconcile with AOSP master
* commit '68eb6649fe703b083c51356526f92e4e219dc140':
2011-10-28 15:27:07 +00: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
Ying Wang e0c60125b9 Merge "Add TARGET_COPY_OUT_* variables." 2011-10-27 15:39:02 -07:00
Ying Wang 2b6aaa367a Add TARGET_COPY_OUT_* variables.
They are relative to PRODUCT_OUT so can be used in PRODUCT_COPY_FILES.
If TARGET_COPY_OUT_VENDOR instead of hardcoded system/vendor is used, we
will be able to transition smoothly to a separate vendor staging directory.

Change-Id: Ia9fdb208768cf4699180306280b4c02421b2ea9c
2011-10-27 15:18:39 -07:00
Jim Huang d6128fdd23 am 38638858: am fddf23f1: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
* commit '386388581bb866cae7809feaac5b685d8e90ac4f':
  HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
2011-10-27 21:11:04 +00:00
Jim Huang 386388581b am fddf23f1: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
* commit 'fddf23f19e7604e6c5b3c5377e7ff6293539a1da':
  HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
2011-10-27 21:09:17 +00:00
Jing Yu 6af4bb07e3 Merge "Fix build problems with gcc-4.6.x." 2011-10-27 10:47:40 -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
Conley Owens 5071047d7e Merge "HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE" 2011-10-27 10:36:13 -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