Commit Graph

19692 Commits

Author SHA1 Message Date
smain@google.com 2e216835ee am 9220b6e6: am 0dd70276: am 6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
* commit '9220b6e676aefe152540a6cf832e5fd18817370e':
  followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
2014-11-18 16:39:39 +00:00
smain@google.com 9220b6e676 am 0dd70276: am 6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
* commit '0dd70276f6cfe09010054897a80d406ea9ac13de':
  followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
2014-11-18 16:34:27 +00:00
smain@google.com 0dd70276f6 am 6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
* commit '6bdcb981ce098cae2fb9e690485ebaab47b2225a':
  followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
2014-11-18 16:30:31 +00:00
Ying Wang 43f7a3226a Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG
Two new LOCAL variables are added to support dpi-specific prebuilt apk
selection:
- LOCAL_DPI_VARIANTS: specify a list of dpis the module provides with
  specific prebuilt.
  Example: LOCAL_DPI_VARIANTS := xxhdpi xhdpi hdpi mdpi
- LOCAL_DPI_FILE_STEM: specify the dpi-specific source file name
  pattern.
  Example: LOCAL_DPI_FILE_STEM := MyApp-%.apk
  "%" will be substitued by $(PRODUCT_AAPT_PREF_CONFIG) in the core
  build system.
  If you don't set up LOCAL_DPI_FILE_STEM, the default is
  $(LOCAL_MODULE)_%.apk.

The build system searches $(PRODUCT_AAPT_PREF_CONFIG) in a prebuilt apk
module's $(LOCAL_DPI_VARIANTS). If not found, use whatever
$(LOCAL_SRC_FILES) as the source file; Otherwise use $(LOCAL_DPI_FILE_STEM)
to construct the dpi-specific apk's source file name, and use whatever
directory name of $(LOCAL_SRC_FILES).

Bug: 18388705
Change-Id: I63cae73f1b6f880302142abc476b3ce1fb5500b5
2014-11-17 17:05:27 -08:00
Dave Langemak 8de0a3d31a am 139f8a81: am a4cf5cc9: (-s ours) am 5e923c91: Increment Android versions to 5.0.1
* commit '139f8a8146f5b6d6c9da6dc744b3420d417bf3a5':
  Increment Android versions to 5.0.1
2014-11-18 01:03:08 +00:00
Dave Langemak 139f8a8146 am a4cf5cc9: (-s ours) am 5e923c91: Increment Android versions to 5.0.1
* commit 'a4cf5cc9ecc3c5d2658943117f7d182b26c77b30':
  Increment Android versions to 5.0.1
2014-11-18 00:56:49 +00:00
Dave Langemak a4cf5cc9ec am 5e923c91: Increment Android versions to 5.0.1
* commit '5e923c91b42f1df7ec3da97b1506dd9aa93795d0':
  Increment Android versions to 5.0.1
2014-11-18 00:46:21 +00:00
Dave Langemak 5e923c91b4 Increment Android versions to 5.0.1
Change-Id: I2880123f0d1215f2028e6d3bc3f88fee5714ae74
2014-11-17 16:37:50 -08:00
Ying Wang d72ba8280a am 1b879e3c: Fix PDK build.
* commit '1b879e3c2617dcd9d31a34d1d3c4e7790f9a41e0':
  Fix PDK build.
2014-11-17 19:13:32 +00:00
Ying Wang 1b879e3c26 Fix PDK build.
Add frameworks/base/preloaded-classes to PRODUCT_COPY_FILES only if it
exists in the source tree.

Bug: 18305157
Change-Id: I46c277ebfb8095f9e5fe0fbb21276d932509f2eb
2014-11-17 11:01:18 -08:00
Ying Wang 9a0a8bd006 am 9a9d180f: Install preloaded-classes as a standalone configuration file
* commit '9a9d180ff1cafc547bd9d3b31a10db749d8ab359':
  Install preloaded-classes as a standalone configuration file
2014-11-17 18:24:27 +00:00
Ying Wang 9a9d180ff1 Install preloaded-classes as a standalone configuration file
Install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.
To override the default frameworks/base/preloaded-classes, just override
in your product configuration makefile with PRODUCT_COPY_FILES before it
inherits from build/target/product/base.mk: if there are multiple items
in PRODUCT_COPY_FILES with the same destination, the first one takes
precedence.

