OSDN Git Service

android-x86/build.git
9 years agoam 139f8a81: am a4cf5cc9: (-s ours) am 5e923c91: Increment Android versions to 5.0.1
Dave Langemak [Tue, 18 Nov 2014 01:03:08 +0000 (01:03 +0000)]
am 139f8a81: am a4cf5cc9: (-s ours) am 5e923c91: Increment Android versions to 5.0.1

* commit '139f8a8146f5b6d6c9da6dc744b3420d417bf3a5':
  Increment Android versions to 5.0.1

9 years agoam a4cf5cc9: (-s ours) am 5e923c91: Increment Android versions to 5.0.1
Dave Langemak [Tue, 18 Nov 2014 00:56:49 +0000 (00:56 +0000)]
am a4cf5cc9: (-s ours) am 5e923c91: Increment Android versions to 5.0.1

* commit 'a4cf5cc9ecc3c5d2658943117f7d182b26c77b30':
  Increment Android versions to 5.0.1

9 years agoam 5e923c91: Increment Android versions to 5.0.1
Dave Langemak [Tue, 18 Nov 2014 00:46:21 +0000 (00:46 +0000)]
am 5e923c91: Increment Android versions to 5.0.1

* commit '5e923c91b42f1df7ec3da97b1506dd9aa93795d0':
  Increment Android versions to 5.0.1

9 years agoIncrement Android versions to 5.0.1
Dave Langemak [Tue, 18 Nov 2014 00:37:50 +0000 (16:37 -0800)]
Increment Android versions to 5.0.1

Change-Id: I2880123f0d1215f2028e6d3bc3f88fee5714ae74

9 years agoam 1b879e3c: Fix PDK build.
Ying Wang [Mon, 17 Nov 2014 19:13:32 +0000 (19:13 +0000)]
am 1b879e3c: Fix PDK build.

* commit '1b879e3c2617dcd9d31a34d1d3c4e7790f9a41e0':
  Fix PDK build.

9 years agoFix PDK build.
Ying Wang [Mon, 17 Nov 2014 19:01:18 +0000 (11:01 -0800)]
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

9 years agoam 9a9d180f: Install preloaded-classes as a standalone configuration file
Ying Wang [Mon, 17 Nov 2014 18:24:27 +0000 (18:24 +0000)]
am 9a9d180f: Install preloaded-classes as a standalone configuration file

* commit '9a9d180ff1cafc547bd9d3b31a10db749d8ab359':
  Install preloaded-classes as a standalone configuration file

9 years agoInstall preloaded-classes as a standalone configuration file
Ying Wang [Thu, 13 Nov 2014 23:19:12 +0000 (15:19 -0800)]
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

9 years agoam 100a9f07: am 11d21015: am f178d364: Merge "Allow images to be readded to target...
Michael Runge [Fri, 14 Nov 2014 07:25:11 +0000 (07:25 +0000)]
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

9 years agoam 11d21015: am f178d364: Merge "Allow images to be readded to target-files" into...
Michael Runge [Fri, 14 Nov 2014 07:19:58 +0000 (07:19 +0000)]
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

9 years agoam f178d364: Merge "Allow images to be readded to target-files" into lmp-dev
Michael Runge [Fri, 14 Nov 2014 07:17:22 +0000 (07:17 +0000)]
am f178d364: Merge "Allow images to be readded to target-files" into lmp-dev

* commit 'f178d36441c3a688cfe5eb41a5ce724ba01a4ecf':
  Allow images to be readded to target-files

9 years agoMerge "Allow images to be readded to target-files" into lmp-dev
Michael Runge [Fri, 14 Nov 2014 07:14:47 +0000 (07:14 +0000)]
Merge "Allow images to be readded to target-files" into lmp-dev

9 years agoAllow images to be readded to target-files
Michael Runge [Fri, 14 Nov 2014 05:41:08 +0000 (21:41 -0800)]
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

9 years agoam a37b2bb2: Fix the build
Paul Lawrence [Fri, 14 Nov 2014 02:12:48 +0000 (02:12 +0000)]
am a37b2bb2: Fix the build

* commit 'a37b2bb236486d5fc9158dbc66d1ff73a63c6e81':
  Fix the build

9 years agoFix the build
Paul Lawrence [Fri, 14 Nov 2014 01:54:30 +0000 (17:54 -0800)]
Fix the build

