OSDN Git Service
keunyoung [Mon, 22 Jul 2013 21:54:58 +0000 (14:54 -0700)]
add PDK_PLATFORM_ZIP_PRODUCT_BINARIES to allow adding product specific binaries to platform.zip
- This can be used to deliver stuffs like kernel symbol file.
- Files are added in relative path from the top of android source tree.
- PDK_PLATFORM_ZIP_PRODUCT_BINARIES will be defined in BoardConfig.mk.
- files under out dir will be rejected to prevent possible conflicts.
bug:
9963432
Change-Id: Id1da643534cd86939df4941f39e4414d343bba99
The Android Open Source Project [Mon, 22 Jul 2013 15:01:58 +0000 (08:01 -0700)]
am
90a4ac4c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
90a4ac4c1eafd897800c72fa8c732f97ffa95d28':
"JSS15J"
The Android Open Source Project [Mon, 22 Jul 2013 14:59:15 +0000 (07:59 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I6f1b8561853187e3a82f0da2e428188c10e64807
The Android Automerger [Sun, 21 Jul 2013 17:20:19 +0000 (10:20 -0700)]
"JSS15J"
The Android Open Source Project [Sun, 21 Jul 2013 01:26:47 +0000 (18:26 -0700)]
am
62eda460: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
62eda460c411b21dce28b8ea6a9ee9245d896dd5':
"JSS15I"
The Android Open Source Project [Sun, 21 Jul 2013 01:25:23 +0000 (18:25 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I68646ef2af902737659f0874fc2bb17612747c3a
The Android Automerger [Sat, 20 Jul 2013 22:27:46 +0000 (15:27 -0700)]
"JSS15I"
The Android Open Source Project [Fri, 19 Jul 2013 23:02:26 +0000 (16:02 -0700)]
am
7017cfe1: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
7017cfe124721cadd3315a0a5700c83545916673':
"JSS15H"
"JSS15G"
JSS15F
"JSS15E"
"JSS15D"
"JSS15C"
Scott Main [Fri, 19 Jul 2013 22:48:46 +0000 (15:48 -0700)]
am
3497ef57: am
98a2a71f: edit code-caption style margin
* commit '
3497ef575318aafbe06387a474ae6d5152fae82f':
edit code-caption style margin
Ying Wang [Fri, 19 Jul 2013 21:37:25 +0000 (14:37 -0700)]
Add framework2 to the java pdk package.
To fix pdk fusion build.
Change-Id: I5989f38e48614faa742f8362bde841fe084d9c13
The Android Open Source Project [Fri, 19 Jul 2013 21:20:21 +0000 (14:20 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id68bc43f09ff7d7aa7f48ed9cdca06e14aea4c9c
Scott Main [Fri, 19 Jul 2013 20:42:42 +0000 (13:42 -0700)]
am
98a2a71f: edit code-caption style margin
* commit '
98a2a71f9ee7ea7e347c686ce89d4d4a3b0fba5b':
edit code-caption style margin
The Android Automerger [Fri, 19 Jul 2013 10:17:16 +0000 (03:17 -0700)]
"JSS15H"
The Android Automerger [Fri, 19 Jul 2013 03:48:00 +0000 (20:48 -0700)]
"JSS15G"
Amith Yamasani [Fri, 19 Jul 2013 01:48:32 +0000 (18:48 -0700)]
Clean generated java files since framework intermediates has partially moved.
Change-Id: I89dea945e1c931e26985a6af7bf54ede93d2ee33
Nick Kralevich [Thu, 18 Jul 2013 22:25:58 +0000 (22:25 +0000)]
Merge "Update OTA to understand SELinux filesystem labels"
Jeff Brown [Thu, 18 Jul 2013 22:12:37 +0000 (22:12 +0000)]
Merge "Split framework jar."
Nick Kralevich [Thu, 18 Jul 2013 00:43:09 +0000 (17:43 -0700)]
Update OTA to understand SELinux filesystem labels
Make fs_config aware of SELinux contexts, and output the context
whenever we output the UID / GID / file perms.
Pass the selinux context to the set_perm2() and set_perm2_recursive()
calls. When the OTA script fixes up filesystem permissions, it will
also fix up the SELinux context on the files.
Bug:
8985290
Change-Id: I6419b64c06309a93ac6b2f2cf9fc7f8815adeaf3
The Android Automerger [Thu, 18 Jul 2013 20:53:12 +0000 (13:53 -0700)]
JSS15F
The Android Automerger [Thu, 18 Jul 2013 18:25:20 +0000 (11:25 -0700)]
"JSS15E"
Ying Wang [Thu, 18 Jul 2013 17:07:09 +0000 (10:07 -0700)]
am
8bb3306b: am
a1f8cdf7: Merge "Allow several system property files"
* commit '
8bb3306b76bf3a20fc0f0634a492c5c18550c8e3':
Allow several system property files
Ying Wang [Thu, 18 Jul 2013 17:02:45 +0000 (10:02 -0700)]
am
a1f8cdf7: Merge "Allow several system property files"
* commit '
a1f8cdf74bcc35110bd306d633e019a6279fc7fe':
Allow several system property files
Ying Wang [Thu, 18 Jul 2013 17:00:19 +0000 (17:00 +0000)]
Merge "Allow several system property files"
Jeff Brown [Thu, 18 Jul 2013 03:29:51 +0000 (20:29 -0700)]
Split framework jar.
Change-Id: I38c68ac169a4ea10e4640b5d8e24298a6caaf441
The Android Automerger [Wed, 17 Jul 2013 21:59:40 +0000 (14:59 -0700)]
"JSS15D"
Scott Main [Wed, 17 Jul 2013 20:15:04 +0000 (13:15 -0700)]
edit code-caption style margin
Change-Id: I63c58015ca9037621c5d4c3929620ebd2203f5ad
The Android Automerger [Tue, 16 Jul 2013 22:26:08 +0000 (15:26 -0700)]
"JSS15C"
Brian Carlstrom [Tue, 16 Jul 2013 21:16:00 +0000 (21:16 +0000)]
Merge "Add LOCAL_ADDITIONAL_DEPENDENCIES support to BUILD_PHONY_PACKAGE"
Jeff Sharkey [Tue, 16 Jul 2013 20:54:52 +0000 (20:54 +0000)]
Merge "Add packages to support OPEN/CREATE_DOC."
Jeff Sharkey [Tue, 16 Jul 2013 20:00:13 +0000 (13:00 -0700)]
Add packages to support OPEN/CREATE_DOC.
Change-Id: Id9314b2ed03d6ce7cc98c051a7654c225b393954
The Android Open Source Project [Tue, 16 Jul 2013 18:20:54 +0000 (11:20 -0700)]
am
eed1a599: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
eed1a599f03dd5da3cd449ce21c7767770ebb29d':
JSS15B
The Android Open Source Project [Tue, 16 Jul 2013 18:19:11 +0000 (11:19 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I8a36562b71e8ca51a52e9e893f3fb302ea414f24
Johan Redestig [Thu, 12 Apr 2012 15:00:58 +0000 (17:00 +0200)]
Allow several system property files
TARGET_SYSTEM_PROP now is a list of files and all of them
are included in the build.prop.
Change-Id: I494f86412b0a299ee4c066e49ab4f4686bc2178a
The Android Automerger [Tue, 16 Jul 2013 03:56:09 +0000 (20:56 -0700)]
JSS15B
Brian Carlstrom [Mon, 15 Jul 2013 23:44:26 +0000 (16:44 -0700)]
Add LOCAL_ADDITIONAL_DEPENDENCIES support to BUILD_PHONY_PACKAGE
Change-Id: I0211600ebb554b55f3823a4cb3d119b95cb49733
Jeff Brown [Mon, 15 Jul 2013 20:25:20 +0000 (13:25 -0700)]
Remove old system server binaries that are no longer needed.
Change-Id: I76a56ee786decce9729f8f93244bdd04cbad4877
Jeff Brown [Fri, 12 Jul 2013 23:52:38 +0000 (16:52 -0700)]
Add inputflinger to build.
Change-Id: I4ae22cda74603c7cdcf09b9f63b31616b1f8e345
Scott Main [Mon, 15 Jul 2013 21:22:59 +0000 (14:22 -0700)]
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
Scott Main [Mon, 15 Jul 2013 21:21:00 +0000 (14:21 -0700)]
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
Scott Main [Mon, 15 Jul 2013 21:15:25 +0000 (21:15 +0000)]
Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev
* changes:
fix design/develop boxes float
add style to add nexus 4 frame to screenshots
The Android Open Source Project [Mon, 15 Jul 2013 16:34:24 +0000 (09:34 -0700)]
am
ccf2f3dd: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
ccf2f3dd142d0ad973d913990a358d7fc6af2a8d':
"JSS15"
The Android Open Source Project [Mon, 15 Jul 2013 16:32:27 +0000 (09:32 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I2c1659dba0eea86a4a76ee410608febbae466ef2
Ying Wang [Mon, 15 Jul 2013 16:04:42 +0000 (09:04 -0700)]
am
6e9151b1: am
988251c9: Fix error.
* commit '
6e9151b1a7e035936cf671c83cf25fe7351e3c06':
Fix $(so_suffix) error.
Ying Wang [Mon, 15 Jul 2013 16:01:59 +0000 (09:01 -0700)]
am
988251c9: Fix error.
* commit '
988251c92269676c891dcb548fecdc100755b431':
Fix $(so_suffix) error.
Ying Wang [Mon, 15 Jul 2013 15:47:33 +0000 (08:47 -0700)]
Fix $(so_suffix) error.
Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
(cherry picked from commit
80b71fa326e4b5d9510d528c8feb08e28376a350)
Ying Wang [Mon, 15 Jul 2013 15:49:09 +0000 (15:49 +0000)]
Merge "Fix $(so_suffix) error."
Ying Wang [Mon, 15 Jul 2013 15:47:33 +0000 (08:47 -0700)]
Fix $(so_suffix) error.
Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
The Android Automerger [Mon, 15 Jul 2013 15:19:51 +0000 (08:19 -0700)]
"JSS15"
The Android Automerger [Mon, 15 Jul 2013 15:18:59 +0000 (08:18 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Mon, 15 Jul 2013 14:36:54 +0000 (07:36 -0700)]
am
8c20de34: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
8c20de34bd3302b6a594b33afab4ff90303a5dde':
"JSS11I"
"JSS11H"
"JSS11G"
The Android Open Source Project [Mon, 15 Jul 2013 14:35:31 +0000 (07:35 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id93477c002befa42eda6aafe3a71323e28ca8ab0
The Android Automerger [Sat, 13 Jul 2013 07:53:18 +0000 (00:53 -0700)]
"JSS11I"
Ying Wang [Sat, 13 Jul 2013 05:37:34 +0000 (22:37 -0700)]
am
3aa8eb68: am
ba9636d4: Establish the built module dependencies on prebuilt shared library
* commit '
3aa8eb6810e523f6056da58079f65e5fbcd628d0':
Establish the built module dependencies on prebuilt shared library
Ying Wang [Sat, 13 Jul 2013 05:34:46 +0000 (22:34 -0700)]
am
ba9636d4: Establish the built module dependencies on prebuilt shared library
* commit '
ba9636d47fdc91c4caca6c9e0ad618956ddbb98b':
Establish the built module dependencies on prebuilt shared library
Ying Wang [Sat, 13 Jul 2013 05:05:14 +0000 (22:05 -0700)]
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
ada8f296570e0bda93b433a7aa86ad138dd1705e)
Ying Wang [Sat, 13 Jul 2013 05:10:32 +0000 (05:10 +0000)]
Merge "Establish the built module dependencies on prebuilt shared library"
Ying Wang [Sat, 13 Jul 2013 05:05:14 +0000 (22:05 -0700)]
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
Nick Kralevich [Sat, 13 Jul 2013 03:48:32 +0000 (20:48 -0700)]
am
4e76f806: am
a682f6db: am
4e132ca5: Merge "emulator: increase system partition to 550M"
* commit '
4e76f806d49c0b4e7fa31653555a5a16713a8778':
emulator: increase system partition to 550M
Nick Kralevich [Sat, 13 Jul 2013 03:46:51 +0000 (20:46 -0700)]
am
a682f6db: am
4e132ca5: Merge "emulator: increase system partition to 550M"
* commit '
a682f6db7b3e1259ce4abc829bd6763850565494':
emulator: increase system partition to 550M
Nick Kralevich [Sat, 13 Jul 2013 03:44:41 +0000 (20:44 -0700)]
am
4e132ca5: Merge "emulator: increase system partition to 550M"
* commit '
4e132ca5e5c5048d7a95563eddd9f5ef11346678':
emulator: increase system partition to 550M
Nick Kralevich [Sat, 13 Jul 2013 03:42:05 +0000 (03:42 +0000)]
Merge "emulator: increase system partition to 550M"
Nick Kralevich [Sat, 13 Jul 2013 03:28:59 +0000 (20:28 -0700)]
emulator: increase system partition to 550M
Yes, 400M isn't enough. I can't believe it either.
Change-Id: I7d3857f04bfda472af6a281017204672bb9c9940
Scott Main [Sat, 13 Jul 2013 02:22:24 +0000 (19:22 -0700)]
fix design/develop boxes float
Change-Id: Id6de3e74667f5cc485290509919e0f5cce689505
The Android Automerger [Sat, 13 Jul 2013 01:49:06 +0000 (18:49 -0700)]
"JSS11H"
The Android Automerger [Sat, 13 Jul 2013 00:10:48 +0000 (17:10 -0700)]
"JSS11G"
Nick Kralevich [Fri, 12 Jul 2013 22:20:30 +0000 (15:20 -0700)]
am
38437bad: am
e9ee5e11: am
5411ef9c: Merge "emulator: increase system partition size to 400M"
* commit '
38437bade23ff6fc5fe5c30dacebc178c56d47ba':
emulator: increase system partition size to 400M
Nick Kralevich [Fri, 12 Jul 2013 22:17:20 +0000 (15:17 -0700)]
am
e9ee5e11: am
5411ef9c: Merge "emulator: increase system partition size to 400M"
* commit '
e9ee5e11b499f5be72b365585001e310b776d698':
emulator: increase system partition size to 400M
Nick Kralevich [Fri, 12 Jul 2013 22:15:33 +0000 (15:15 -0700)]
am
5411ef9c: Merge "emulator: increase system partition size to 400M"
* commit '
5411ef9cc4a4bf5c1950df89f2b2032edcf83dc8':
emulator: increase system partition size to 400M
Nick Kralevich [Fri, 12 Jul 2013 22:14:02 +0000 (22:14 +0000)]
Merge "emulator: increase system partition size to 400M"
The Android Open Source Project [Fri, 12 Jul 2013 21:55:01 +0000 (14:55 -0700)]
am
29b708aa: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
29b708aac70b694879d4867e1943926716a08fea':
JSS11F
"JSS11E"
The Android Open Source Project [Fri, 12 Jul 2013 21:52:07 +0000 (14:52 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I2025eb92f81ab9ce86e3f894f3e25eb5ca4266ec
Nick Kralevich [Fri, 12 Jul 2013 20:44:48 +0000 (13:44 -0700)]
emulator: increase system partition size to 400M
300M is too small.
Change-Id: Icbe4e76d6e5c8a50cc6e6d74e324335bc66b8466
The Android Automerger [Fri, 12 Jul 2013 19:19:57 +0000 (12:19 -0700)]
JSS11F
Ying Wang [Fri, 12 Jul 2013 18:14:28 +0000 (11:14 -0700)]
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
Ying Wang [Fri, 12 Jul 2013 18:12:49 +0000 (11:12 -0700)]
am
6685bd01: am
2476ec99: Merge "use ext4 instead of yaffs for the emulator"
* commit '
6685bd01a953a550f0cebe342e9a1125adffd6b3':
use ext4 instead of yaffs for the emulator
Ying Wang [Fri, 12 Jul 2013 18:11:56 +0000 (11:11 -0700)]
am
2476ec99: Merge "use ext4 instead of yaffs for the emulator"
* commit '
2476ec994d449d31c89571723b4b17826639c1bf':
use ext4 instead of yaffs for the emulator
Ying Wang [Fri, 12 Jul 2013 18:10:13 +0000 (18:10 +0000)]
Merge "use ext4 instead of yaffs for the emulator"
The Android Automerger [Fri, 12 Jul 2013 17:53:23 +0000 (10:53 -0700)]
"JSS11E"
JP Abgrall [Fri, 12 Jul 2013 17:08:09 +0000 (17:08 +0000)]
Merge "core: don't hardcode "out" during findleaves.py invocations."
The Android Open Source Project [Fri, 12 Jul 2013 14:30:00 +0000 (07:30 -0700)]
am
76be17de: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
76be17de7a7fc811da0145252855802d06d55367':
"JSS11D"
JSS11C
"JSS11B"
The Android Open Source Project [Fri, 12 Jul 2013 14:27:32 +0000 (07:27 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I5f92acba878b1d0f149df1499cc09f3cda23f7e3
Nick Kralevich [Wed, 10 Jul 2013 01:04:51 +0000 (18:04 -0700)]
use ext4 instead of yaffs for the emulator
Bug: https://code.google.com/p/android/issues/detail?id=38561
Change-Id: I7c605457b485d169654263caf55eb7d5a9a60c2e
The Android Automerger [Fri, 12 Jul 2013 03:26:53 +0000 (20:26 -0700)]
"JSS11D"
JP Abgrall [Fri, 12 Jul 2013 02:08:06 +0000 (19:08 -0700)]
core: don't hardcode "out" during findleaves.py invocations.
"out" can be $OUT_DIR
Bug:
7183057
Change-Id: I7b52d40de4398f481e47f6d6d719fb550d874f73
Ying Wang [Fri, 12 Jul 2013 02:01:44 +0000 (19:01 -0700)]
am
032ad054: am
a1b948af: am
cbeb6e81: Merge "Include ping6 in all device builds"
* commit '
032ad0542b395d1277b634b1243f36ae2100eb16':
Include ping6 in all device builds
Ying Wang [Fri, 12 Jul 2013 01:56:02 +0000 (18:56 -0700)]
am
a1b948af: am
cbeb6e81: Merge "Include ping6 in all device builds"
* commit '
a1b948afdb5a46e168cf59ea4045b63722ee8b47':
Include ping6 in all device builds
Ying Wang [Fri, 12 Jul 2013 01:52:19 +0000 (18:52 -0700)]
am
cbeb6e81: Merge "Include ping6 in all device builds"
* commit '
cbeb6e81fe8faaa1c138ebe213d2b6e7fb0ad251':
Include ping6 in all device builds
The Android Automerger [Fri, 12 Jul 2013 01:41:43 +0000 (18:41 -0700)]
JSS11C
The Android Automerger [Fri, 12 Jul 2013 00:12:16 +0000 (17:12 -0700)]
"JSS11B"
Ying Wang [Thu, 11 Jul 2013 19:08:48 +0000 (19:08 +0000)]
Merge "Include ping6 in all device builds"
The Android Open Source Project [Thu, 11 Jul 2013 18:49:43 +0000 (11:49 -0700)]
am
d8d0c17e: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
d8d0c17e22f42597497e8f9f5c134621e399e22a':
"JSS11"
"JWR66V"
The Android Open Source Project [Thu, 11 Jul 2013 17:17:26 +0000 (10:17 -0700)]
am
7c8042a3: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
7c8042a39858bc42e3eb5ede616acbee7e8a3f06':
"JSS10"
The Android Open Source Project [Thu, 11 Jul 2013 17:17:05 +0000 (10:17 -0700)]
am
4d9f13dd: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
4d9f13dd0fcefad9ce2e27f3b48bc0e4ba3fb9b1':
"JSS09B"
JWR66U
Jeff Brown [Thu, 11 Jul 2013 17:17:00 +0000 (10:17 -0700)]
am
9d80f708: am
a3d60ae8: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
* commit '
9d80f7085707abd8f088c4f0c4d66cd666a6feb0':
Revert "Remove mediarouter v7 support library from SDK."
The Android Open Source Project [Thu, 11 Jul 2013 15:22:27 +0000 (08:22 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I5a556ab5d8ad80eb8bbff59784ea6bd1c23f7448
The Android Open Source Project [Thu, 11 Jul 2013 15:08:03 +0000 (08:08 -0700)]
am
93351ede: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
93351edefa033cade3c8f06729a1b2a73f70e18b':
"JSS09"
The Android Automerger [Thu, 11 Jul 2013 12:56:15 +0000 (05:56 -0700)]
"JSS11"
The Android Automerger [Thu, 11 Jul 2013 12:55:09 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Lorenzo Colitti [Thu, 11 Jul 2013 03:54:05 +0000 (12:54 +0900)]
Include ping6 in all device builds
ping6 is currently only included in debug builds. Include it
everywhere, now that it doesn't need to be setuid any more.
Bug:
9469682
Change-Id: Ia78f6b0e5fc8f7042fb99cdb4a0add426bb56c7e
The Android Automerger [Thu, 11 Jul 2013 01:34:56 +0000 (18:34 -0700)]
"JWR66V"