summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am cb48497f: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCEJim Huang2011-11-101-1/+1
|\ | | | | | | | | * commit 'cb48497ff2f84e8f7def981246ddc028ea126879': HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
| * HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCEJim Huang2011-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am e915ab45: Place linker arguments after objects for gccConley Owens2011-11-101-7/+7
|\ \ | |/ | | | | | | * commit 'e915ab45a11f88c4fa5f2561c1aaca4b7d3d7593': Place linker arguments after objects for gcc
| * Place linker arguments after objects for gccConley Owens2011-11-101-7/+7
| | | | | | | | | | | | | | gcc 4.6.1 does not properly link if libraries are specified before objects. Change-Id: Iabe3eac831fe597abe8a93a946ab7a22d584db46
* | am 4b87f575: am 278c9781: to be upgraded, APKs must have exactly the same ↵Doug Zongker2011-11-091-2/+2
|\ \ | | | | | | | | | | | | | | | | | | set of certs * commit '4b87f575d45320260e35f224cd18f36eec5e3eb2': to be upgraded, APKs must have exactly the same set of certs
| * \ am 278c9781: to be upgraded, APKs must have exactly the same set of certsDoug Zongker2011-11-091-2/+2
| |\ \ | | | | | | | | | | | | | | | | * commit '278c9781ec5d2ef289fee635dfcfd8befcfe531b': to be upgraded, APKs must have exactly the same set of certs
| | * | to be upgraded, APKs must have exactly the same set of certsDoug Zongker2011-11-091-2/+2
| | |/ | | | | | | | | | Change-Id: I0d528d3d55e5ee553e57e63ed1f998172c6306f8
* | | am 2cc72714: Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-090-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | * commit '2cc727144133b71534d3654bfd00f62a4ac353b1': ICL40 ITL39B ITL39
| | |
| | \
| *-. \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-090-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I85230491012b7871cedf93197c74d4b898d79bdf
| | | * | ITL39BThe Android Automerger2011-11-081-1/+1
| | | | |
| | | * | ITL39The Android Automerger2011-11-081-1/+1
| | | | |
| | * | | ICL40The Android Automerger2011-11-091-13/+3
| | | | |
| | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-090-0/+0
| | |\ \ \ | | | |_|/ | | |/| |
* | | | | am 5f213f55: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-090-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '5f213f5533d7c8871713fe25680d9ab37853792d': ICL39
| * | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-080-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: Ie500b6cd75e6020240031cd70aadb1b921ed3318
| | * | | ICL39The Android Automerger2011-11-081-13/+3
| | | | |
| | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-080-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | am 55f675e9: Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-070-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '55f675e98ee93e6cb122796322846c6b12e066f3': ICL38 ICL37 ICL36 ITL35B ICL35 ITL35 Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES
| | | | |
| | \ \ \
| *-. \ \ \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-070-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| Change-Id: Ia7bf3982d1a8fe4e1a5c458849250c38f65a6d50
| | | * | ITL35BThe Android Automerger2011-11-041-1/+1
| | | | |
| | | * | ITL35The Android Automerger2011-11-041-1/+1
| | | | |
| | | * | Fix missing SW h264 decoder and remove the non-existing SW avc decoder in ↵James Dong2011-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | product PRODUCT_PACKAGES Change-Id: I93bcf983f5f4da2d37c0f2186a04e7c197ef56a4 related-to-bug: 5566262
| | * | | ICL38The Android Automerger2011-11-071-13/+3
| | | | |
| | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-070-0/+0
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | ICL37The Android Automerger2011-11-061-13/+3
| | | | |
| | | * | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-060-0/+0
| | | |\ \ | | |/ / /
| | | * | ICL36The Android Automerger2011-11-051-13/+3
| | | | |
| | | * | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-050-0/+0
| | | |\ \ | | |/ / /
| | | * | ICL35The Android Automerger2011-11-041-13/+3
| | | | |
| | | * | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-040-0/+0
| | | |\ \ | | |/ / /
* | | | | am ee3c1619: am ddc943da: Fix missing SW h264 decoder and remove the ↵James Dong2011-11-041-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | non-existing SW avc decoder in product PRODUCT_PACKAGES * commit 'ee3c16196b2f2b67ff891b94d260f0c301f941c0': Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES
| * | | | am ddc943da: Fix missing SW h264 decoder and remove the non-existing SW avc ↵James Dong2011-11-041-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | decoder in product PRODUCT_PACKAGES * commit 'ddc943da7e27d745517c50738c249b567970350e': Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES
| | * | | Fix missing SW h264 decoder and remove the non-existing SW avc decoder in ↵James Dong2011-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | product PRODUCT_PACKAGES Change-Id: I93bcf983f5f4da2d37c0f2186a04e7c197ef56a4 related-to-bug: 5566262
* | | | | am 76d6da3e: Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-040-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '76d6da3edd25918d334d598845dc83ed7cc225e2': ITL34B ITL34 ICL34 ITL33D ITL33C
| | | | |
| | \ \ \
| *-. \ \ \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-040-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| Change-Id: Ib37c1f38b47fe5c92f34b5587acd5e67a083f9a3
| | | * | ITL34BThe Android Automerger2011-11-031-1/+1
| | | | |
| | | * | ITL34The Android Automerger2011-11-031-1/+1
| | | | |
| | | * | ITL33DThe Android Automerger2011-11-021-1/+1
| | | | |
| | | * | ITL33CThe Android Automerger2011-11-021-13/+3
| | | | |
| | | * | merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
| | | |\ \
| | * | | | ICL34The Android Automerger2011-11-031-13/+3
| | | | | |
| | * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-030-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
* | | | | | am e43794ac: am 277be2fe: Stop Packaging Old CTS Test Runner FilesBrian Muramatsu2011-11-031-12/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'e43794ace2a32cff6b1896981ba8bd3a7fa9f562': Stop Packaging Old CTS Test Runner Files
| * | | | | am 277be2fe: Stop Packaging Old CTS Test Runner FilesBrian Muramatsu2011-11-031-12/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit '277be2fe0cfcb31c34ad3426a1ab8df9b8cde6cb': Stop Packaging Old CTS Test Runner Files
| | * | | | Stop Packaging Old CTS Test Runner FilesBrian Muramatsu2011-11-031-12/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5563917 This stops packaging the startcts script and the cts.jar into the android-cts.zip. Since we are only testing using Tradefed, we should prevent confusion by removing the old test runner. Change-Id: I79f991617dd9e6a51a314207b4727cce3136d60f
* | | | | am 1b601a44: Merge "MR1 is version 4.1, API 15." into ics-mr1Dianne Hackborn2011-11-022-2/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '1b601a447247bcc373d417d7be4c89c1e6216b89': MR1 is version 4.1, API 15.
| * | | | Merge "MR1 is version 4.1, API 15." into ics-mr1Dianne Hackborn2011-11-022-2/+6
| |\ \ \ \
| | * | | | MR1 is version 4.1, API 15.Dianne Hackborn2011-11-022-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5f31630b17121ce43b3c60d43409069640e4d97a
* | | | | | am 3bd8e467: Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-020-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3bd8e467d7cd40c20f95fbf50de8f926ba301cb3': ITL33B ICL33B ICL33 ITL33 ITL33
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-020-0/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | / / | | | |_|/ / | | |/| | / | | | | |/ | | | |/| Change-Id: Ifc368f50826b4d4bc955457e0cc370fc9e10e459
generated by cgit v1.1 at 2024-12-26 04:24:53 +0000