Bug: 15984840
Bug: 18120110
Change-Id: I0224d5a31e03b711953d9496ecb00b6d88b8ef4c

9 years agoam 8d212ea8: DO NOT MERGE: Change verity key formats
Sami Tolvanen [Thu, 13 Nov 2014 23:53:41 +0000 (23:53 +0000)]
am 8d212ea8: DO NOT MERGE: Change verity key formats

* commit '8d212ea8735233211b38f55819841fa97a744eaa':
  DO NOT MERGE: Change verity key formats

9 years agoDO NOT MERGE: Change verity key formats
Sami Tolvanen [Fri, 7 Nov 2014 04:38:00 +0000 (20:38 -0800)]
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 72d90eb1895932343586717daa1865019473b2f5)

9 years agoRestore the diskinstaller dependency, since it\'s needed for GCE.
Greg Hartman [Tue, 11 Nov 2014 02:47:55 +0000 (02:47 +0000)]
Restore the diskinstaller dependency, since it\'s needed for GCE.
automerge: 2ebfef4

* commit '2ebfef448465b99260b6900bc207d42ead09e96c':
  Restore the diskinstaller dependency, since it's needed for GCE.

9 years agoAdd a hook for the syslinux bootloader.
Greg Hartman [Tue, 11 Nov 2014 02:47:50 +0000 (02:47 +0000)]
Add a hook for the syslinux bootloader.
automerge: 4c46710

* commit '4c46710e7a5cbcb1807d183aaeb88d68f98b6753':
  Add a hook for the syslinux bootloader.

9 years agoRestore the diskinstaller dependency, since it's needed for GCE.
Greg Hartman [Wed, 5 Nov 2014 05:17:06 +0000 (21:17 -0800)]
Restore the diskinstaller dependency, since it's needed for GCE.

Change-Id: Ieb2695afbe551e829357bad56d5fe1501165b495

9 years agoAdd a hook for the syslinux bootloader.
Greg Hartman [Fri, 31 Oct 2014 17:43:52 +0000 (10:43 -0700)]
Add a hook for the syslinux bootloader.

Change-Id: Ia8638e9dcb025743a66c52ad43b161ee70602c89

9 years agoam 6e27e3de: am 964935b8: core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build...
Igor Murashkin [Tue, 11 Nov 2014 00:17:44 +0000 (00:17 +0000)]
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

9 years agoam 461850da: resolved conflicts for merge of 0a7fcb00 to lmp-mr1-dev
Ying Wang [Tue, 11 Nov 2014 00:13:46 +0000 (00:13 +0000)]
am 461850da: resolved conflicts for merge of 0a7fcb00 to lmp-mr1-dev

* commit '461850dab19ea4b9552d079aa6c80f4bbbef6ab5':
  Introduce per-product per-module dex-preopt config

9 years agoam 964935b8: core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
Igor Murashkin [Tue, 11 Nov 2014 00:12:00 +0000 (00:12 +0000)]
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

9 years agoresolved conflicts for merge of 0a7fcb00 to lmp-mr1-dev
Ying Wang [Tue, 11 Nov 2014 00:07:40 +0000 (16:07 -0800)]
resolved conflicts for merge of 0a7fcb00 to lmp-mr1-dev

Change-Id: Ia780b29bfc9a7b3409bf04ba0e18e937c9467a0f

9 years agocore: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
Igor Murashkin [Thu, 30 Oct 2014 23:08:07 +0000 (16:08 -0700)]
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 da9f1a7e82b7e6d0677553f211835625078347f2)

Change-Id: I9d5f12bbe7d0287784ac7e941fba090fce3ce3df

9 years agoIntroduce per-product per-module dex-preopt config
Ying Wang [Wed, 8 Oct 2014 01:07:23 +0000 (18:07 -0700)]
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 20ebd2ef081f2a3e85a4adcf8837e6f5b68bdeea)

(cherry picked from commit 70d617aaf57c636ca7b6aedee5b009a7c46bdd3a)

Change-Id: I86f125dd02290d0969704142a4405ebd6729c4f7

9 years agoam be9f16d0: am 48a97e01: am 87e469ea: Doc change: increment query params for js...
Dirk Dougherty [Thu, 6 Nov 2014 21:32:19 +0000 (21:32 +0000)]
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.

9 years agoam be9f16d0: am 48a97e01: am 87e469ea: Doc change: increment query params for js...
Dirk Dougherty [Thu, 6 Nov 2014 20:34:22 +0000 (20:34 +0000)]
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.

