Commit Graph

13358 Commits

Author SHA1 Message Date
Jeff Brown
ae859f9b64 Split framework jar.
Change-Id: I38c68ac169a4ea10e4640b5d8e24298a6caaf441
2013-07-17 21:08:18 -07:00
Brian Carlstrom
0a2c858bb6 Merge "Add LOCAL_ADDITIONAL_DEPENDENCIES support to BUILD_PHONY_PACKAGE" 2013-07-16 21:16:00 +00:00
Jeff Sharkey
87ff6c2132 Merge "Add packages to support OPEN/CREATE_DOC." 2013-07-16 20:54:52 +00:00
Jeff Sharkey
680435898a Add packages to support OPEN/CREATE_DOC.
Change-Id: Id9314b2ed03d6ce7cc98c051a7654c225b393954
2013-07-16 13:00:13 -07:00
The Android Open Source Project
a592b76184 am eed1a599: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit 'eed1a599f03dd5da3cd449ce21c7767770ebb29d':
  JSS15B
2013-07-16 11:20:54 -07:00
The Android Open Source Project
eed1a599f0 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I8a36562b71e8ca51a52e9e893f3fb302ea414f24
2013-07-16 11:19:11 -07:00
The Android Automerger
2460df9115 JSS15B 2013-07-15 20:56:09 -07:00
Brian Carlstrom
8abff76d8f Add LOCAL_ADDITIONAL_DEPENDENCIES support to BUILD_PHONY_PACKAGE
Change-Id: I0211600ebb554b55f3823a4cb3d119b95cb49733
2013-07-15 16:44:26 -07:00
Jeff Brown
bc3fe33c24 Remove old system server binaries that are no longer needed.
Change-Id: I76a56ee786decce9729f8f93244bdd04cbad4877
2013-07-15 15:08:37 -07:00
Jeff Brown
a114a87e70 Add inputflinger to build.
Change-Id: I4ae22cda74603c7cdcf09b9f63b31616b1f8e345
2013-07-15 15:08:37 -07:00
Scott Main
6fa4910941 am 5951d1ea: am d67d0227: Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev
* commit '5951d1ea0d7a85da510eb06f8b73e62113ef800a':
  fix design/develop boxes float
  add style to add nexus 4 frame to screenshots
2013-07-15 14:22:59 -07:00
Scott Main
5951d1ea0d am d67d0227: Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev
* commit 'd67d02274da846184449ac02aba7eafdcba889b1':
  fix design/develop boxes float
  add style to add nexus 4 frame to screenshots
2013-07-15 14:21:00 -07:00
Scott Main
d67d02274d Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev
* changes:
  fix design/develop boxes float
  add style to add nexus 4 frame to screenshots
2013-07-15 21:15:26 +00:00
The Android Open Source Project
445505f1d0 am ccf2f3dd: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit 'ccf2f3dd142d0ad973d913990a358d7fc6af2a8d':
  "JSS15"
2013-07-15 09:34:24 -07:00
The Android Open Source Project
ccf2f3dd14 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I2c1659dba0eea86a4a76ee410608febbae466ef2
2013-07-15 09:32:27 -07:00
Ying Wang
56eecebc7f am 6e9151b1: am 988251c9: Fix error.
* commit '6e9151b1a7e035936cf671c83cf25fe7351e3c06':
  Fix $(so_suffix) error.
2013-07-15 09:04:42 -07:00
Ying Wang
6e9151b1a7 am 988251c9: Fix error.
* commit '988251c92269676c891dcb548fecdc100755b431':
  Fix $(so_suffix) error.
2013-07-15 09:01:59 -07:00
Ying Wang
988251c922 Fix $(so_suffix) error.
Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
(cherry picked from commit 80b71fa326)
2013-07-15 15:57:25 +00:00
Ying Wang
15989bd389 Merge "Fix $(so_suffix) error." 2013-07-15 15:49:10 +00:00
Ying Wang
80b71fa326 Fix $(so_suffix) error.
Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
2013-07-15 08:47:33 -07:00
The Android Automerger
566c698fe7 "JSS15" 2013-07-15 08:19:51 -07:00
The Android Automerger
3396411053 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-15 08:18:59 -07:00
The Android Open Source Project
491450facb am 8c20de34: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '8c20de34bd3302b6a594b33afab4ff90303a5dde':
  "JSS11I"
  "JSS11H"
  "JSS11G"
2013-07-15 07:36:54 -07:00
The Android Open Source Project
8c20de34bd Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id93477c002befa42eda6aafe3a71323e28ca8ab0
2013-07-15 07:35:31 -07:00
The Android Automerger
dff14e56cd "JSS11I" 2013-07-13 00:53:18 -07:00
Ying Wang
06fdc62132 am 3aa8eb68: am ba9636d4: Establish the built module dependencies on prebuilt shared library
* commit '3aa8eb6810e523f6056da58079f65e5fbcd628d0':
  Establish the built module dependencies on prebuilt shared library
2013-07-12 22:37:34 -07:00
Ying Wang
3aa8eb6810 am ba9636d4: Establish the built module dependencies on prebuilt shared library
* commit 'ba9636d47fdc91c4caca6c9e0ad618956ddbb98b':
  Establish the built module dependencies on prebuilt shared library
