Commit Graph

11234 Commits

Author SHA1 Message Date
Dirk Dougherty 9c2336e073 Add new droiddoc option for project-specific secondary html input/output paths.
Change-Id: Id9c3dc4e7cfcc26c04e4d1aeb6617e3e6b92114b
2013-01-28 19:51:04 -08:00
Dirk Dougherty dc6b4a591c Add templates for devsite docs builds.
Change-Id: I0bb0238326aed7d2ff931594709cb153b2587061
2013-01-28 14:49:50 -08:00
Ying Wang 46fa45ad76 am cf0a9042: am 9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
# Via Android Git Automerger (1) and others
* commit 'cf0a90426ad969bd2deb66b0c23079842b6c4fa2':
  Use += to append to target-specific PRIVATE_CLEAN_FILES
2013-01-28 11:36:51 -08:00
Ying Wang cf0a90426a am 9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
# Via Gerrit Code Review (1) and Ying Wang (1)
* commit '9e808ff70515479458d39abfd64ed11eb55fefbb':
  Use += to append to target-specific PRIVATE_CLEAN_FILES
2013-01-28 11:34:56 -08:00
Ying Wang 9e808ff705 Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES" 2013-01-28 19:05:30 +00:00
Ying Wang eda6ac2487 Use += to append to target-specific PRIVATE_CLEAN_FILES
Instead of incorrectly including global variable PRIVATE_CLEAN_FILES

Change-Id: I9b5e12448dad5001de051a566d8a94a89b20ecac
2013-01-28 10:58:01 -08:00
Elliott Hughes 2988a09f90 Remove HAVE_DLADDR from AndroidConfig.h.
Change-Id: I014ce98c61b12169e381b769af34b682df46087e
2013-01-25 15:57:40 -08:00
The Android Automerger bb54d9dc4a JDQ23 2013-01-23 16:29:19 -08:00
The Android Automerger ae15c402a8 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-23 16:28:43 -08:00
The Android Automerger 2260eafa4e JDQ18 2013-01-18 12:20:38 -08:00
The Android Automerger fb34d9572a merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-18 12:19:58 -08:00
Ying Wang 58aee9e30e am 383ecfaf: DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
* commit '383ecfaf023dab1fcab25d97548093e32ef1a564':
  DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
2013-01-17 18:13:08 -08:00
Ying Wang 383ecfaf02 DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
Cherry picked from commit fe3f62d06b
in master.  Since this is already in master, and we're upstream,
set to DO NOT MERGE.

Change-Id: I09e8e849f642792e3a74e2564820ab9bbf1eb28c
Signed-off-by: Mike J. Chen <mjchen@google.com>
2013-01-17 17:58:18 -08:00
The Android Automerger 71e369e884 JDQ16 2013-01-16 16:42:11 -08:00
The Android Automerger 012b399bbf merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-16 16:41:17 -08:00
Scott Main 85ab41eb6b am fb959d01: am 474b3f11: am eb41035f: docs: add the ability to pause the carousel
* commit 'fb959d01d56e2d44e8833a8a9beca5ee5b04a24d':
  docs: add the ability to pause the carousel
2013-01-14 21:13:27 -08:00
Scott Main fb959d01d5 am 474b3f11: am eb41035f: docs: add the ability to pause the carousel
* commit '474b3f1198223b61f912c29d2e5c069dcfe322e0':
  docs: add the ability to pause the carousel
2013-01-14 21:10:48 -08:00
Scott Main 474b3f1198 am eb41035f: docs: add the ability to pause the carousel
* commit 'eb41035fcfe1c223a794a24ee2fe8a8b133e67b1':
  docs: add the ability to pause the carousel
2013-01-14 21:07:29 -08:00
Scott Main eb41035fcf docs: add the ability to pause the carousel
Change-Id: I1ffc929cf93217b578397d825e1eb41369d2666c
2013-01-14 20:47:40 -08:00
The Android Automerger 2cb5a36421 JDQ10 2013-01-10 11:57:20 -08:00
The Android Automerger baf217cce5 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-10 11:56:40 -08:00
The Android Automerger 4dc0571826 JDQ09 2013-01-09 15:48:26 -08:00
The Android Automerger 2cb0583163 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-09 15:47:20 -08:00
Scott Main 18ae42f3c8 am 468a239d: am 8d0a978a: am 869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '468a239d0cc522623f1896b3837092f629393292':
  docs: update analytics script to support event tracking
2013-01-08 18:59:29 -08:00
Scott Main 468a239d0c am 8d0a978a: am 869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '8d0a978aea9110bcb6f0d28e504ad1a9540acbe4':
  docs: update analytics script to support event tracking
2013-01-08 18:56:40 -08:00
Scott Main 8d0a978aea am 869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '869f3d1f68194b5962070394882b85f46a415c4c':
  docs: update analytics script to support event tracking
2013-01-08 18:49:51 -08:00
Scott Main 869f3d1f68 Merge "docs: update analytics script to support event tracking" into jb-mr1-dev 2013-01-08 18:47:45 -08:00
Scott Main ae3ee424e1 docs: update analytics script to support event tracking
Change-Id: Ie670a3ae91442ec734d146a76ecab254cb3572d4
2013-01-08 18:45:08 -08:00
Jean-Baptiste Queru 038908a736 am b81bc684: am 7a184cb7: Merge "Change Email2 reference back to Email"
* commit 'b81bc6842e6743e548a76a1c2f2ac59b4f080b10':
  Change Email2 reference back to Email