9 years agoam 48a97e01: am 87e469ea: Doc change: increment query params for js metadata files...
Dirk Dougherty [Thu, 6 Nov 2014 05:17:35 +0000 (05:17 +0000)]
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.

9 years agoam 87e469ea: Doc change: increment query params for js metadata files to trigger...
Dirk Dougherty [Thu, 6 Nov 2014 05:14:27 +0000 (05:14 +0000)]
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.

9 years agoDoc change: increment query params for js metadata files to trigger proxy flush.
Dirk Dougherty [Thu, 6 Nov 2014 04:11:23 +0000 (20:11 -0800)]
Doc change: increment query params for js metadata files to trigger proxy flush.

Change-Id: Ic6f5756d44f1ec08485ac67a0258a4abae845222

9 years agoam 11054d5e: Add bcc to core_tiny.mk. automerge: bdac04e
Stephen Hines [Thu, 6 Nov 2014 00:36:49 +0000 (00:36 +0000)]
am 11054d5e: Add bcc to core_tiny.mk. automerge: bdac04e

* commit '11054d5edbebd3507f56069a384a91220a89f853':
  Add bcc to core_tiny.mk.

9 years agoAdd bcc to core_tiny.mk.
Stephen Hines [Thu, 6 Nov 2014 00:32:01 +0000 (00:32 +0000)]
Add bcc to core_tiny.mk.
automerge: bdac04e

* commit 'bdac04e0f6002e95ce734a097d2c12236ed482fa':
  Add bcc to core_tiny.mk.

9 years agoAdd bcc to core_tiny.mk.
Stephen Hines [Wed, 5 Nov 2014 21:19:56 +0000 (13:19 -0800)]
Add bcc to core_tiny.mk.

Bug: 18257466

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

Change-Id: I90ed64e2509dad3d78d451dd4a7d8c3dfd01532c

9 years agoam a94282c6: Mount tmpfs on /cores
Nick Kralevich [Wed, 5 Nov 2014 05:10:39 +0000 (05:10 +0000)]
am a94282c6: Mount tmpfs on /cores

* commit 'a94282c6598ed91e260b7bdf199ff3db7d6c5a92':
  Mount tmpfs on /cores

9 years agoam af5de97b: rename coredump-* --> coredump_*
Iliyan Malchev [Wed, 5 Nov 2014 05:06:33 +0000 (05:06 +0000)]
am af5de97b: rename coredump-* --> coredump_*

* commit 'af5de97b8a368aec05b598af951e83729c95b6dc':
  rename coredump-* --> coredump_*

9 years agoMount tmpfs on /cores
Nick Kralevich [Tue, 4 Nov 2014 19:17:20 +0000 (11:17 -0800)]
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

9 years agorename coredump-* --> coredump_*
Iliyan Malchev [Wed, 5 Nov 2014 04:57:37 +0000 (20:57 -0800)]
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>
9 years agoam 29d225c9: Set a default value for TARGET_BUILD_DENSITY
Justin Morey [Tue, 4 Nov 2014 20:05:44 +0000 (20:05 +0000)]
am 29d225c9: Set a default value for TARGET_BUILD_DENSITY

* commit '29d225c992b7bc5b5d4af53550a88c6cb602a2a0':
  Set a default value for TARGET_BUILD_DENSITY

9 years agoSet a default value for TARGET_BUILD_DENSITY
Justin Morey [Tue, 4 Nov 2014 19:35:51 +0000 (13:35 -0600)]
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

9 years agoam abcb1552: am 04a4f1d0: am 05e55e90: Merge "add butterbar for L announcement. make...
smain@google.com [Tue, 4 Nov 2014 07:28:24 +0000 (07:28 +0000)]
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':

9 years agoam 04a4f1d0: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar...
smain@google.com [Tue, 4 Nov 2014 07:22:49 +0000 (07:22 +0000)]
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':

9 years agoam 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsula...
smain@google.com [Tue, 4 Nov 2014 07:13:03 +0000 (07:13 +0000)]
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':

9 years agoam fc175efc: am 4d4615d2: am 632070c9: hide the Helpouts recruitment banner
smain@google.com [Tue, 4 Nov 2014 04:21:44 +0000 (04:21 +0000)]
am fc175efc: am 4d4615d2: am 632070c9: hide the Helpouts recruitment banner

