summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 1c4fe5aa to masterScott Main2010-12-061-3/+4
|\ | | | | | | Change-Id: I3c83852dfb6a80614aad145d12cd61b65829805f
| * am dad569b4: docs: fix linkScott Main2010-12-051-1/+1
| |\ | | | | | | | | | | | | * commit 'dad569b4e815dee7056ff4d2e593ddadc3e087e1': docs: fix link
| | * docs: fix linkScott Main2010-12-051-1/+1
| | | | | | | | | | | | Change-Id: Id57ebbd12c16ef914ebe1d90260fdf8a5ae4587b
* | | Change from @ to $(hide) in CTS BuildBrian Muramatsu2010-12-061-7/+7
| | | | | | | | | | | | Change-Id: Ibda485105f750e971260088785904ea420cbaa03
* | | Add installd to PRODUCT_PACKAGESKenny Root2010-12-032-1/+1
| | | | | | | | | | | | | | | | | | | | | Another change adds the "optional" tag to installd, so moving it here and removing it from the grandfathered list. Change-Id: I035ffd527d007cf104c15890509976fc9b99d216
* | | resolved conflicts for merge of 064a4562 to masterSriram Raman2010-11-301-2/+2
|\ \ \ | |/ / | | | | | | Change-Id: I795e2b6ba842541fc941c1da396734198a12ea72
| * | am c647aeca: Add mkuserimg.sh, make_ext4fs to otatoolsSriram Raman2010-11-301-1/+3
| |\ \ | | |/ | | | | | | | | | * commit 'c647aecabb9cf03d73cfc34836e3bfc886b54c2e': Add mkuserimg.sh, make_ext4fs to otatools
| | * Add mkuserimg.sh, make_ext4fs to otatoolsSriram Raman2010-11-291-1/+3
| | | | | | | | | | | | Change-Id: Id48d6643f4579d695685fe2595bd86a80a5083c3
* | | Merge "docs: revisions to the sdk doc template for preview sdk, remove ndk ↵Scott Main2010-11-291-52/+21
|\ \ \ | | | | | | | | | | | | download table for offline docs"
| * | | docs: revisions to the sdk doc template for preview sdk,Scott Main2010-11-221-52/+21
| | | | | | | | | | | | | | | | | | | | | | | | remove ndk download table for offline docs Change-Id: I13da1e5ab825f1d5c6a19ef9a76c36a3edd88bf6
* | | | am 29ead582: am d2dd8652: Merge "Added generic hook for loading vendor ↵Jean-Baptiste Queru2010-11-241-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | specific tasks." * commit '29ead58259d47997d7caedf9080f4a2f9c9bd358': Added generic hook for loading vendor specific tasks.
| * | | am d2dd8652: Merge "Added generic hook for loading vendor specific tasks."Jean-Baptiste Queru2010-11-241-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'd2dd86529982cd05b4010248cea368fbef763ef2': Added generic hook for loading vendor specific tasks.
| | * \ \ Merge "Added generic hook for loading vendor specific tasks."Jean-Baptiste Queru2010-11-241-0/+1
| | |\ \ \
| | | * | | Added generic hook for loading vendor specific tasks.Claes Elgemark2010-11-241-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change it is possible for vendors to create rules that depend on targets defined in Android.mk files. This makes it easier to decouple functionality from the core buildsystem. Very much as is done within the build git for tasks like creating SDK addon, Generating eclipse .classpath file etc can then be done for vendors as well. You can add targets that could perform poststeps on produced modules. E.g. Do static verification or documentation on modules of a certain type. You can e.g. create a target that would resign and upload all apks to a binary repository. Change-Id: Ic0fa7b60b919ede3c59fa2885d1fd4be1e928c04
* | | | | Delete the tuttle keymaps.Jeff Brown2010-11-238-300/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files have been obsolete for years. Change-Id: I489d22799dd0fd476b6afe296e24434d437ea75b
* | | | | am ce5d7e04: am 7fbeda2b: Merge "Adding `all\' to INTERNAL_MODIFIER_TARGETS ↵Jean-Baptiste Queru2010-11-231-1/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | to fix `make all\'" * commit 'ce5d7e04a8550724b3c7dc54f84e68fbcbdb3fcb': Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
| * | | am 7fbeda2b: Merge "Adding `all\' to INTERNAL_MODIFIER_TARGETS to fix `make ↵Jean-Baptiste Queru2010-11-231-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | all\'" * commit '7fbeda2b1ed2872b2e2ab2f7faf386a3755502df': Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
| | * | Merge "Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'"Jean-Baptiste Queru2010-11-231-1/+1
| | |\ \
| | | * | Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'Magnus Bäck2010-11-231-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit e334d255 added the `all' pseudo-goal (aka internal modifier target) to have make dex all Java modules. Unfortunately the new pseudo-goal wasn't added to INTERNAL_MODIFIER_TARGETS so no actual phony goal was added, resulting in the obvious make: *** No rule to make target `all'. Stop. error message when running `make all'. This commit changes INTERNAL_MODIFIER_TARGETS to also include `all' so that the pseudo-goal is treated just like `showcommands' and `checkbuild'. Change-Id: I7905c1e27d1b17bdc1b4331744bf06e18937406f
* | | | am 6c7b6fb3: resolved conflicts for merge of b2028868 to gingerbread-plus-aospJean-Baptiste Queru2010-11-191-11/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '6c7b6fb3d2fda5cc5b881e01eb8bb0936ef0eeaf': IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings
| * | | resolved conflicts for merge of b2028868 to gingerbread-plus-aospJean-Baptiste Queru2010-11-191-11/+12
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ibe616c0bdf8e36aaee42279292a2dbe03c5643c2
| | * | Merge "IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings"Jean-Baptiste Queru2010-11-191-11/+12
| | |\ \
| | | * | IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settingsBruce Beare2010-11-191-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I60b8121c92b39a60b513bc2496a1e0a21015c586 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | | | am 554eeb6c: am 493306f7: Merge "Fix TARGET_PREBUILT_TAG so that ↵Jean-Baptiste Queru2010-11-192-8/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | get_build_var can retrieve the correct value across architectures" * commit '554eeb6c7426c8c1df551516cff903d69ae94f26': Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
| * | | | am 493306f7: Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can ↵Jean-Baptiste Queru2010-11-192-8/+8
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | retrieve the correct value across architectures" * commit '493306f7c318d632186bebd732708d4299e66a62': Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
| | * | | Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the ↵Jean-Baptiste Queru2010-11-192-8/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | correct value across architectures"
| | | * | | Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value ↵Bruce Beare2010-10-142-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | across architectures Change-Id: I5c1010d9caaa8d9ffaf65999fa3649c3c2be8caa Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | | | | am cc21582f: resolved conflicts for merge of 4130c80a to gingerbread-plus-aospJean-Baptiste Queru2010-11-190-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'cc21582fb3699e5384dc38dad45a575451375d1a': Correct makefile test for stagefright build
| * | | | | resolved conflicts for merge of 4130c80a to gingerbread-plus-aospJean-Baptiste Queru2010-11-190-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Change-Id: I4c37c4a6a54c3fb005eec4789bfcf96678d8cec9
| | * | | | Merge "Correct makefile test for stagefright build"Jean-Baptiste Queru2010-11-191-1/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Correct makefile test for stagefright buildBruce Beare2010-11-191-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ia79b97d43e3fad82491e7d6197ffef2e764a63e3 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | | | am f41934fc: am 26d8c589: Merge "Display the TARGET_ARCH_VARIANT"Jean-Baptiste Queru2010-11-191-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'f41934fcd42c56a02742014e8e24520a85166117': Display the TARGET_ARCH_VARIANT
| * | | | am 26d8c589: Merge "Display the TARGET_ARCH_VARIANT"Jean-Baptiste Queru2010-11-191-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '26d8c5896e937ed677007c23d46d6759845fe91f': Display the TARGET_ARCH_VARIANT
| | * | | Merge "Display the TARGET_ARCH_VARIANT"Jean-Baptiste Queru2010-11-191-0/+1
| | |\ \ \
| | | * | | Display the TARGET_ARCH_VARIANTBruce Beare2010-10-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | | | | am 92cc4c07: am b26a65b5: Merge "Restrict make version to 3.81"Ying Wang2010-11-191-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '92cc4c07475bd77ffb058f430c27b04f8cc9dfef': Restrict make version to 3.81
| * | | | | am b26a65b5: Merge "Restrict make version to 3.81"Ying Wang2010-11-191-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'b26a65b59ff5ed777accaf34ac06ab6a86dc37c6': Restrict make version to 3.81
| | * | | | Merge "Restrict make version to 3.81"Ying Wang2010-11-181-2/+2
| | |\ \ \ \
| | | * | | | Restrict make version to 3.81Ying Wang2010-11-181-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3209290 It turns out that gmake 3.82 on Mac OSX crashes with segmentation fault at some point. Change-Id: I7b632abe1cafc5f0ff2ea45611d8ccf0aa3f976a
* | | | | | Merge "Revert change removing AVRCP.kl and cpcap-key.kl"Jeff Brown2010-11-181-0/+2
|\ \ \ \ \ \
| * | | | | | Revert change removing AVRCP.kl and cpcap-key.klJeff Brown2010-11-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cannot remove these legacy prebuilts yet because they are referenced in the SDK. Change-Id: I87b6d1145932edc9335b9a800672e7f653ce5521
* | | | | | | Fix typo in ALL_PREBUILT error messageKenny Root2010-11-181-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ib59047e5c63950c84a6518a91ab6e5060c46ff21
* | | | | | Merge "Use prebuilt keymaps in frameworks/base/data/keyboards."Jeff Brown2010-11-183-2/+2
|\ \ \ \ \ \
| * | | | | | Use prebuilt keymaps in frameworks/base/data/keyboards.Jeff Brown2010-11-183-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I847167abaf5538a45f40df0ed5d69c9848284871
* | | | | | | docs: revise stylesheet to allow "notes" in divs, not just paragraphsScott Main2010-11-181-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia78a82dd330a4f31076b74ce86237af3aca1ba2e
* | | | | | | Pass extfs sparse image flag to the release tool.Ying Wang2010-11-172-6/+14
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: Icb2a1c4fddb2b6153298ba1b849016aa3d792773
* | | | | | Merge "Product-configurable sparse ext images."Ying Wang2010-11-172-3/+7
|\ \ \ \ \ \
| * | | | | | Product-configurable sparse ext images.Ying Wang2010-11-172-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifd0ac14d7df331c9f6f1e3eee0722e07b4ab199a
* | | | | | | am 766a2a21: am 48ec6d6f: Merge "Enables x86-atom as a valid ↵Jean-Baptiste Queru2010-11-171-0/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TARGET_ARCH_VARIANT for the simulator build." * commit '766a2a2125d41e8bfb88112601a34af08f47f7f1': Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
| * | | | | | am 48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the ↵Jean-Baptiste Queru2010-11-171-0/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simulator build." * commit '48ec6d6f814a70068c4632b468cd7872f34295ad': Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.