2013-01-08 08:17:19 -08:00
Jean-Baptiste Queru b81bc6842e am 7a184cb7: Merge "Change Email2 reference back to Email"
* commit '7a184cb70f7fbdf7f9f64b88338dcd155cfe1e3d':
  Change Email2 reference back to Email
2013-01-08 08:13:50 -08:00
Jean-Baptiste Queru 7a184cb70f Merge "Change Email2 reference back to Email" 2013-01-08 07:55:50 -08:00
Roger Chen 15df8356ec Change Email2 reference back to Email
Change-Id: Id07d81793d2921be95b30f608cc558312f210c4e
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
2013-01-08 21:48:41 +08:00
Ying Wang 71195ec71f am d01d0bf8: am 58a87c5c: Merge "core/Makefile: Allow specification of file locations"
* commit 'd01d0bf86c2309a7a950549c9c124b303c0c3f82':
  core/Makefile: Allow specification of file locations
2013-01-04 15:30:28 -08:00
Ying Wang d01d0bf86c am 58a87c5c: Merge "core/Makefile: Allow specification of file locations"
* commit '58a87c5c010e474a1e321d3fe6ce1ad8267576b5':
  core/Makefile: Allow specification of file locations
2013-01-04 15:28:20 -08:00
Ying Wang 58a87c5c01 Merge "core/Makefile: Allow specification of file locations" 2013-01-04 15:01:49 -08:00
Ying Wang a40166d11c am 5455455a: am a6f10400: am 7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit '5455455a3e550821b381d061803133c82956d7ec':
  Add simg2img and e2fsck to the otatools.
2013-01-04 15:01:18 -08:00
Ying Wang 5455455a3e am a6f10400: am 7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit 'a6f10400e16e80529e2dbbcd44742e55a99e0c3b':
  Add simg2img and e2fsck to the otatools.
2013-01-04 14:59:20 -08:00
Ying Wang a6f10400e1 am 7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit '7dc45a8bdc744db4d9c742dc21bfe328ad9ba10f':
  Add simg2img and e2fsck to the otatools.
2013-01-04 14:55:21 -08:00
Ying Wang 7dc45a8bdc Add simg2img and e2fsck to the otatools.
Change-Id: I31225399c6ef9cae38c825755e301fdc70ce194b
2013-01-04 14:43:18 -08:00
Andrew Boie fa61ff093e core/Makefile: Allow specification of file locations
If multiple build targets use a common recovery.fstab or system.prop,
this allows them to live in a centralized location and not be copied
or symlinked to the device directories.

Change-Id: I7aeb31ed9dc9b43a5e2c9e46fe582b10cba71b24
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2013-01-04 11:45:38 -08:00
Doug Zongker 96045fb584 am f09b7a0e: Merge "SignApk: perform the whole file signature in a single streaming pass."
* commit 'f09b7a0eaa0aa2ae6a1d0e1cf0f701f1f56e0cda':
  SignApk: perform the whole file signature in a single streaming pass.
2013-01-03 15:12:43 -08:00
Doug Zongker f09b7a0eaa Merge "SignApk: perform the whole file signature in a single streaming pass." 2013-01-03 14:50:36 -08:00
Koushik Dutta 29706d155a SignApk: perform the whole file signature in a single streaming pass.
Author: Koushik Dutta <koushd@gmail.com>

Change-Id: I58a68fa4bd4c0c3bb0e025d4311186195fb90e5a
2013-01-03 14:00:40 -08:00
Doug Zongker 2d867bd207 am 57a5e52d: Merge "add multiple key support to signapk"
* commit '57a5e52d3692b5f7e4008c8e6aa591aee67de130':
  add multiple key support to signapk
2013-01-02 14:45:12 -08:00
Doug Zongker 57a5e52d36 Merge "add multiple key support to signapk" 2013-01-02 13:49:02 -08:00
Doug Zongker b14c97621b add multiple key support to signapk
Support signing .apks (but not OTA packages) with multiple keys.

Bug: 7350459
Change-Id: I794e1da0555e2bb9247a59c756656d4ca7ee04cf
2013-01-02 13:31:00 -08:00
Andrew Hsieh dd319cef3f am 26f47aba: Merge "Switch to GCC 4.7 for X86 and MIPS"
* commit '26f47aba2d973bc1cc459a63df7bd0eec799f4ff':
  Switch to GCC 4.7 for X86 and MIPS
2012-12-21 15:51:44 -08:00
Andrew Hsieh 26f47aba2d Merge "Switch to GCC 4.7 for X86 and MIPS" 2012-12-21 15:43:56 -08:00
The Android Open Source Project f631572908 Reconcile with jb-mr1.1-release - do not merge
Change-Id: Iff920fa574533c1c22a8c1408291f43e81ab7a2f
2012-12-21 14:10:50 -08:00
The Android Automerger 5a6a0faa2a JDP82 2012-12-21 13:47:17 -08:00