* commit 'fc175efc5cbe2ffebab0b5a4cfada76eaa1b581c':
  hide the Helpouts recruitment banner

9 years agoam 4d4615d2: am 632070c9: hide the Helpouts recruitment banner
smain@google.com [Tue, 4 Nov 2014 04:14:14 +0000 (04:14 +0000)]
am 4d4615d2: am 632070c9: hide the Helpouts recruitment banner

* commit '4d4615d2e253e7c806c393a2b23fe07f495eaf56':
  hide the Helpouts recruitment banner

9 years agoam 632070c9: hide the Helpouts recruitment banner
smain@google.com [Tue, 4 Nov 2014 04:00:11 +0000 (04:00 +0000)]
am 632070c9: hide the Helpouts recruitment banner

* commit '632070c9400dea40edd4a00eb9db9d89e3852601':
  hide the Helpouts recruitment banner

9 years agoam bc13779d: hide the Helpouts recruitment banner
smain@google.com [Tue, 4 Nov 2014 03:06:54 +0000 (03:06 +0000)]
am bc13779d: hide the Helpouts recruitment banner
automerge: 69d8f2d

* commit '69d8f2d395f8e4d7670b7452ca131a38f1d69306':
  hide the Helpouts recruitment banner

9 years agoam bc13779d: hide the Helpouts recruitment banner
smain@google.com [Tue, 4 Nov 2014 02:38:42 +0000 (02:38 +0000)]
am bc13779d: hide the Helpouts recruitment banner

* commit 'bc13779d664a51efc0fb9ac489d2724cca2536fb':
  hide the Helpouts recruitment banner

9 years agohide the Helpouts recruitment banner
smain@google.com [Tue, 4 Nov 2014 02:28:17 +0000 (18:28 -0800)]
hide the Helpouts recruitment banner

Change-Id: I30cd8eb0edd8634bd6dd2f0900763c6bdd866953
(cherry picked from commit bc13779d664a51efc0fb9ac489d2724cca2536fb)

9 years agohide the Helpouts recruitment banner
smain@google.com [Tue, 4 Nov 2014 02:28:17 +0000 (18:28 -0800)]
hide the Helpouts recruitment banner

Change-Id: I30cd8eb0edd8634bd6dd2f0900763c6bdd866953

9 years agobuild: rename coredump-setup --> coredump_setup
Iliyan Malchev [Tue, 4 Nov 2014 01:23:32 +0000 (01:23 +0000)]
build: rename coredump-setup --> coredump_setup
automerge: e675cfb

* commit 'e675cfbfb9d4d61388d703778d5e03ae07c43ea1':
  build: rename coredump-setup --> coredump_setup

9 years agobuild: rename coredump-setup --> coredump_setup
Iliyan Malchev [Tue, 4 Nov 2014 01:04:47 +0000 (17:04 -0800)]
build: rename coredump-setup --> coredump_setup

b/18229600 shamu kernel is failing to build on build machine
Change-Id: I1b7e6d0ebf3e966a89ae4c7fed0cfd2db3f0a6a9
Signed-off-by: Iliyan Malchev <malchev@google.com>
9 years agoam 04a95647: am 792fb0e6: am 4244929f: Merge "Doc change: increment the json import...
Dirk Dougherty [Mon, 3 Nov 2014 21:18:29 +0000 (21:18 +0000)]
am 04a95647: am 792fb0e6: am 4244929f: Merge "Doc change: increment the json import versions in docfile." into lmp-docs

* commit '04a9564759fd839ff32196896f378fe3ae3b1393':
  Doc change: increment the json import versions in docfile.

9 years agoam 792fb0e6: am 4244929f: Merge "Doc change: increment the json import versions in...
Dirk Dougherty [Mon, 3 Nov 2014 21:11:04 +0000 (21:11 +0000)]
am 792fb0e6: am 4244929f: Merge "Doc change: increment the json import versions in docfile." into lmp-docs

* commit '792fb0e6b29a9adfb3705d2fa993f3af27c267a7':
  Doc change: increment the json import versions in docfile.

9 years agoam 4244929f: Merge "Doc change: increment the json import versions in docfile." into...
Dirk Dougherty [Mon, 3 Nov 2014 20:57:01 +0000 (20:57 +0000)]
am 4244929f: Merge "Doc change: increment the json import versions in docfile." into lmp-docs