2013-07-12 22:34:46 -07:00
Ying Wang
ba9636d47f Establish the built module dependencies on prebuilt shared library
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.

Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
(cherry picked from commit ada8f29657)
2013-07-13 05:31:11 +00:00
Ying Wang
e05e444f6b Merge "Establish the built module dependencies on prebuilt shared library" 2013-07-13 05:10:32 +00:00
Ying Wang
ada8f29657 Establish the built module dependencies on prebuilt shared library
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.

Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
2013-07-12 22:05:14 -07:00
Nick Kralevich
c5e460b356 am 4e76f806: am a682f6db: am 4e132ca5: Merge "emulator: increase system partition to 550M"
* commit '4e76f806d49c0b4e7fa31653555a5a16713a8778':
  emulator: increase system partition to 550M
2013-07-12 20:48:32 -07:00
Nick Kralevich
4e76f806d4 am a682f6db: am 4e132ca5: Merge "emulator: increase system partition to 550M"
* commit 'a682f6db7b3e1259ce4abc829bd6763850565494':
  emulator: increase system partition to 550M
2013-07-12 20:46:51 -07:00
Nick Kralevich
a682f6db7b am 4e132ca5: Merge "emulator: increase system partition to 550M"
* commit '4e132ca5e5c5048d7a95563eddd9f5ef11346678':
  emulator: increase system partition to 550M
2013-07-12 20:44:41 -07:00
Nick Kralevich
4e132ca5e5 Merge "emulator: increase system partition to 550M" 2013-07-13 03:42:05 +00:00
Nick Kralevich
865ffd4efe emulator: increase system partition to 550M
Yes, 400M isn't enough. I can't believe it either.

Change-Id: I7d3857f04bfda472af6a281017204672bb9c9940
2013-07-12 20:28:59 -07:00
Scott Main
e80ddbe976 fix design/develop boxes float
Change-Id: Id6de3e74667f5cc485290509919e0f5cce689505
2013-07-12 19:22:24 -07:00
The Android Automerger
11622182a2 "JSS11H" 2013-07-12 18:49:06 -07:00
The Android Automerger
1adb5ed7e9 "JSS11G" 2013-07-12 17:10:48 -07:00
Nick Kralevich
265b8866cc am 38437bad: am e9ee5e11: am 5411ef9c: Merge "emulator: increase system partition size to 400M"
* commit '38437bade23ff6fc5fe5c30dacebc178c56d47ba':
  emulator: increase system partition size to 400M
2013-07-12 15:20:30 -07:00
Nick Kralevich
38437bade2 am e9ee5e11: am 5411ef9c: Merge "emulator: increase system partition size to 400M"
* commit 'e9ee5e11b499f5be72b365585001e310b776d698':
  emulator: increase system partition size to 400M
2013-07-12 15:17:20 -07:00
Nick Kralevich
e9ee5e11b4 am 5411ef9c: Merge "emulator: increase system partition size to 400M"
* commit '5411ef9cc4a4bf5c1950df89f2b2032edcf83dc8':
  emulator: increase system partition size to 400M
2013-07-12 15:15:33 -07:00
Nick Kralevich
5411ef9cc4 Merge "emulator: increase system partition size to 400M" 2013-07-12 22:14:02 +00:00
The Android Open Source Project
be5ffb8e10 am 29b708aa: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '29b708aac70b694879d4867e1943926716a08fea':
  JSS11F
  "JSS11E"
2013-07-12 14:55:01 -07:00
The Android Open Source Project
29b708aac7 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I2025eb92f81ab9ce86e3f894f3e25eb5ca4266ec
2013-07-12 14:52:07 -07:00
Nick Kralevich
de2709baac emulator: increase system partition size to 400M
300M is too small.

Change-Id: Icbe4e76d6e5c8a50cc6e6d74e324335bc66b8466
2013-07-12 13:44:48 -07:00
The Android Automerger
7712d0ca94 JSS11F 2013-07-12 12:19:57 -07:00
Ying Wang
7600917dac am 263359df: am 6685bd01: am 2476ec99: Merge "use ext4 instead of yaffs for the emulator"
* commit '263359df4399e86a26a70711b8004b54c8fe44b0':
  use ext4 instead of yaffs for the emulator
2013-07-12 11:14:28 -07:00
Ying Wang
263359df43 am 6685bd01: am 2476ec99: Merge "use ext4 instead of yaffs for the emulator"
* commit '6685bd01a953a550f0cebe342e9a1125adffd6b3':
  use ext4 instead of yaffs for the emulator
2013-07-12 11:12:49 -07:00
Ying Wang
6685bd01a9 am 2476ec99: Merge "use ext4 instead of yaffs for the emulator"
* commit '2476ec994d449d31c89571723b4b17826639c1bf':
  use ext4 instead of yaffs for the emulator
2013-07-12 11:11:56 -07:00
Ying Wang
2476ec994d Merge "use ext4 instead of yaffs for the emulator" 2013-07-12 18:10:13 +00:00