Bug: 18305157
Change-Id: I937632b4a1aa73310ec90e73fd708fbd0c704a21
2014-11-14 15:38:54 -08:00
smain@google.com 6bdcb981ce followup to recent cookie max-age change to remove parameter and use 2-year for all cookies
bug: 17781603

Change-Id: Id0da9d41e01c6a45672d1362fc1c5aa39e558904
2014-11-14 11:53:07 -08:00
Michael Runge b5d7011d78 am 100a9f07: am 11d21015: am f178d364: Merge "Allow images to be readded to target-files" into lmp-dev
* commit '100a9f072073f3c799deb72a62ffb500c1562c4c':
  Allow images to be readded to target-files
2014-11-14 07:25:11 +00:00
Michael Runge 100a9f0720 am 11d21015: am f178d364: Merge "Allow images to be readded to target-files" into lmp-dev
* commit '11d210154d71a229e20eaebd6f9ea580b0c7f036':
  Allow images to be readded to target-files
2014-11-14 07:19:58 +00:00
Michael Runge 11d210154d am f178d364: Merge "Allow images to be readded to target-files" into lmp-dev
* commit 'f178d36441c3a688cfe5eb41a5ce724ba01a4ecf':
  Allow images to be readded to target-files
2014-11-14 07:17:22 +00:00
Michael Runge f178d36441 Merge "Allow images to be readded to target-files" into lmp-dev 2014-11-14 07:14:48 +00:00
Michael Runge 2e0d8fcf08 Allow images to be readded to target-files
There may be cases where various partitions were
modified (such as extra signing of boot/recovery)
which require the system partition to be regenerated
with a new recovery patch script.  Allow a request
for the recovery patch to be rebuilt, and for
missing images to be readded to the existing images.

Change-Id: Ie93c5bc1161a0d5002002dca23e07742ce2ba468
2014-11-13 22:55:35 -08:00
Paul Lawrence 9ebb006799 am a37b2bb2: Fix the build
* commit 'a37b2bb236486d5fc9158dbc66d1ff73a63c6e81':
  Fix the build
2014-11-14 02:12:48 +00:00
Paul Lawrence a37b2bb236 Fix the build
Bug: 15984840
Bug: 18120110
Change-Id: I0224d5a31e03b711953d9496ecb00b6d88b8ef4c
2014-11-14 02:04:33 +00:00
Sami Tolvanen 2a1697d983 am 8d212ea8: DO NOT MERGE: Change verity key formats
* commit '8d212ea8735233211b38f55819841fa97a744eaa':
  DO NOT MERGE: Change verity key formats
2014-11-13 23:53:41 +00:00
Sami Tolvanen 8d212ea873 DO NOT MERGE: Change verity key formats
Change boot, recovery, and verity metadata signing keys to use the
same PKCS8 / X.509 PEM format as the other signing keys, and update
build scripts to use correct arguments for the updated signing
tools.

Bug: 15984840
Bug: 18120110
Change-Id: I23ed5a004ecdad6cf7696487935ad5031eb8adf8
(cherry picked from commit 72d90eb189)
2014-11-13 23:23:31 +00:00
Greg Hartman 9f00b5a077 Restore the diskinstaller dependency, since it\'s needed for GCE.
automerge: 2ebfef4

* commit '2ebfef448465b99260b6900bc207d42ead09e96c':
  Restore the diskinstaller dependency, since it's needed for GCE.
2014-11-11 02:47:55 +00:00
Greg Hartman 711fe35574 Add a hook for the syslinux bootloader.
automerge: 4c46710

* commit '4c46710e7a5cbcb1807d183aaeb88d68f98b6753':
  Add a hook for the syslinux bootloader.
2014-11-11 02:47:50 +00:00
Greg Hartman 2ebfef4484 Restore the diskinstaller dependency, since it's needed for GCE.
Change-Id: Ieb2695afbe551e829357bad56d5fe1501165b495
2014-11-11 02:27:46 +00:00
Greg Hartman 4c46710e7a Add a hook for the syslinux bootloader.
Change-Id: Ia8638e9dcb025743a66c52ad43b161ee70602c89
2014-11-11 02:26:50 +00:00
Igor Murashkin ea0056a071 am 6e27e3de: am 964935b8: core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
* commit '6e27e3de86cef6354db56c274beca875dafccbaf':
  core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