* commit '4244929faaaffe957e8f23f3f261fd3acdbc928c':
  Doc change: increment the json import versions in docfile.

9 years agoMerge "Doc change: increment the json import versions in docfile." into lmp-docs
Dirk Dougherty [Mon, 3 Nov 2014 20:51:47 +0000 (20:51 +0000)]
Merge "Doc change: increment the json import versions in docfile." into lmp-docs

9 years agoDoc change: increment the json import versions in docfile.
Dirk Dougherty [Mon, 3 Nov 2014 20:48:08 +0000 (12:48 -0800)]
Doc change: increment the json import versions in docfile.

Change-Id: I5ffd1810c83a333ae37e5d9c1b8dd0bdbd8cb376

9 years agoam 6d965570: am 83bae4aa: am bc667f1c: am 08f336ea: fix regression from Change-Id...
smain@google.com [Mon, 3 Nov 2014 20:41:07 +0000 (20:41 +0000)]
am 6d965570: am 83bae4aa: am bc667f1c: am 08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working automerge: 36b1de7

* commit '6d96557088d71d171669b84e851a650f80c42546':

9 years agoam 22d6c273: am 358c5fe5: am f4cefc19: am 633f322b: update the analytics tracking...
smain@google.com [Mon, 3 Nov 2014 20:41:06 +0000 (20:41 +0000)]
am 22d6c273: am 358c5fe5: am f4cefc19: am 633f322b: update the analytics tracking event calls to use new API for analytics.js bug: 16331906 automerge: 40e1d35

* commit '22d6c273d313a7da2efe80f7b1d111da8ac0e1b9':

9 years agoam 83bae4aa: am bc667f1c: am 08f336ea: fix regression from Change-Id: I88c1e8192f1cbb...
smain@google.com [Mon, 3 Nov 2014 20:33:34 +0000 (20:33 +0000)]
am 83bae4aa: am bc667f1c: am 08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working automerge: 36b1de7

* commit '83bae4aad4df090d30435249941fd5348aa69b16':

9 years agoam 358c5fe5: am f4cefc19: am 633f322b: update the analytics tracking event calls...
smain@google.com [Mon, 3 Nov 2014 20:33:32 +0000 (20:33 +0000)]
am 358c5fe5: am f4cefc19: am 633f322b: update the analytics tracking event calls to use new API for analytics.js bug: 16331906 automerge: 40e1d35

* commit '358c5fe5f70d263fdc3bc66c283d4f680076b6e0':

9 years agoam bc667f1c: am 08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9...
smain@google.com [Mon, 3 Nov 2014 20:23:32 +0000 (20:23 +0000)]
am bc667f1c: am 08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
automerge: 36b1de7

* commit '36b1de7334f82a7df3728597f0437aedb02dccef':

9 years agoam f4cefc19: am 633f322b: update the analytics tracking event calls to use new API...
smain@google.com [Mon, 3 Nov 2014 20:21:13 +0000 (20:21 +0000)]
am f4cefc19: am 633f322b: update the analytics tracking event calls to use new API for analytics.js bug: 16331906
automerge: 40e1d35

* commit '40e1d35527098ed10c50e1509d7dee9fa9b19c97':

9 years agoam 394ee3b8: am 4a8fd5fd: am 80e38f48: remove cookie expiration and add max-age of...
smain@google.com [Mon, 3 Nov 2014 20:09:27 +0000 (20:09 +0000)]
am 394ee3b8: am 4a8fd5fd: am 80e38f48: remove cookie expiration and add max-age of 2 years. bug: 17781603

* commit '394ee3b8fed94ee02e2612af8bb094f396cce5c8':
  remove cookie expiration and add max-age of 2 years. bug: 17781603

9 years agoam de5dc9a5: am f51f30d7: remove cookie expiration and add max-age of 2 years. bug...
smain@google.com [Mon, 3 Nov 2014 20:05:00 +0000 (20:05 +0000)]
am de5dc9a5: am f51f30d7: remove cookie expiration and add max-age of 2 years. bug: 17781603

* commit 'de5dc9a56439bdfb049c4a7fb060d6274f076e19':
  remove cookie expiration and add max-age of 2 years. bug: 17781603

9 years agoam 4a8fd5fd: am 80e38f48: remove cookie expiration and add max-age of 2 years. bug...
smain@google.com [Mon, 3 Nov 2014 20:03:02 +0000 (20:03 +0000)]
am 4a8fd5fd: am 80e38f48: remove cookie expiration and add max-age of 2 years. bug: 17781603

