summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | IMM76GThe Android Automerger2012-04-021-1/+1
| | | | | | |
| | | * | | | IMM76FThe Android Automerger2012-03-291-1/+1
| | | | | | |
| | | * | | | IMM76EThe Android Automerger2012-03-281-1/+1
| | | | | | |
* | | | | | | am 80879a6e: (-s ours) am 695a2b3f: am 9b16b129: Merge "Switch to new ↵Jean-Baptiste Queru2012-04-240-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | locations of toolchains" * commit '80879a6ea4be133c222911055d83e3e43dc15be5': Switch to new locations of toolchains
| * | | | | | am 695a2b3f: am 9b16b129: Merge "Switch to new locations of toolchains"Jean-Baptiste Queru2012-04-235-9/+11
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '695a2b3fd9b68f45b6fa1065c1254f88318dd4ca': Switch to new locations of toolchains
| | * | | | | am 9b16b129: Merge "Switch to new locations of toolchains"Jean-Baptiste Queru2012-04-235-9/+11
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '9b16b1293255be054a84e6f39098c7a35357f636': Switch to new locations of toolchains
| | | * | | | Merge "Switch to new locations of toolchains"Jean-Baptiste Queru2012-04-235-9/+11
| | | |\ \ \ \
| | | | * | | | Switch to new locations of toolchainsJean-Baptiste Queru2012-04-205-9/+11
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | Change-Id: I15a8be11b3d0f1985ffd97dd51a1af18e1ce7b67
* | | | | | | Merge 8664008c to masterJean-Baptiste Queru2012-04-241-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: Ia6aa11892665b8aa42e5fbc69146db251d9a8636
| * | | | | | am acd812d6: am 11e0192d: Merge "Add goldfish audio hw to board/generic_x86"Andrew Hsieh2012-04-211-1/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'acd812d6a7bce9fd44e2b5974b93c542754f78d6': Add goldfish audio hw to board/generic_x86
| | * | | | | am 11e0192d: Merge "Add goldfish audio hw to board/generic_x86"Andrew Hsieh2012-04-211-1/+4
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '11e0192d29459aab8f3acebaae113eece492069f': Add goldfish audio hw to board/generic_x86
| | | * | | | Merge "Add goldfish audio hw to board/generic_x86"Andrew Hsieh2012-04-201-1/+4
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Add goldfish audio hw to board/generic_x86Andrew Hsieh2012-04-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without it, app with audio may crash x86 emulator Change-Id: Ie9b30a2827c0a559e7cf73b7b21604f36c379483
* | | | | | | am 77df1f2a: am 9987dbbb: am d0427e49: Merge "Workaround for a gcc-4.6 bug ↵Jean-Baptiste Queru2012-04-240-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on -fstrict-volatile-bitfields." * commit '77df1f2aeceaeabfc058a1938b672fe02a4fed93': Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
| * | | | | | am 9987dbbb: am d0427e49: Merge "Workaround for a gcc-4.6 bug on ↵Jean-Baptiste Queru2012-04-201-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -fstrict-volatile-bitfields." * commit '9987dbbbb43ca3279ec615299fbab8a9101aa51c': Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
| | * | | | | am d0427e49: Merge "Workaround for a gcc-4.6 bug on ↵Jean-Baptiste Queru2012-04-201-1/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -fstrict-volatile-bitfields." * commit 'd0427e493edf2e4de2bd60fd1cc8253e9de233fd': Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
| | | * | | | Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."Jean-Baptiste Queru2012-04-201-1/+2
| | | |\ \ \ \
| | | | * | | | Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.Jing Yu2012-04-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html http://gcc.gnu.org/ml/gcc-patches/2011-11/msg01390.html -fstrict-volatile-bitfields is set on by default on gcc-4.6 for ARM target. This causes an inline asm() error. While upstream gcc community is working on the patch, we shut off this option temporarily. This patch does not affect gcc-4.4.3 build. Change-Id: Id7016dc5856a516e10f2617232945034728a74ab
* | | | | | | | am 7ed999aa: (-s ours) am c4aa4ff3: am 810b0d8b: Merge "Fix build problems ↵Jean-Baptiste Queru2012-04-240-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with gcc-4.6.x." * commit '7ed999aaf00a71d99975a4a068ba2562c0aabc88': Fix build problems with gcc-4.6.x.
| * | | | | | | am c4aa4ff3: am 810b0d8b: Merge "Fix build problems with gcc-4.6.x."Jean-Baptiste Queru2012-04-201-4/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c4aa4ff3551873c2e87a8679994d1f41f9909b0b': Fix build problems with gcc-4.6.x.
| | * | | | | | am 810b0d8b: Merge "Fix build problems with gcc-4.6.x."Jean-Baptiste Queru2012-04-201-4/+5
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '810b0d8bb4a458c5a92c0bed48b75cbf27f1410d': Fix build problems with gcc-4.6.x.
| | | * | | | | Merge "Fix build problems with gcc-4.6.x."Jean-Baptiste Queru2012-04-201-4/+5
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | / / / | | | | |/ / / | | | |/| | |
| | | | * | | Fix build problems with gcc-4.6.x.Doug Kwan2012-04-201-4/+5
| | | |/ / / | | | | | | | | | | | | | | | | | | Change-Id: If02f18efde4cec39c97bb0e7226b008cd6b85dd4
* | | | | | am 4054a158: am 7a086316: am 6b719da3: docs: update sidenav-width-adjust ↵Scott Main2012-04-240-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | script so Training classes save the width for the Resources section * commit '4054a1587a878d2c5f9dc64433bf7ae8ebbe6bd3':
| * | | | | am 7a086316: am 6b719da3: docs: update sidenav-width-adjust script so ↵Scott Main2012-04-200-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Training classes save the width for the Resources section * commit '7a086316424925fb33ed470116563712e7754f8b':
| | * \ \ \ \ am 6b719da3: docs: update sidenav-width-adjust script so Training classes ↵Scott Main2012-04-201-0/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | save the width for the Resources section * commit '6b719da3162ef99db8b90379a9dc4724b571395f': docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* | | \ \ \ \ \ am 217a4d89: am 9041aa50: am 6b719da3: docs: update sidenav-width-adjust ↵Scott Main2012-04-240-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script so Training classes save the width for the Resources section * commit '217a4d896b9bd5bd91cccc8077f7ebd353538f7b':
| * | | | | | | am 9041aa50: am 6b719da3: docs: update sidenav-width-adjust script so ↵Scott Main2012-04-201-0/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Training classes save the width for the Resources section * commit '9041aa50fbdb2cff512617a0377385c7d5ada663': docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
| | * | | | | | am 6b719da3: docs: update sidenav-width-adjust script so Training classes ↵Scott Main2012-04-201-0/+1
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | save the width for the Resources section * commit '6b719da3162ef99db8b90379a9dc4724b571395f': docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* | | | | | | | am f689b77c: am b3d8eecd: am 76b0139a: docs: update doc template to make the ↵Scott Main2012-04-240-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resources side nav wider (+40px) * commit 'f689b77c0519f1c73006d55d8ca3ed35bfb64ad1':
| * | | | | | | am b3d8eecd: am 76b0139a: docs: update doc template to make the Resources ↵Scott Main2012-04-190-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | side nav wider (+40px) * commit 'b3d8eecd9ca47ac369ce420b6da21947a6a6d84f':
| | * | | | | | am 76b0139a: docs: update doc template to make the Resources side nav wider ↵Scott Main2012-04-191-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (+40px) * commit '76b0139a50ecdfa5613af9563808cc42a72476d8': docs: update doc template to make the Resources side nav wider (+40px)
* | | \ \ \ \ \ \ am 7291a4f7: am 27e53840: am 76b0139a: docs: update doc template to make the ↵Scott Main2012-04-240-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resources side nav wider (+40px) * commit '7291a4f78408651d78a8ff05eda22ce3805603dd':
| * | | | | | | | am 27e53840: am 76b0139a: docs: update doc template to make the Resources ↵Scott Main2012-04-191-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | side nav wider (+40px) * commit '27e538405495b3d36b2750e376706e0ad583a03c': docs: update doc template to make the Resources side nav wider (+40px)
| | * | | | | | | am 76b0139a: docs: update doc template to make the Resources side nav wider ↵Scott Main2012-04-191-1/+1
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (+40px) * commit '76b0139a50ecdfa5613af9563808cc42a72476d8': docs: update doc template to make the Resources side nav wider (+40px)
* | | | | | | | | Merge "Make export_includes depend on the module's definition makefile."Ying Wang2012-04-242-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make export_includes depend on the module's definition makefile.Ying Wang2012-04-232-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6383397 Note that LOCAL_MODULE_MAKEFILE is calculated in the macro my-dir, which must be called at the beginning of your Android.mk to calculate LOCAL_PATH. Change-Id: I7aa079e37253fbda25ffb85c2e5bbf0663340e27
* | | | | | | | | | Merge "Set timestamps of files from platform.zip to current time"Colin Cross2012-04-241-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Set timestamps of files from platform.zip to current timeColin Cross2012-04-241-2/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Touch files unzipped from platform.zip to update their timestamp. Prevents make dependency confusion from files with old times. Also add a dependency for the implicit copy rule on the pdk_fusion.stamp file to force make to use the updated files. Change-Id: Ia54454518d229ce3670023819836f586fef65d3f
* | | | | | | | | | Merge "On linux, always use the prebuilt host toolchain"Jean-Baptiste Queru2012-04-241-2/+0
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | On linux, always use the prebuilt host toolchainJean-Baptiste Queru2012-04-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8077c4780e1e3540e5e2133cf0ffa61d474d3acc
* | | | | | | | | | Whitelist audienceJean-Baptiste Queru2012-04-231-0/+1
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3a39f4bdc5c52e01b7d5d187e35b6fbf770756e2
* | | | | | | | | enable Java build for PDK buildKeun young Park2012-04-202-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Highest LOCAL_SDK_VERSION forced for package build / java library build Bug: 6352960 Change-Id: I4a26bf26a51b95fb97c8b2adc9d32a543832c708
* | | | | | | | | Merge "Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION ↵Keun young Park2012-04-203-17/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | forced for package build / java library build - uses prebuilt tools for PDK""
| * | | | | | | | | Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced ↵Keun young Park2012-04-203-17/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for package build / java library build - uses prebuilt tools for PDK" This reverts commit 9283168e61a4991d39a6c599627eefc45d41c099
* | | | | | | | | | Merge "Move pdk fusion platform.zip file under vendor/pdk"Colin Cross2012-04-201-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Move pdk fusion platform.zip file under vendor/pdkColin Cross2012-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Look for the platform.zip file in: vendor/pdk/DEVICE/PRODUCT-BUILD_VARIANT/platform/platform.zip Change-Id: I275029842fdf13867d5141549ca8c39abb23600b
* | | | | | | | | | Merge "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced ↵Keun young Park2012-04-203-1/+17
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | for package build / java library build - uses prebuilt tools for PDK"
| * | | | | | | | | enable Java build for PDK buildKeun young Park2012-04-203-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK Bug: 6352960 Change-Id: Ibb5162a16aa8151a1675baac14adb0cdfc13592d
* | | | | | | | | | am ac2c989e: am 6b719da3: docs: update sidenav-width-adjust script so ↵Scott Main2012-04-201-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Training classes save the width for the Resources section * commit 'ac2c989e8492a733bdd3d4c7e1bedd5210c56c8d': docs: update sidenav-width-adjust script so Training classes save the width for the Resources section