2014-11-11 00:17:44 +00:00
Ying Wang c93d39af9a am 461850da: resolved conflicts for merge of 0a7fcb00 to lmp-mr1-dev
* commit '461850dab19ea4b9552d079aa6c80f4bbbef6ab5':
  Introduce per-product per-module dex-preopt config
2014-11-11 00:13:46 +00:00
Igor Murashkin 6e27e3de86 am 964935b8: core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
* commit '964935b8a6ef52f090eb6f48875db5ebb32962cf':
  core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
2014-11-11 00:12:00 +00:00
Ying Wang 461850dab1 resolved conflicts for merge of 0a7fcb00 to lmp-mr1-dev
Change-Id: Ia780b29bfc9a7b3409bf04ba0e18e937c9467a0f
2014-11-10 16:07:40 -08:00
Igor Murashkin 964935b8a6 core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
When WITH_DEXPREOPT=true is set, if we also set WITH_DEXPREOPT_PIC=true
then the build will generate position-independent OAT images.

This means that all the system applications no longer need to be
relocated into /data/dalvik-cache and this can achieve saving disk space
at the cost of slightly slower running code.

Bug: 18035729

(cherry picked from commit da9f1a7e82)

Change-Id: I9d5f12bbe7d0287784ac7e941fba090fce3ce3df
2014-11-10 12:53:42 -08:00
Ying Wang 0a7fcb00ab Introduce per-product per-module dex-preopt config
- Added LOCAL_DEX_PREOPT_FLAGS to pass extra flags to dex2oat.
- Added macro add-product-dex-preopt-module-config to specify almost
  arbitrary dex-preopt config/flags to modules in product
  configuration:
  $(call \
  add-product-dex-preopt-module-config,<module_name_list>,<config_or_flags>)
  How <config_or_flags> is interpreted is decided by
  dex_preopt_odex_install.mk and dex2oat. For now if it's "disable" we
  disable dexpreopt for the given modules; otherwise pass it to dex2oat as
  command line flags.
- If there are multiple configs for the same module in the product
  inheritance, the first takes precedence.
- Added PRODUCT_DEX_PREOPT_DEFAULT_FLAGS so you can specify default
  dex2oat flags in product configuration.
- Added PRODUCT_DEX_PREOPT_BOOT_FLAGS to specify flags of building boot.oat.

Bug: 17791867
(cherry picked from commit 20ebd2ef08)

(cherry picked from commit 70d617aaf5)

Change-Id: I86f125dd02290d0969704142a4405ebd6729c4f7
2014-11-10 12:51:26 -08:00
Dirk Dougherty f093a88f26 am be9f16d0: am 48a97e01: am 87e469ea: Doc change: increment query params for js metadata files to trigger proxy flush.
automerge: eb83a3e

* commit 'eb83a3ed7470bc931c24d4d38f696e9cc33c034a':
  Doc change: increment query params for js metadata files to trigger proxy flush.
2014-11-06 21:32:19 +00:00
Dirk Dougherty eb83a3ed74 am be9f16d0: am 48a97e01: am 87e469ea: Doc change: increment query params for js metadata files to trigger proxy flush.
* commit 'be9f16d08b7cec10ac5c3dba93291db404be27f8':
  Doc change: increment query params for js metadata files to trigger proxy flush.
2014-11-06 20:34:22 +00:00
Dirk Dougherty be9f16d08b am 48a97e01: am 87e469ea: Doc change: increment query params for js metadata files to trigger proxy flush.
* commit '48a97e0139f3d100d10a8da9f462b5b376a84593':
  Doc change: increment query params for js metadata files to trigger proxy flush.
2014-11-06 05:17:35 +00:00
Dirk Dougherty 48a97e0139 am 87e469ea: Doc change: increment query params for js metadata files to trigger proxy flush.
* commit '87e469ea87a7a3b3142f1d2efd89d602a3ede529':
  Doc change: increment query params for js metadata files to trigger proxy flush.