* commit '4a8fd5fdd2bbbe1afa27e65738aae77aeb60c172':
  remove cookie expiration and add max-age of 2 years. bug: 17781603

9 years agoam f51f30d7: remove cookie expiration and add max-age of 2 years. bug: 17781603
smain@google.com [Mon, 3 Nov 2014 19:57:38 +0000 (19:57 +0000)]
am f51f30d7: remove cookie expiration and add max-age of 2 years. bug: 17781603

* commit 'f51f30d7f10a32e07a081b799d9ae601be08276c':
  remove cookie expiration and add max-age of 2 years. bug: 17781603

9 years agoam 80e38f48: remove cookie expiration and add max-age of 2 years. bug: 17781603
smain@google.com [Mon, 3 Nov 2014 19:52:41 +0000 (19:52 +0000)]
am 80e38f48: remove cookie expiration and add max-age of 2 years. bug: 17781603

* commit '80e38f4872941cbf0114ad80e260993f1eafc14c':
  remove cookie expiration and add max-age of 2 years. bug: 17781603

9 years agoremove cookie expiration and add max-age of 2 years.
smain@google.com [Mon, 3 Nov 2014 18:47:12 +0000 (10:47 -0800)]
remove cookie expiration and add max-age of 2 years.
bug: 17781603

Change-Id: Idab3cae786fde4d0318ba03d3c7f5f678882b815
(cherry picked from commit f51f30d7f10a32e07a081b799d9ae601be08276c)

9 years agoremove cookie expiration and add max-age of 2 years.
smain@google.com [Mon, 3 Nov 2014 18:47:12 +0000 (10:47 -0800)]
remove cookie expiration and add max-age of 2 years.
bug: 17781603

Change-Id: Idab3cae786fde4d0318ba03d3c7f5f678882b815

9 years agoMerge "Add support for prebuilt AARs." into lmp-mr1-ub-dev
Ying Wang [Mon, 3 Nov 2014 18:04:39 +0000 (18:04 +0000)]
Merge "Add support for prebuilt AARs." into lmp-mr1-ub-dev

9 years agoam b6dfc2d2: am 963afcbb: am 9b7f8f20: Doc change: start search suggestions at two...
Dirk Dougherty [Mon, 3 Nov 2014 17:58:57 +0000 (17:58 +0000)]
am b6dfc2d2: am 963afcbb: am 9b7f8f20: Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.

* commit 'b6dfc2d2f7a92536b72bd55ed8a7829d7f7b41fa':
  Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.

9 years agoam 963afcbb: am 9b7f8f20: Doc change: start search suggestions at two characters...
Dirk Dougherty [Mon, 3 Nov 2014 17:53:28 +0000 (17:53 +0000)]
am 963afcbb: am 9b7f8f20: Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.

* commit '963afcbb501d8757f049b25f5068313ee63ce4e8':
  Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.

9 years agoam 9b7f8f20: Doc change: start search suggestions at two characters instead of three...
Dirk Dougherty [Mon, 3 Nov 2014 17:43:20 +0000 (17:43 +0000)]
am 9b7f8f20: Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.

* commit '9b7f8f20ac58133af551bc89e5f065a4e0f77103':
  Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.

9 years agoAdd support for prebuilt AARs.
Ying Wang [Wed, 29 Oct 2014 22:48:32 +0000 (15:48 -0700)]
Add support for prebuilt AARs.

- You can give a .aar as source file to a prebuilt static Java library
  module. The build system will set up dependencies and rules to extract
  classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
  LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
  The build system will set up rules to merge the library's
  AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
  resource dirs and link/merge the AAR's classes.jar.

Bug: 18168693
Change-Id: Ic2c1d20572a93bd98dbc72f8a39e26b459e442c2

9 years agoMerge "Revert "Add support for prebuilt AARs."" into lmp-mr1-ub-dev
Nick Kralevich [Sun, 2 Nov 2014 05:15:26 +0000 (05:15 +0000)]
Merge "Revert "Add support for prebuilt AARs."" into lmp-mr1-ub-dev

9 years agoRevert "Add support for prebuilt AARs."
Nick Kralevich [Sun, 2 Nov 2014 05:11:11 +0000 (05:11 +0000)]
Revert "Add support for prebuilt AARs."

