Commit Graph

13545 Commits

Author SHA1 Message Date
Scott Main 0c1cd6865b am d039c5e2: am 701a07fd: remove margin changes for paragraphs in collapse container
* commit 'd039c5e27bdec1898709cb715e4410c885b218d3':
  remove margin changes for paragraphs in collapse container
2013-07-23 12:51:29 -07:00
Scott Main d039c5e27b am 701a07fd: remove margin changes for paragraphs in collapse container
* commit '701a07fd33a14f63e6baf4d1dfa36fd7035a8259':
  remove margin changes for paragraphs in collapse container
2013-07-23 12:49:03 -07:00
Scott Main 701a07fd33 remove margin changes for paragraphs in collapse container
Change-Id: I5ee51699cb473334e1c3cfb520c8145466eea265
2013-07-23 12:41:25 -07:00
Doug Zongker 1f790c9733 Merge "distinguish signed and unsigned user builds in UI" 2013-07-23 19:10:05 +00:00
Guilhem IMBERTON 58570e7d5e 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>
2013-07-23 21:02:15 +02:00
Doug Zongker a8608a7f7c 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
2013-07-23 11:51:04 -07:00
The Android Automerger 7bd1203492 "JSS15K" 2013-07-22 23:11:12 -07:00
keunyoung 3939476ca0 Merge "add PDK_PLATFORM_ZIP_PRODUCT_BINARIES to allow adding product specific binaries to platform.zip" 2013-07-22 23:46:10 +00:00
keunyoung c01780611a 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
2013-07-22 15:59:33 -07:00
Michael Runge 065ab7f0df Merge "Revert "Update OTA to understand SELinux filesystem labels"" 2013-07-22 21:57:00 +00:00
Michael Runge fb9bb205fc Revert "Update OTA to understand SELinux filesystem labels"
This reverts commit fbbd79530a.

All incremental auto OTAs broken b/9964074

Change-Id: I500d2ac194804abd20a0e01d9862fd42e8f5d2de
2013-07-22 20:42:44 +00:00
The Android Open Source Project 9232a62e98 am 90a4ac4c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '90a4ac4c1eafd897800c72fa8c732f97ffa95d28':
  "JSS15J"
2013-07-22 08:01:58 -07:00
The Android Open Source Project 90a4ac4c1e Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I6f1b8561853187e3a82f0da2e428188c10e64807
2013-07-22 07:59:15 -07:00
The Android Automerger d90fa5ddf5 "JSS15J" 2013-07-21 10:20:19 -07:00
The Android Open Source Project df286ced88 am 62eda460: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '62eda460c411b21dce28b8ea6a9ee9245d896dd5':
  "JSS15I"
2013-07-20 18:26:47 -07:00
The Android Open Source Project 62eda460c4 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I68646ef2af902737659f0874fc2bb17612747c3a
2013-07-20 18:25:23 -07:00
The Android Automerger 863f6120e6 "JSS15I" 2013-07-20 15:27:46 -07:00
The Android Open Source Project 89feaeadc2 am 7017cfe1: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '7017cfe124721cadd3315a0a5700c83545916673':
  "JSS15H"
  "JSS15G"
  JSS15F
  "JSS15E"
  "JSS15D"
  "JSS15C"
2013-07-19 16:02:26 -07:00
Scott Main bc66ddea44 am 3497ef57: am 98a2a71f: edit code-caption style margin
* commit '3497ef575318aafbe06387a474ae6d5152fae82f':
  edit code-caption style margin
2013-07-19 15:48:46 -07:00
Ying Wang 15cbe8e3d4 Add framework2 to the java pdk package.
To fix pdk fusion build.

Change-Id: I5989f38e48614faa742f8362bde841fe084d9c13
2013-07-19 14:37:25 -07:00
The Android Open Source Project 7017cfe124 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id68bc43f09ff7d7aa7f48ed9cdca06e14aea4c9c
2013-07-19 14:20:21 -07:00
Scott Main 3497ef5753 am 98a2a71f: edit code-caption style margin
* commit '98a2a71f9ee7ea7e347c686ce89d4d4a3b0fba5b':
  edit code-caption style margin
2013-07-19 13:42:42 -07:00
The Android Automerger 1a35c2298b "JSS15H" 2013-07-19 03:17:16 -07:00
The Android Automerger 276ef9a67b "JSS15G" 2013-07-18 20:48:00 -07:00
Amith Yamasani 6b812201ef Clean generated java files since framework intermediates has partially moved.
Change-Id: I89dea945e1c931e26985a6af7bf54ede93d2ee33
2013-07-18 18:48:32 -07:00
Nick Kralevich f771d64bcb Merge "Update OTA to understand SELinux filesystem labels" 2013-07-18 22:25:59 +00:00
Jeff Brown 4e361bf692 Merge "Split framework jar." 2013-07-18 22:12:37 +00:00
Nick Kralevich fbbd79530a 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
2013-07-18 15:04:22 -07:00
The Android Automerger 4962f14222 JSS15F 2013-07-18 13:53:12 -07:00
The Android Automerger 10bd266a83 "JSS15E" 2013-07-18 11:25:20 -07:00
Ying Wang 8bf79bb081 am 8bb3306b: am a1f8cdf7: Merge "Allow several system property files"
* commit '8bb3306b76bf3a20fc0f0634a492c5c18550c8e3':
  Allow several system property files
2013-07-18 10:07:09 -07:00
Ying Wang 8bb3306b76 am a1f8cdf7: Merge "Allow several system property files"
* commit 'a1f8cdf74bcc35110bd306d633e019a6279fc7fe':
  Allow several system property files
2013-07-18 10:02:45 -07:00
Ying Wang a1f8cdf74b Merge "Allow several system property files" 2013-07-18 17:00:20 +00:00
Jeff Brown ae859f9b64 Split framework jar.
Change-Id: I38c68ac169a4ea10e4640b5d8e24298a6caaf441
2013-07-17 21:08:18 -07:00
The Android Automerger 80482662f7 "JSS15D" 2013-07-17 14:59:40 -07:00
Scott Main 98a2a71f9e edit code-caption style margin
Change-Id: I63c58015ca9037621c5d4c3929620ebd2203f5ad
2013-07-17 13:15:04 -07:00
The Android Automerger fc248ca689 "JSS15C" 2013-07-16 15:26:08 -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
Johan Redestig 674a27ddaf 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
2013-07-16 15:15:16 +02: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