OSDN Git Service
The Android Automerger [Sat, 27 Jul 2013 16:51:58 +0000 (09:51 -0700)]
"KRS25D"
keunyoung [Fri, 26 Jul 2013 01:20:09 +0000 (18:20 -0700)]
fix build
- PDK_FUSION_OUT_DIR was null inside macro, lead into missing copy
bug:
10023069
Change-Id: I323d2fb6a2e955f9a7c27559701a7af36a89fea8
The Android Automerger [Fri, 26 Jul 2013 22:22:00 +0000 (15:22 -0700)]
"KRS25C"
The Android Automerger [Fri, 26 Jul 2013 00:09:39 +0000 (17:09 -0700)]
"KRS25B"
The Android Automerger [Thu, 25 Jul 2013 13:03:14 +0000 (06:03 -0700)]
"KRS25"
The Android Automerger [Thu, 25 Jul 2013 13:00:27 +0000 (06:00 -0700)]
merge in klp-release history after reset to master
Ben Murdoch [Thu, 25 Jul 2013 10:44:53 +0000 (11:44 +0100)]
Revert "Allow proto builds to pass in java proto params."
This reverts commit
28b46fc16c026365378909f1cc88fad0d3b2395c.
Speculative fix for master builds. I cannot repro the break the bots
are seeing locally, but it seems related to building protobufs and this
CL was in the first broken build.
Ulas Kirazci [Thu, 25 Jul 2013 07:47:09 +0000 (00:47 -0700)]
am
6a5fc54f: am
a825aa13: Merge "Allow proto builds to pass in java proto params."
* commit '
6a5fc54fe9904214a7df1d34c9d48ad0310d867e':
Allow proto builds to pass in java proto params.
Ying Wang [Thu, 25 Jul 2013 07:47:08 +0000 (00:47 -0700)]
am
6f9c87ed: am
45339b01: Merge "Use consistent search depth."
* commit '
6f9c87ede60c52a42b107fa5fb06e0f2f654ca9f':
Use consistent search depth.
Ulas Kirazci [Thu, 25 Jul 2013 07:44:07 +0000 (00:44 -0700)]
am
a825aa13: Merge "Allow proto builds to pass in java proto params."
* commit '
a825aa1329cbf28e23a9f7d96dbbe16f3f7ef9db':
Allow proto builds to pass in java proto params.
Ying Wang [Thu, 25 Jul 2013 07:44:07 +0000 (00:44 -0700)]
am
45339b01: Merge "Use consistent search depth."
* commit '
45339b01d61586aa46c4ca98b37e320879fac050':
Use consistent search depth.
Ulas Kirazci [Thu, 25 Jul 2013 03:04:10 +0000 (03:04 +0000)]
Merge "Allow proto builds to pass in java proto params."
Ying Wang [Thu, 25 Jul 2013 01:54:44 +0000 (01:54 +0000)]
Merge "Use consistent search depth."
Ulas Kirazci [Wed, 24 Jul 2013 21:32:14 +0000 (14:32 -0700)]
Allow proto builds to pass in java proto params.
Also source files which have dependencies need to be bundled together
(at least the way the build system is set up now). Move
--proto_path=$(TOP) to the end so that it does not take precedence
over user-supplied --proto_path flags.
Change-Id: Ia532647fe8811d39230a23ba3671685b0388cbe0
The Android Automerger [Wed, 24 Jul 2013 23:52:40 +0000 (16:52 -0700)]
"KRS24B"
Scott Main [Wed, 24 Jul 2013 23:27:49 +0000 (16:27 -0700)]
am
c5b665ad: am
0ce71df0: Merge "remove renderscript support lib from javadocs" into jb-mr2-ub-dev
* commit '
c5b665addf7f6a6ca7225b8f75bf419ada2ce74c':
remove renderscript support lib from javadocs
Scott Main [Wed, 24 Jul 2013 23:27:48 +0000 (16:27 -0700)]
am
1a980beb: am
5430d20d: fix the api level filter (wasn\'t greying out APIs on page load)
* commit '
1a980bebd48940688ae078e29f46b174a8c92e99':
fix the api level filter (wasn't greying out APIs on page load)
Scott Main [Wed, 24 Jul 2013 23:20:04 +0000 (16:20 -0700)]
am
0ce71df0: Merge "remove renderscript support lib from javadocs" into jb-mr2-ub-dev
* commit '
0ce71df0fccdb10c36823307fad7a71c7cd4d4d4':
remove renderscript support lib from javadocs
Scott Main [Wed, 24 Jul 2013 23:20:02 +0000 (16:20 -0700)]
am
5430d20d: fix the api level filter (wasn\'t greying out APIs on page load)
* commit '
5430d20ddae54212a23325579f8de813f733db9a':
fix the api level filter (wasn't greying out APIs on page load)
Keun-young Park [Wed, 24 Jul 2013 22:06:49 +0000 (22:06 +0000)]
Merge "Fix issue with DEBUG_OUT_DIR not properly selected"
Tom Cherry [Fri, 15 Jun 2012 00:33:38 +0000 (17:33 -0700)]
Fix issue with DEBUG_OUT_DIR not properly selected
- patch from NVDIA
bug:
9968564
Change-Id: I2082f989d75fb168fb42947d723de093beff4ff1
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Simone Willett <swillett@nvidia.com>
The Android Automerger [Wed, 24 Jul 2013 13:04:13 +0000 (06:04 -0700)]
"KRS24"
The Android Automerger [Wed, 24 Jul 2013 13:00:58 +0000 (06:00 -0700)]
merge in klp-release history after reset to master
Scott Main [Wed, 24 Jul 2013 04:03:20 +0000 (04:03 +0000)]
Merge "remove renderscript support lib from javadocs" into jb-mr2-ub-dev
Scott Main [Wed, 24 Jul 2013 04:00:50 +0000 (21:00 -0700)]
remove renderscript support lib from javadocs
Change-Id: I6b06bdcdae79442dbf471816cd1cf6f90873f1b2
Scott Main [Wed, 24 Jul 2013 03:48:54 +0000 (20:48 -0700)]
fix the api level filter (wasn't greying out APIs on page load)
Change-Id: Iaafe8c0652856eaff6725491f21581969e94f430
The Android Automerger [Wed, 24 Jul 2013 00:07:20 +0000 (17:07 -0700)]
"KRS23B"
Brian Carlstrom [Tue, 23 Jul 2013 21:22:00 +0000 (14:22 -0700)]
Enable runtime_libart on darwin.
Change-Id: I0499bb387af827379fa4bb5e71a9770a89093c53
Scott Main [Tue, 23 Jul 2013 19:51:29 +0000 (12:51 -0700)]
am
d039c5e2: am
701a07fd: remove margin changes for paragraphs in collapse container
* commit '
d039c5e27bdec1898709cb715e4410c885b218d3':
remove margin changes for paragraphs in collapse container
Scott Main [Tue, 23 Jul 2013 19:49:03 +0000 (12:49 -0700)]
am
701a07fd: remove margin changes for paragraphs in collapse container
* commit '
701a07fd33a14f63e6baf4d1dfa36fd7035a8259':
remove margin changes for paragraphs in collapse container
Scott Main [Tue, 23 Jul 2013 19:41:25 +0000 (12:41 -0700)]
remove margin changes for paragraphs in collapse container
Change-Id: I5ee51699cb473334e1c3cfb520c8145466eea265
Doug Zongker [Tue, 23 Jul 2013 19:10:05 +0000 (19:10 +0000)]
Merge "distinguish signed and unsigned user builds in UI"
Guilhem IMBERTON [Thu, 4 Oct 2012 12:26:57 +0000 (14:26 +0200)]
Use consistent search depth.
AndroidProducts.mk allows for a maxdepth of 4 in device and vendor while
vendorsetup.sh and BoardConfig.mk only allow for smaller depth.
Make search depth consistent for these files.
Change-Id: I406770c1423d4f27fe097956a7c705a0da937e35
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Laurent Fert <laurent.fert@intel.com>
Signed-off-by: Guilhem Imberton <guilhem.imberton@intel.com>
Author: Laurent Fert <laurent.fert@intel.com>
Doug Zongker [Tue, 23 Jul 2013 18:51:04 +0000 (11:51 -0700)]
distinguish signed and unsigned user builds in UI
Add "dev-keys" or "test-keys" to the value of ro.build.display.id for
user builds. (This is the property that is displayed under "Build
number" in the Settings UI.) Modify the signing script to remove the
keys tag from this value when signing.
Change-Id: I3d9d92056f8567d7f84b1be047619be7c6e4c419
The Android Automerger [Tue, 23 Jul 2013 13:02:47 +0000 (06:02 -0700)]
"KRS23"
The Android Automerger [Tue, 23 Jul 2013 13:00:21 +0000 (06:00 -0700)]
merge in klp-release history after reset to master
Michael Runge [Mon, 22 Jul 2013 20:42:44 +0000 (20:42 +0000)]
Revert "Update OTA to understand SELinux filesystem labels"
This reverts commit
fbbd79530adc6ddd6bbfb3c5fc60ba5ec0ce5f2d.
All incremental auto OTAs broken b/
9964074
Change-Id: I500d2ac194804abd20a0e01d9862fd42e8f5d2de
The Android Automerger [Mon, 22 Jul 2013 23:47:59 +0000 (16:47 -0700)]
KRS22B
keunyoung [Mon, 22 Jul 2013 23:46:10 +0000 (23:46 +0000)]
Merge "add PDK_PLATFORM_ZIP_PRODUCT_BINARIES to allow adding product specific binaries to platform.zip"
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
Michael Runge [Mon, 22 Jul 2013 21:57:00 +0000 (21:57 +0000)]
Merge "Revert "Update OTA to understand SELinux filesystem labels""
Michael Runge [Mon, 22 Jul 2013 20:42:44 +0000 (20:42 +0000)]
Revert "Update OTA to understand SELinux filesystem labels"
This reverts commit
fbbd79530adc6ddd6bbfb3c5fc60ba5ec0ce5f2d.
All incremental auto OTAs broken b/
9964074
Change-Id: I500d2ac194804abd20a0e01d9862fd42e8f5d2de
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 [Mon, 22 Jul 2013 13:04:05 +0000 (06:04 -0700)]
"KRS22"
The Android Automerger [Mon, 22 Jul 2013 13:00:35 +0000 (06:00 -0700)]
merge in klp-release history after reset to master
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
The Android Automerger [Fri, 19 Jul 2013 21:40:09 +0000 (14:40 -0700)]
"KRS18C"
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"
The Android Automerger [Fri, 19 Jul 2013 02:34:16 +0000 (19:34 -0700)]
"KRS18B"
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"
The Android Automerger [Thu, 18 Jul 2013 13:03:16 +0000 (06:03 -0700)]
"KRS18"
The Android Automerger [Thu, 18 Jul 2013 13:00:28 +0000 (06:00 -0700)]
merge in klp-release history after reset to master
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 [Wed, 17 Jul 2013 19:15:19 +0000 (12:15 -0700)]
KRS17B
The Android Automerger [Wed, 17 Jul 2013 13:01:56 +0000 (06:01 -0700)]
"KRS17"
The Android Automerger [Wed, 17 Jul 2013 13:00:15 +0000 (06:00 -0700)]
merge in klp-release history after reset to master
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 Automerger [Tue, 16 Jul 2013 18:48:32 +0000 (11:48 -0700)]
"KRS16B"
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 13:03:33 +0000 (06:03 -0700)]
"KRS16"
The Android Automerger [Tue, 16 Jul 2013 13:00:36 +0000 (06:00 -0700)]
merge in klp-release history after reset to master
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
The Android Automerger [Mon, 15 Jul 2013 23:08:34 +0000 (16:08 -0700)]
"KRS15B"
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."