master doesn't compile anymore.

This reverts commit f56729250448200834c5c95c86c937e887d73623.

Change-Id: Icc16fe5360d1222740b803e9dd006081e3c66e46

9 years agoDoc change: start search suggestions at two characters instead of three, so that...
Dirk Dougherty [Sun, 2 Nov 2014 00:08:56 +0000 (17:08 -0700)]
Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.

Change-Id: Ib7968010b0d0707a82ec51b1e63611628b8d465a

9 years agoam fd0f1c84: Replacement for gdbclient
Dmitriy Ivanov [Sun, 2 Nov 2014 00:42:26 +0000 (00:42 +0000)]
am fd0f1c84: Replacement for gdbclient

* commit 'fd0f1c848f012f2e215f8246b154237c7d6c5132':
  Replacement for gdbclient

9 years agoReplacement for gdbclient
Dmitriy Ivanov [Fri, 31 Oct 2014 05:00:17 +0000 (22:00 -0700)]
Replacement for gdbclient

 Differences between this implementation and the old one:
 1. Resolves symbols/gdb based on device information (lunch
    target is irrelevant)
 2. Works with downloaded from build-server symbols
 3. Does not require user to specify exe file - detects it automatically

Bug: 18208329

(cherry picked from commit 9b8e4b377208db6d405bc84e9af73bd37f75a93c)

Change-Id: I13ae2debb6e2d827b9aa55e93864b5d60c2bd32e

9 years agoam 4c93719e: Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat...
Igor Murashkin [Fri, 31 Oct 2014 22:44:15 +0000 (22:44 +0000)]
am 4c93719e: Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files" into lmp-mr1-dev

* commit '4c93719e3010d39c212e73c975a27ec76d4c1fb0':
  core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files

9 years agoMerge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files" into...
Igor Murashkin [Fri, 31 Oct 2014 22:36:42 +0000 (22:36 +0000)]
Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files" into lmp-mr1-dev

9 years agoam be6a3db2: Merge "Introduce per-product per-module dex-preopt config" into lmp...
Ying Wang [Fri, 31 Oct 2014 21:48:56 +0000 (21:48 +0000)]
am be6a3db2: Merge "Introduce per-product per-module dex-preopt config" into lmp-mr1-dev

* commit 'be6a3db20b5d2242bc3b459c5b69b1d8ef86aa54':
  Introduce per-product per-module dex-preopt config

9 years agoMerge "Introduce per-product per-module dex-preopt config" into lmp-mr1-dev
Ying Wang [Fri, 31 Oct 2014 21:42:48 +0000 (21:42 +0000)]
Merge "Introduce per-product per-module dex-preopt config" into lmp-mr1-dev

9 years agocore: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
Igor Murashkin [Thu, 30 Oct 2014 23:08:07 +0000 (16:08 -0700)]
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
Change-Id: Ifd517c842f48bf31568bf5ff56667298d422c2c0

9 years agoam 248f4d53: envsetup.sh: add functions to enable and generate core dumps
Iliyan Malchev [Fri, 31 Oct 2014 21:02:59 +0000 (21:02 +0000)]
am 248f4d53: envsetup.sh: add functions to enable and generate core dumps

* commit '248f4d53b306bd3baddb1534d3d06076460e83d4':
  envsetup.sh: add functions to enable and generate core dumps

9 years agoenvsetup.sh: add functions to enable and generate core dumps
Iliyan Malchev [Wed, 29 Oct 2014 01:00:42 +0000 (18:00 -0700)]
envsetup.sh: add functions to enable and generate core dumps

The shell functions in this patch enable crashing processes with the core limit
set correctly to dump core in directory /cores.  They do so by remounting the
root partition, which is RAM-backed, and by creating the 0777-chmodded /cores
under it. They also set the core file pattern in /proc/sys/kernel/core_pattern
to be /cores/core.%p, such that a core dump will have the crashing process' PID
appended to it.  You enable core-dump generation once per boot, as follows:

coredump-setup

If a process does not have its core-size rlimit set (as most do not), you can
either set it manually by typing "adb shell prlimit <pid> 4 -1 -1", or by
typing coredump-enable <name>, e.g.

coredump-enable $(pid mediaserver)

Alternatively, you can cause a running process to dump core by sending it a
SIGSEGV via the shell function core <name>, e.g.:

core $(pid mediaserver)

