summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* libutils clean-upMathias Agopian2013-05-072-1/+2
| | | | Change-Id: I93a0fef582580282d62379ddba3ae2d50f3ea0c5
* am 49c0d603: am 3e792a64: am 0abb321f: am 3256dac3: am 4338eac1: am ↵Dirk Dougherty2013-05-072-38/+38
|\ | | | | | | | | | | | | 665021a4: am 0b026ce6: Update cs file to use devsite-compatible lowercase lang ids. * commit '49c0d603496a9999a1922905ddbd8c1eb80e3789': Update cs file to use devsite-compatible lowercase lang ids.
| * am 3e792a64: am 0abb321f: am 3256dac3: am 4338eac1: am 665021a4: am ↵Dirk Dougherty2013-05-062-38/+38
| |\ | | | | | | | | | | | | | | | | | | 0b026ce6: Update cs file to use devsite-compatible lowercase lang ids. * commit '3e792a6488bbb8f4d8ab850adda8d10d42f92252': Update cs file to use devsite-compatible lowercase lang ids.
| | * am 0abb321f: am 3256dac3: am 4338eac1: am 665021a4: am 0b026ce6: Update cs ↵Dirk Dougherty2013-05-062-38/+38
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | file to use devsite-compatible lowercase lang ids. * commit '0abb321f49f84dd53dccdc13cf219b60c15882a1': Update cs file to use devsite-compatible lowercase lang ids.
| | | * am 3256dac3: am 4338eac1: am 665021a4: am 0b026ce6: Update cs file to use ↵Dirk Dougherty2013-05-062-38/+38
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devsite-compatible lowercase lang ids. * commit '3256dac3de5404d518fc8fc5a5bb419030c70a38': Update cs file to use devsite-compatible lowercase lang ids.
| | | | * am 4338eac1: am 665021a4: am 0b026ce6: Update cs file to use ↵Dirk Dougherty2013-05-062-38/+38
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devsite-compatible lowercase lang ids. * commit '4338eac1d4ec2af0571f195d1a8428ab541dccdd': Update cs file to use devsite-compatible lowercase lang ids.
| | | | | * am 665021a4: am 0b026ce6: Update cs file to use devsite-compatible lowercase ↵Dirk Dougherty2013-05-062-38/+38
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lang ids. * commit '665021a42e05228d53fd87e622ca69b0344867fe': Update cs file to use devsite-compatible lowercase lang ids.
| | | | | | * am 0b026ce6: Update cs file to use devsite-compatible lowercase lang ids.Dirk Dougherty2013-05-062-38/+38
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0b026ce6ebedbad9ea2e5bc8dced609e59e9a195': Update cs file to use devsite-compatible lowercase lang ids.
| | | | | | | * Update cs file to use devsite-compatible lowercase lang ids.Dirk Dougherty2013-05-042-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie20e5977464199648fd91515ebe71c250162c0ee
* | | | | | | | am a1c0206c: am 0eb35626: Add extra libgcc.a only for unbundled build.Ying Wang2013-05-061-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a1c0206c31e9373e712792a62bc07f609822bca9': Add extra libgcc.a only for unbundled build.
| * | | | | | | am 0eb35626: Add extra libgcc.a only for unbundled build.Ying Wang2013-05-061-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '0eb35626da3e16d8db7756913433ee37f7ec2f49': Add extra libgcc.a only for unbundled build.
| | * | | | | | Add extra libgcc.a only for unbundled build.Ying Wang2013-05-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can save some space for platform build with this. Previously an extra libgcc.a was put before libc.so so libraries built against new platform can run on old platforms. This is needed only for unbundled build. Bug: 8805022 Bug: 8247455 Change-Id: I3c3e0092b06ec3804659d5cae048d29e0d2bf7ad
* | | | | | | | am 7e6362cc: (-s ours) am b71b2905: Merge "DO NOT MERGE: Change build id to ↵Igor Murashkin2013-05-060-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JB_MR2" into jb-mr2-dev * commit '7e6362cc37a0e839ce3649a04cd0dbee7da6b660': DO NOT MERGE: Change build id to JB_MR2
| * | | | | | | am b71b2905: Merge "DO NOT MERGE: Change build id to JB_MR2" into jb-mr2-devIgor Murashkin2013-05-061-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b71b290587a1c64c89745fa730bcbb0c4d69f6cc': DO NOT MERGE: Change build id to JB_MR2
| | * | | | | | Merge "DO NOT MERGE: Change build id to JB_MR2" into jb-mr2-devIgor Murashkin2013-05-031-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | DO NOT MERGE: Change build id to JB_MR2Igor Murashkin2013-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5c87f83e53ca534e816083a639c6798deb1d93f2
* | | | | | | | | am 366ac666: am 2b3b1409: am 6873be9e: am 5d2265cb: am ed5ea12b: am ↵Scott Main2013-05-023-114/+414
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f09c7628: am 0e76e7e4: provide search suggestions for api guides, training, etc. also: - demote deprecated APIs in suggestions - focus search bar with / and exit search with ESC * commit '366ac666f7208c7e6bb223671f7026b4107c8b95': provide search suggestions for api guides, training, etc. also: - demote deprecated APIs in suggestions - focus search bar with / and exit search with ESC
| * | | | | | | | am 2b3b1409: am 6873be9e: am 5d2265cb: am ed5ea12b: am f09c7628: am ↵Scott Main2013-05-023-114/+414
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e76e7e4: provide search suggestions for api guides, training, etc. also: - demote deprecated APIs in suggestions - focus search bar with / and exit search with ESC * commit '2b3b140904c90984d7d7c00488ae1ef858ff19cb': provide search suggestions for api guides, training, etc. also: - demote deprecated APIs in suggestions - focus search bar with / and exit search with ESC
| | * | | | | | | am 6873be9e: am 5d2265cb: am ed5ea12b: am f09c7628: am 0e76e7e4: provide ↵Scott Main2013-05-023-114/+414
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | search suggestions for api guides, training, etc. also: - demote deprecated APIs in suggestions - focus search bar with / and exit search with ESC * commit '6873be9eaa509380a54ec13c50d137608e124b51': provide search suggestions for api guides, training, etc. also: - demote deprecated APIs in suggestions - focus search bar with / and exit search with ESC
| | | * | | | | | am 5d2265cb: am ed5ea12b: am f09c7628: am 0e76e7e4: provide search ↵Scott Main2013-05-023-114/+414
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suggestions for api guides, training, etc. also: - demote deprecated APIs in suggestions - focus search bar with / and exit search with ESC * commit '5d2265cb53dca92dd2fb347fc9c020b50c77f8e1': provide search suggestions for api guides, training, etc. also: - demote deprecated APIs in suggestions - focus search bar with / and exit search with ESC
| | | | * | | | | am ed5ea12b: am f09c7628: am 0e76e7e4: provide search suggestions for api ↵Scott Main2013-05-023-114/+414
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guides, training, etc. also: - demote deprecated APIs in suggestions - focus search bar with / and exit search with ESC * commit 'ed5ea12b0ff8cfbc11d5b7dbda43f390b3a7d58c': provide search suggestions for api guides, training, etc. also: - demote deprecated APIs in suggestions - focus search bar with / and exit search with ESC
| | | | | * | | | am f09c7628: am 0e76e7e4: provide search suggestions for api guides, ↵Scott Main2013-05-023-114/+414
| | | | | |\ \ \ \ | | | | | | | |/ / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | training, etc. also: - demote deprecated APIs in suggestions - focus search bar with / and exit search with ESC * commit 'f09c762886afee9e7acc5632b3df3146a6d3bbb2': provide search suggestions for api guides, training, etc. also: - demote deprecated APIs in suggestions - focus search bar with / and exit search with ESC
| | | | | | * | | am 0e76e7e4: provide search suggestions for api guides, training, etc. also: ↵Scott Main2013-05-023-114/+414
| | | | | | |\ \ \ | | | | | | | | |/ | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - demote deprecated APIs in suggestions - focus search bar with / and exit search with ESC * commit '0e76e7e4dd44d9e8893cbf2e077a96e655628e99': provide search suggestions for api guides, training, etc. also: - demote deprecated APIs in suggestions - focus search bar with / and exit search with ESC
| | | | | | | * | provide search suggestions for api guides, training, etc.Scott Main2013-05-023-114/+414
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also: - demote deprecated APIs in suggestions - focus search bar with / and exit search with ESC Change-Id: I78818d76375d63b9eb42922d6c20ebbea30c353b
* | | | | | | | | am 10dca3c4: am 278bbf12: Don\'t concatenate the NOTICE file for a single ↵Torne (Richard Coles)2013-04-301-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | module. * commit '10dca3c41111f362fcd6acb519b45847817f75c9': Don't concatenate the NOTICE file for a single module.
| * | | | | | | | am 278bbf12: Don\'t concatenate the NOTICE file for a single module.Torne (Richard Coles)2013-04-301-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '278bbf126321304e125c8226b0cb8b51f25f3f0e': Don't concatenate the NOTICE file for a single module.
| | * | | | | | | Don't concatenate the NOTICE file for a single module.Torne (Richard Coles)2013-04-301-1/+1
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the NOTICE file for a module changed, the new NOTICE was being concatenated onto the end of the old one in non-clean builds, taking up more and more space and presumably duplicating most of the content. Only one set of rules for a given file can exist in make, so there cannot be a case where more than one $(notice_file) was intentionally being concatenated together as this would be an error. Change-Id: I0f5fae498225eaee5cc75d854223b5ba790fcebe
* | | | | | | | Merge "Bump up to API 18 to match jbmr2."Dianne Hackborn2013-04-302-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump up to API 18 to match jbmr2.Dianne Hackborn2013-04-302-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I84755411b6688edc373a8fbd44af0dbc8e89d2ac
* | | | | | | | | am 79a89fc8: am b4314f15: (-s ours) Merge "Track change to JSSE provider"Kenny Root2013-04-300-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '79a89fc8248290c08307ecece501eb9e270e55d1': Track change to JSSE provider
| * | | | | | | | am b4314f15: (-s ours) Merge "Track change to JSSE provider"Kenny Root2013-04-290-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b4314f15346b05eed956c979c7d05f4732caaae3': Track change to JSSE provider
| | * \ \ \ \ \ \ \ Merge "Track change to JSSE provider"Kenny Root2013-04-304-2/+6
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Track change to JSSE providerKenny Root2013-04-294-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I130b137f8ba62a3cf1b915dcf6a0cf3dc25043eb
* | | | | | | | | | | am dfaf3843: Track change to JSSE providerKenny Root2013-04-305-2/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dfaf384309d523a30bedcb9fe6da1074bafbe990': Track change to JSSE provider
| * | | | | | | | | | Track change to JSSE providerKenny Root2013-04-295-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I130b137f8ba62a3cf1b915dcf6a0cf3dc25043eb
* | | | | | | | | | | am 3d660f2a: am 042723c0: Merge "x86/mips: enable _FORTIFY_SOURCE=2"Nick Kralevich2013-04-302-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3d660f2a7c8a69a33825cb05ffe8667c99138000': x86/mips: enable _FORTIFY_SOURCE=2
| * | | | | | | | | | am 042723c0: Merge "x86/mips: enable _FORTIFY_SOURCE=2"Nick Kralevich2013-04-292-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '042723c0151980fee315678736751f7385977d90': x86/mips: enable _FORTIFY_SOURCE=2
| | * | | | | | | | | Merge "x86/mips: enable _FORTIFY_SOURCE=2"Nick Kralevich2013-04-292-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | x86/mips: enable _FORTIFY_SOURCE=2Nick Kralevich2013-04-292-2/+2
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable _FORTIFY_SOURCE=2 for x86 and MIPS. Currently, this change is a no-op, as Android's libc doesn't support _FORTIFY_SOURCE > 1, yet. The ARM change was made in 316f720b91f879c4e3972d6d595535de0ac707b2 Change-Id: Iafe90beadf9b6a41ea294b7107cf4f18141acf3a
* | | | | | | | | | Remove references to DrmProviderMike Lockwood2013-04-293-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If05d95c3c8ccf5b0455046fee113221437db2710
* | | | | | | | | | Remove obsolete OMA-DRM supportMike Lockwood2013-04-292-3/+0
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie460730f3ec42e2208e4df685250f7b95a77b4c7
* | | | | | | | | Merge "Move pseudolocalize to aapt"Bjorn Bringert2013-04-293-130/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move pseudolocalize to aaptBjorn Bringert2013-04-263-130/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only aapt used pseudolocalization, so the code has been moved to frameworks/base/tools/aapt Change-Id: I1ddb3215c927fb19ca3765768edb8d14b38da94a
* | | | | | | | | | am 96cea40f: am 9d461e30: Merge "Add v7 support libs to path map." into ↵Jeff Brown2013-04-261-1/+11
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '96cea40fce3939716cfcf1bc8aaeddd99fa396ac': Add v7 support libs to path map.
| * | | | | | | | | am 9d461e30: Merge "Add v7 support libs to path map." into jb-mr2-devJeff Brown2013-04-261-1/+11
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9d461e3080375a701c61b29d1901928e7272f4df': Add v7 support libs to path map.
| | * | | | | | | | Merge "Add v7 support libs to path map." into jb-mr2-devJeff Brown2013-04-261-1/+11
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Add v7 support libs to path map.Jeff Brown2013-04-261-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary to ensure that we correctly generate documentation for these packages. Bug: 8175766 Change-Id: Ia1c359c744d68f9b9423fd0e9df5516890792936
* | | | | | | | | | | am c665ece6: am 2dc245b9: Clean yacc version checkYing Wang2013-04-261-5/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c665ece64a489f855749afa6e3266a9368cc8086': Clean yacc version check
| * | | | | | | | | | am 2dc245b9: Clean yacc version checkYing Wang2013-04-261-5/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2dc245b9cb1a3ef52d38d704776fe3a9942b6af1': Clean yacc version check
| | * | | | | | | | | Clean yacc version checkYing Wang2013-04-261-5/+0
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't rely on host preinstalled bison/yacc now. Change-Id: Iac0a7f1c12fe9d33baa53e48297ecb41ad89792d