2014-11-06 05:14:27 +00:00
Dirk Dougherty 87e469ea87 Doc change: increment query params for js metadata files to trigger proxy flush.
Change-Id: Ic6f5756d44f1ec08485ac67a0258a4abae845222
2014-11-05 20:11:23 -08:00
Stephen Hines 4d2b4fdced am 11054d5e: Add bcc to core_tiny.mk. automerge: bdac04e
* commit '11054d5edbebd3507f56069a384a91220a89f853':
  Add bcc to core_tiny.mk.
2014-11-06 00:36:49 +00:00
Stephen Hines 11054d5edb Add bcc to core_tiny.mk.
automerge: bdac04e

* commit 'bdac04e0f6002e95ce734a097d2c12236ed482fa':
  Add bcc to core_tiny.mk.
2014-11-06 00:32:01 +00:00
Stephen Hines bdac04e0f6 Add bcc to core_tiny.mk.
Bug: 18257466

Also update the core.mk documentation that has gone slightly out of date.

Change-Id: I90ed64e2509dad3d78d451dd4a7d8c3dfd01532c
2014-11-05 13:19:56 -08:00
Nick Kralevich 1b7f0f8c1d am a94282c6: Mount tmpfs on /cores
* commit 'a94282c6598ed91e260b7bdf199ff3db7d6c5a92':
  Mount tmpfs on /cores
2014-11-05 05:10:39 +00:00
Iliyan Malchev 854252d295 am af5de97b: rename coredump-* --> coredump_*
* commit 'af5de97b8a368aec05b598af951e83729c95b6dc':
  rename coredump-* --> coredump_*
2014-11-05 05:06:33 +00:00
Nick Kralevich a94282c659 Mount tmpfs on /cores
Proper selinux labeling support for files on rootfs was
never completely implemented. Instead of putting coredump
files on rootfs, put them on tmpfs instead.

See: http://www.mail-archive.com/seandroid-list@tycho.nsa.gov/msg01815.html

Bug: 18227650
Change-Id: I2eeabee4fe1a14bfbf990a4a518d538d6b4b6e87
2014-11-05 05:03:45 +00:00
Iliyan Malchev af5de97b8a rename coredump-* --> coredump_*
b/18229600 shamu kernel is failing to build on build machine

Change-Id: Ia67443853443e4d7db9311bf8da69a5dc0da8e5e
Signed-off-by: Iliyan Malchev <malchev@google.com>
2014-11-04 21:01:18 -08:00
Justin Morey fc13313551 am 29d225c9: Set a default value for TARGET_BUILD_DENSITY
* commit '29d225c992b7bc5b5d4af53550a88c6cb602a2a0':
  Set a default value for TARGET_BUILD_DENSITY
2014-11-04 20:05:44 +00:00
Justin Morey 29d225c992 Set a default value for TARGET_BUILD_DENSITY
If no density value is specified when invoking tapas, we now export
a default value of 'alldpi'

Change-Id: I12b22a4cbd0ef604826aad66c5f7ab9271eb6d57
2014-11-04 13:35:51 -06:00
smain@google.com 782ba68dfb am abcb1552: am 04a4f1d0: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs automerge: d1ab4cb automerge: dd5adb3
* commit 'abcb155250040cfac06ec86ba72cfca1b594c12d':
2014-11-04 07:28:24 +00:00
smain@google.com abcb155250 am 04a4f1d0: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs automerge: d1ab4cb automerge: dd5adb3
* commit '04a4f1d031914302f9dc9244807e84fe640d3ebc':
2014-11-04 07:22:49 +00:00
smain@google.com 04a4f1d031 am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs automerge: d1ab4cb
automerge: dd5adb3

* commit 'dd5adb3bc0be42081bffb0d4722c4b9639ee31db':
2014-11-04 07:13:03 +00:00
smain@google.com 8dbb0a6e6d am fc175efc: am 4d4615d2: am 632070c9: hide the Helpouts recruitment banner
* commit 'fc175efc5cbe2ffebab0b5a4cfada76eaa1b581c':
  hide the Helpouts recruitment banner
2014-11-04 04:21:44 +00:00