Change-Id: Ib174e7ee95515fb9866fa6bf0d5b5bf23f3ec61b
Signed-off-by: Iliyan Malchev <malchev@google.com>
9 years agoIntroduce per-product per-module dex-preopt config
Ying Wang [Wed, 8 Oct 2014 01:07:23 +0000 (18:07 -0700)]
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 20ebd2ef081f2a3e85a4adcf8837e6f5b68bdeea)

Change-Id: I2ee36892b40655c96837ee7a663dda1d25830878

9 years agoAdd support for prebuilt AARs.
Ying Wang [Wed, 29 Oct 2014 22:48:32 +0000 (15:48 -0700)]
Add support for prebuilt AARs.

- You can give a .aar as source file to a prebuilt static Java library
  module. The build system will set up dependencies and rules to extract
  classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
  LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
  The build system will set up rules to merge the library's
  AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
  resource dirs and link/merge the AAR's classes.jar.

Bug: 18168693
Change-Id: I478913d5d498f800b322529d7c2c2c0ea78425e5

9 years agoam 63f01de8: Add post-install verification phase
Michael Runge [Wed, 29 Oct 2014 18:51:51 +0000 (18:51 +0000)]
am 63f01de8: Add post-install verification phase

* commit '63f01de81892aa4e40b517464b3d9ca7db666c9d':
  Add post-install verification phase

9 years agoAdd post-install verification phase
Michael Runge [Wed, 29 Oct 2014 02:24:19 +0000 (19:24 -0700)]
Add post-install verification phase

Verify the SHA sum of all patched and extracted files after
a file system remount.

Bug: 18145574

Change-Id: I2f053d085543e10e39153a774542d37ee0a238bd

9 years agoam 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsula...
smain@google.com [Tue, 28 Oct 2014 23:26:41 +0000 (23:26 +0000)]
am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
automerge: d1ab4cb

* commit 'd1ab4cb3b4ca8de66a873abb072bd73556926d4d':
  add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.

9 years agoMerge "Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings" into...
Adam Lesinski [Tue, 28 Oct 2014 17:41:29 +0000 (17:41 +0000)]
Merge "Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings" into lmp-mr1-dev

9 years agoStore symbols.zip in apps_only build.
Ying Wang [Tue, 28 Oct 2014 00:15:59 +0000 (00:15 +0000)]
Store symbols.zip in apps_only build.
automerge: a60fb49

* commit 'a60fb49704946b9d5cf0551ddd56bd1072131b85':
  Store symbols.zip in apps_only build.

9 years agoAdd -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings
Adam Lesinski [Mon, 27 Oct 2014 21:26:35 +0000 (14:26 -0700)]
Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings

It's better practice to include the minimal set of windows APIs anyways
and we're not doing anything that requires more.

Change-Id: I1b4362be4f707738b9cfbd6a87caabff8b8409ac

9 years agoStore symbols.zip in apps_only build.
Ying Wang [Fri, 24 Oct 2014 18:36:59 +0000 (11:36 -0700)]
Store symbols.zip in apps_only build.

Bug: 18103055
Change-Id: I0eb335e944138b0edc3050d19c076891f499a07c

9 years agoam 775b1abb: core: Fixup bad ext4 mount options for recovery (pick common denominator)
JP Abgrall [Fri, 24 Oct 2014 02:57:34 +0000 (02:57 +0000)]
am 775b1abb: core: Fixup bad ext4 mount options for recovery (pick common denominator)

* commit '775b1abb12a5d891ac66b51d28381692bde6ab03':
  core: Fixup bad ext4 mount options for recovery (pick common denominator)

9 years agocore: Fixup bad ext4 mount options for recovery (pick common denominator)
JP Abgrall [Thu, 23 Oct 2014 23:27:03 +0000 (16:27 -0700)]
core: Fixup bad ext4 mount options for recovery (pick common denominator)

Some ext4 options were not suitable for all kernel versions.
The current option were checked against kernels 3.0 3.4 3.10.

Bug: 18092222
Change-Id: I30883706e5c8ac7a318f4b448d4becde50de808f

9 years agoam fb8886db: get_stage in updater takes one param, not two.
Michael Runge [Thu, 23 Oct 2014 21:57:12 +0000 (21:57 +0000)]
am fb8886db: get_stage in updater takes one param, not two.

* commit 'fb8886db6858388af5082268fd023b8a44fb87ea':
  get_stage in updater takes one param, not two.