summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 5429cdc2: am bb3ed6fb: am b8702917: am 75f21bc7: Merge "add 2x header ↵Scott Main2014-03-272-1/+3
|\ | | | | | | | | | | | | logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs * commit '5429cdc2c84bd753202897a7b3437a7fc522fd8b': add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.
| * am bb3ed6fb: am b8702917: am 75f21bc7: Merge "add 2x header logo and add ↵Scott Main2014-03-272-1/+3
| |\ | | | | | | | | | | | | | | | | | | override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs * commit 'bb3ed6fb476f0e072a2f8e4c34cda6c5afd2116c': add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.
| | * am b8702917: am 75f21bc7: Merge "add 2x header logo and add override to ↵Scott Main2014-03-272-1/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs * commit 'b8702917c61923bc4dc5f6284482e1296b783bd4': add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.
| | | * am 75f21bc7: Merge "add 2x header logo and add override to viewport width ↵Scott Main2014-03-272-1/+3
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs * commit '75f21bc79e18f5bdf7676eeab6681e8f4a32e688': add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.
| | | | * Merge "add 2x header logo and add override to viewport width for landing ↵Scott Main2014-03-272-1/+3
| | | | |\ | | | | | | | | | | | | | | | | | | pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs
| | | | | * add 2x header logo and add override to viewport width for landing pages.Scott Main2014-03-262-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changing the viewport to 970 ensures proper layout space for floating divs. Change-Id: Iea980b4dfe1cca8a2b517f171a847a0e2788b1f0
* | | | | | am 9e81f2c2: am 97d326ea: am 514c8254: am 4b270cdf: Update the sdk templates ↵Scott Main2014-03-273-9/+169
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to support the Android Wear microsite * commit '9e81f2c2ece29e97d2ff87440ab18550add5170c': Update the sdk templates to support the Android Wear microsite
| * | | | | am 97d326ea: am 514c8254: am 4b270cdf: Update the sdk templates to support ↵Scott Main2014-03-273-9/+169
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the Android Wear microsite * commit '97d326ea1974bc0f060974c341767cd298196842': Update the sdk templates to support the Android Wear microsite
| | * | | | am 514c8254: am 4b270cdf: Update the sdk templates to support the Android ↵Scott Main2014-03-273-9/+169
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wear microsite * commit '514c8254d0a78a4153c442bc0789da8a10ce8b0b': Update the sdk templates to support the Android Wear microsite
| | | * | | am 4b270cdf: Update the sdk templates to support the Android Wear micrositeScott Main2014-03-273-9/+169
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | * commit '4b270cdf3678998370c2c3629711797ec7ab8a5a': Update the sdk templates to support the Android Wear microsite
| | | | * | Update the sdk templates to support the Android Wear micrositeScott Main2014-03-263-9/+169
| | | | |/ | | | | | | | | | | | | | | | Change-Id: I848f442b3bc66ee2fb87db8200df370d13762d29
* | | | | am 441e9452: resolved conflicts for merge of f3e25fea to ↵Colin Cross2014-03-278-17/+116
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit '441e9452488ccb98f7b0a7690b86fcdff733e5f0': add support for LOCAL_MULTILIB
| * | | | resolved conflicts for merge of f3e25fea to klp-modular-dev-plus-aospColin Cross2014-03-268-17/+116
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I7b002780d8282b54821e8761198bc0af3e7ce71e
| | * \ \ \ am 007faa43: Merge "add support for LOCAL_MULTILIB"Colin Cross2014-03-268-17/+115
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '007faa43cf380013e2510363b707e46884f1466c': add support for LOCAL_MULTILIB
| | | * \ \ \ Merge "add support for LOCAL_MULTILIB"Colin Cross2014-03-268-17/+115
| | | |\ \ \ \
| | | | * | | | add support for LOCAL_MULTILIBColin Cross2014-03-268-17/+115
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOCAL_MULTILIB replaces LOCAL_32_BIT_ONLY and LOCAL_NO_2ND_ARCH, although both are still supported. Set LOCAL_MULTILIB := 32 to always build a module 32-bit. This is the same as specifying LOCAL_32_BIT_ONLY. Set LOCAL_MULTILIB := first to always build a module for the first architecture (64-bit on a 64-bit target, 32-bit on a 32-bit target). This is the same as specifying LOCAL_NO_2ND_ARCH. Set LOCAL_MULTILIB := both to build for both architectures on a mulitlib (64-bit) target. If LOCAL_MULTILIB is not set libraries will default to "both", and executables, packages, and prebuilts will default to building for the first architecture if supported by the module, otherwise the second. Executables that set LOCAL_MULTILIB := both must set either LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 or LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to specify how to differentiate the install locations of the two versions. Change-Id: I22ab6aa342b231c307b1d8a86cea4fd91eea39f5
* | | | | | | am c8fea2ae: am 7c629a72: am cc851243: Merge "Add annotation support lib." ↵Xavier Ducrohet2014-03-261-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-ub-dev * commit 'c8fea2ae9859c68e3d48c4e65ada7331daab11f0': Add annotation support lib.
| * | | | | | am 7c629a72: am cc851243: Merge "Add annotation support lib." into klp-ub-devXavier Ducrohet2014-03-261-0/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit '7c629a728f628278986498060e649727cf5025fa': Add annotation support lib.
| | * | | | | am cc851243: Merge "Add annotation support lib." into klp-ub-devXavier Ducrohet2014-03-261-0/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * commit 'cc85124393c438986e6639bc90906edf2dc2ca7a': Add annotation support lib.
| | | * | | | Merge "Add annotation support lib." into klp-ub-devXavier Ducrohet2014-03-261-0/+1
| | | |\ \ \ \
| | | | * | | | Add annotation support lib.Xavier Ducrohet2014-03-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a4ddbdf09a09db944e16ed6baab604aa1710974
* | | | | | | | Merge "Add the verity key to the verity dependencies."Geremy Condra2014-03-261-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add the verity key to the verity dependencies.Geremy Condra2014-03-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missed this last time around. Needed to boot. Change-Id: I67f25ed442365ad0171ecbc37bc2de02b7108399
* | | | | | | | | Merge "Temporarily use a separate var for including shared resources"Adam Lesinski2014-03-263-5/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Temporarily use a separate var for including shared resourcesAdam Lesinski2014-03-253-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I56636a1d7dfdaa070706f1991f80e03fe2f71069
* | | | | | | | | | am 8295d6cd: am ce087413: am 36a67a90: Merge topic \'tests\'Colin Cross2014-03-256-28/+38
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | * commit '8295d6cd62ba73ea66e64204d2d0ea27b4b34889': add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
| * | | | | | | | am ce087413: am 36a67a90: Merge topic \'tests\'Colin Cross2014-03-256-28/+38
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ce08741397e0468185457f5c7e8aee08272e6752': add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
| | * | | | | | | am 36a67a90: Merge topic \'tests\'Colin Cross2014-03-256-28/+38
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36a67a9040f35fc47c0ea5cafa61910a7e2fcc66': add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
| | | * | | | | | Merge topic 'tests'Colin Cross2014-03-256-28/+38
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64
| | | | * | | | | | add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64Colin Cross2014-03-255-26/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some executables will need to be built for both 32-bit and 64-bit. For linker/linker64, debuggerd/debuggerd64, and a few more, they will be installed in the same path (/system/bin), but with different filenames. Allow the module to specify LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64 to name the two versions. Change-Id: I573e8678c7332245a064f31246be0a05f0a9e25f
| | | | * | | | | | add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64Colin Cross2014-03-253-2/+15
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some executables will need to be built for both 32-bit and 64-bit. For tests, it will be convienient to keep the name of the executable the same, but install them in a different location. Add LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64 to allow a module to specify different paths for 32-bit and 64-bit executables. Change-Id: I3be830e899c6d485fe55c25c66b20b3fe64c795e
* | | | | | | | | Set up dependency of resource_export_packageYing Wang2014-03-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rules to build $(resource_export_package) need also the framework-res's and potentially other shared libraries' package-export.apks. Change-Id: I9ff10c621917ba7eed2da11a51cd2426845ad9be
* | | | | | | | | am 27de0f14: am 816979cc: am d9bc3eda: am 49b4ef0b: am fd0be925: docs: Added ↵Ricardo Cervera2014-03-251-31/+31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK version to the ADT bundles download path in the CS template. * commit '27de0f1471daa2f7b35fff41a1fcb04f91dc8c90': docs: Added SDK version to the ADT bundles download path in the CS template.
| * \ \ \ \ \ \ \ \ am 816979cc: am d9bc3eda: am 49b4ef0b: am fd0be925: docs: Added SDK version ↵Ricardo Cervera2014-03-251-31/+31
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the ADT bundles download path in the CS template. * commit '816979cc42a362b1f4485a113b749ae7ba52c882': docs: Added SDK version to the ADT bundles download path in the CS template.
| | * | | | | | | | am d9bc3eda: am 49b4ef0b: am fd0be925: docs: Added SDK version to the ADT ↵Ricardo Cervera2014-03-251-31/+31
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bundles download path in the CS template. * commit 'd9bc3eda8f8af202071023ffb93aaee96653dc92': docs: Added SDK version to the ADT bundles download path in the CS template.
| | | * | | | | | | am 49b4ef0b: am fd0be925: docs: Added SDK version to the ADT bundles ↵Ricardo Cervera2014-03-251-31/+31
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | download path in the CS template. * commit '49b4ef0badd51ce3af0511206e20114414a6c427': docs: Added SDK version to the ADT bundles download path in the CS template.
| | | | * | | | | | am fd0be925: docs: Added SDK version to the ADT bundles download path in the ↵Ricardo Cervera2014-03-251-31/+31
| | | | |\ \ \ \ \ \ | | | | | | |_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CS template. * commit 'fd0be925bb6e34768f9f11cf5325d1fcfbf39410': docs: Added SDK version to the ADT bundles download path in the CS template.
| | | | | * | | | | docs: Added SDK version to the ADT bundles download path in the CS template.Ricardo Cervera2014-03-251-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib222684754779b908cb10e6d8f9e5778101c9b96
* | | | | | | | | | am 9c08a73b: am 6440fb0c: am b35094ec: am 01aa01db: Merge "Make Clang host ↵Tim Murray2014-03-256-10/+82
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builds hermetic on Linux." * commit '9c08a73b242344a18676a2c5b17f5d475abef16f': Make Clang host builds hermetic on Linux.
| * | | | | | | | | am 6440fb0c: am b35094ec: am 01aa01db: Merge "Make Clang host builds ↵Tim Murray2014-03-256-10/+82
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hermetic on Linux." * commit '6440fb0c844068fd8be5901a2cbb1a0af0a92d15': Make Clang host builds hermetic on Linux.
| | * | | | | | | | am b35094ec: am 01aa01db: Merge "Make Clang host builds hermetic on Linux."Tim Murray2014-03-256-10/+82
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b35094ec709c8de7f3f7d6dbd54655ec99cd9529': Make Clang host builds hermetic on Linux.
| | | * | | | | | | am 01aa01db: Merge "Make Clang host builds hermetic on Linux."Tim Murray2014-03-256-10/+82
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '01aa01dbfac86861c179a7922624f82d752b30ef': Make Clang host builds hermetic on Linux.
| | | | * | | | | | Merge "Make Clang host builds hermetic on Linux."Tim Murray2014-03-256-10/+82
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Make Clang host builds hermetic on Linux.Tim Murray2014-03-246-10/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lays the groundwork for making builds hermetic on Darwin as well. That will be fixed in a future patch. bug 13435344 Change-Id: Iae82d0b9efad0598d682ff5fd4daa737aa607866
* | | | | | | | | | | am 3c1183a6: am 3a943c9e: am 0143ee4a: am a3c76c28: Merge "remove libeffects ↵Colin Cross2014-03-251-4/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from 64-bit blacklist" * commit '3c1183a6634eb37d66e17c0947d9f696cd28e810': remove libeffects from 64-bit blacklist
| * | | | | | | | | | am 3a943c9e: am 0143ee4a: am a3c76c28: Merge "remove libeffects from 64-bit ↵Colin Cross2014-03-251-4/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blacklist" * commit '3a943c9e571c027c3557bc690204751d4e872995': remove libeffects from 64-bit blacklist
| | * | | | | | | | | am 0143ee4a: am a3c76c28: Merge "remove libeffects from 64-bit blacklist"Colin Cross2014-03-251-4/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0143ee4a5779620659c7b59e4294359c4a96af78': remove libeffects from 64-bit blacklist
| | | * | | | | | | | am a3c76c28: Merge "remove libeffects from 64-bit blacklist"Colin Cross2014-03-251-4/+0
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a3c76c2824c4ce1f097a4c1ae601c0fba8142bc9': remove libeffects from 64-bit blacklist
| | | | * | | | | | | Merge "remove libeffects from 64-bit blacklist"Colin Cross2014-03-251-4/+0
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | remove libeffects from 64-bit blacklistColin Cross2014-03-241-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Everything under frameworks/av/media/libeffects compiles fine for 64-bit Change-Id: I03519a98903b7d65936053ef7eda8926cce60ea0
generated by cgit v1.1 at 2025-02-13 16:54:13 +0000