git.osdn.net Git - android-x86/build.git/log

Merge \\\\"Add jdk.net to whitelist\\\\" am: d2f4cbbf88 am: 09d7992067 am: 3fc2a2c326
am: e07bf4a87f

Change-Id: Iaea2dc1b573f0a2d5b45208ab739ad673d233542

Merge \\\"Add jdk.net to whitelist\\\" am: d2f4cbbf88 am: 09d7992067
am: 3fc2a2c326

Change-Id: I5939b0d36c8366ff2935ede6d295601951714e62

Merge \\"Add jdk.net to whitelist\\" am: d2f4cbbf88
am: 09d7992067

Change-Id: I8f76af8ade472df24a7adaee133106cd6c54c2c3

Merge \"Add jdk.net to whitelist\"
am: d2f4cbbf88

Change-Id: I80f7f529659953fd5664211e2a779d09e2245d34

Merge "Add jdk.net to whitelist"

commit | commitdiff | tree

Badhri Jagan Sridharan [Wed, 29 Jun 2016 00:00:39 +0000 (00:00 +0000)]

Merge \\\\"Extract public key ID from cert\\\\" am: 606ad22def am: 45373976b1 am: c493619938 -s ours
am: eb53532b77

Change-Id: I622d749bf860539c80c1a348debd3e2e8d77a0b3

commit | commitdiff | tree

Badhri Jagan Sridharan [Tue, 28 Jun 2016 23:58:05 +0000 (23:58 +0000)]

Merge \\\"Extract public key ID from cert\\\" am: 606ad22def am: 45373976b1
am: c493619938 -s ours

Change-Id: I67700423a0ea58410c774a324f4f5a78a4b7d59e

commit | commitdiff | tree

Badhri Jagan Sridharan [Tue, 28 Jun 2016 23:42:47 +0000 (23:42 +0000)]

Merge \\"Extract public key ID from cert\\" am: 606ad22def
am: 45373976b1

Change-Id: I2d1d174d25aee419cd666ad9a69a8a590645af42

commit | commitdiff | tree

Badhri Jagan Sridharan [Tue, 28 Jun 2016 23:40:22 +0000 (23:40 +0000)]

Merge \"Extract public key ID from cert\"
am: 606ad22def

Change-Id: Idfc1ff8ec8766d4b15a5b1908a8eb830e28b42f3

commit | commitdiff | tree

Badhri Jagan Sridharan [Tue, 28 Jun 2016 23:36:22 +0000 (23:36 +0000)]

Merge "Extract public key ID from cert"

commit | commitdiff | tree

Badhri Jagan Sridharan [Sat, 30 Apr 2016 01:20:13 +0000 (18:20 -0700)]

Extract public key ID from cert

Extracts keyid inline using openssl commands.
The keyid is passed as one of the kernel command line parameters
for the dm-android-verity module to mount root fs(system)
with verity enabled.

(cherry-picked from 3af315aed5d657942b28ccae342324b9ee90116d
https://googleplex-android-review.git.corp.google.com/#/c/1061691/)

BUG: 28384658
Change-Id: I8efbe1b0e415ef1d396f9b51cfa4b3fa01b22484

commit | commitdiff | tree

Badhri Jagan Sridharan [Tue, 28 Jun 2016 22:48:57 +0000 (22:48 +0000)]

resolve merge conflicts of 00046ad to nyc-mr1-dev-plus-aosp
am: 9898553d62

Change-Id: Ifef382829f0ace4d489302726220bbc3c08f19dc

commit | commitdiff | tree

Badhri Jagan Sridharan [Tue, 28 Jun 2016 22:18:58 +0000 (15:18 -0700)]

resolve merge conflicts of 00046ad to nyc-mr1-dev-plus-aosp

Change-Id: I9540ecace4b20e8931fdf591e2d6604caf194f4c

commit | commitdiff | tree

Badhri Jagan Sridharan [Tue, 28 Jun 2016 21:30:14 +0000 (21:30 +0000)]

Merge "Add build variant to kernel command line" into nyc-mr1-dev

commit | commitdiff | tree

Dan Willemsen [Tue, 28 Jun 2016 19:56:03 +0000 (19:56 +0000)]

Merge \\\\"Turn unused source files from warning to error\\\\" am: 73609480b3 am: 90f03ecfee am: 46b4d7aa8f
am: 959e62c54f

Change-Id: I61c6ae6d76649509e0e7dc8177dc8679fa544a96

commit | commitdiff | tree

Dan Willemsen [Tue, 28 Jun 2016 19:53:37 +0000 (19:53 +0000)]

Merge \\\"Turn unused source files from warning to error\\\" am: 73609480b3 am: 90f03ecfee
am: 46b4d7aa8f

Change-Id: I52d276c2154214967373a6e0b9997fdf60be8265

commit | commitdiff | tree

Dan Willemsen [Tue, 28 Jun 2016 19:51:00 +0000 (19:51 +0000)]

Merge \\"Turn unused source files from warning to error\\" am: 73609480b3
am: 90f03ecfee

Change-Id: Ib350a58be93424cba2d9c18a55c40fce12af852e

commit | commitdiff | tree

Dan Willemsen [Tue, 28 Jun 2016 19:48:32 +0000 (19:48 +0000)]

Merge \"Turn unused source files from warning to error\"
am: 73609480b3

Change-Id: Iddedac74a78968eb438bddae1e22633ba8c13375

commit | commitdiff | tree

Treehugger Robot [Tue, 28 Jun 2016 19:41:39 +0000 (19:41 +0000)]

Merge "Turn unused source files from warning to error"

commit | commitdiff | tree

Allen Hair [Tue, 28 Jun 2016 18:33:49 +0000 (18:33 +0000)]

Merge \\\"DO NOT MERGE Skip emma instrumentation if we\\\'re using jack.\\\" into nyc-dev am: 1f44c26b1e -s ours am: 1f016493ca
am: 0168788d0e -s ours

Change-Id: I4ae9298074c1ebbce6dd737189de3e50018a6ae8

commit | commitdiff | tree

Allen Hair [Tue, 28 Jun 2016 18:30:39 +0000 (18:30 +0000)]

Merge \\"DO NOT MERGE Skip emma instrumentation if we\\'re using jack.\\" into nyc-dev am: 1f44c26b1e -s ours
am: 1f016493ca

Change-Id: I93d32080e46da6ea3494406e04d2cb2e292fcc20

commit | commitdiff | tree

Allen Hair [Tue, 28 Jun 2016 18:30:39 +0000 (18:30 +0000)]

Merge \\\"DO NOT MERGE Skip emma instrumentation if we\\\'re using jack.\\\" into nyc-dev am: 1f44c26b1e am: 49fd8a24f3 -s ours
am: 71a4f80ee9 -s ours

Change-Id: Ia9e731b70918e47abd0de2b243ac59056ab90230

commit | commitdiff | tree

Allen Hair [Tue, 28 Jun 2016 18:25:43 +0000 (18:25 +0000)]

Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev
am: 1f44c26b1e -s ours

Change-Id: I2c7de4484b78f31d83ae04c8e3c591e22d222689

commit | commitdiff | tree

Allen Hair [Tue, 28 Jun 2016 18:25:39 +0000 (18:25 +0000)]

Merge \\"DO NOT MERGE Skip emma instrumentation if we\\'re using jack.\\" into nyc-dev am: 1f44c26b1e
am: 49fd8a24f3 -s ours

Change-Id: I9a51bcb269dc9554e1389a00cf75b95f9bb6bbe6

commit | commitdiff | tree

Allen Hair [Tue, 28 Jun 2016 17:53:00 +0000 (17:53 +0000)]

Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev
am: 1f44c26b1e

Change-Id: I25d45b0d0d490d6cc3f80871fcf69bd9f1857216

commit | commitdiff | tree

Allen Hair [Tue, 28 Jun 2016 17:45:17 +0000 (17:45 +0000)]

Merge "DO NOT MERGE Skip emma instrumentation if we're using jack." into nyc-dev

commit | commitdiff | tree

Dan Willemsen [Tue, 28 Jun 2016 17:22:08 +0000 (10:22 -0700)]

Turn unused source files from warning to error

All instances have disappeared from the build server, so switch this to
error before more turn up.

Change-Id: Iac07526a6e77ebf33733033249f2a108aae3fa7d

commit | commitdiff | tree

Hung-ying Tyan [Tue, 28 Jun 2016 06:33:10 +0000 (06:33 +0000)]

Merge \\\\"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\\\\" am: 2acb2d5bcf am: 200da242a5 am: 00e23a1d8f
am: c028287fcd

Change-Id: I0fc13a4edce45f7bf014890d49c0002320b9fe5a

commit | commitdiff | tree

Hung-ying Tyan [Tue, 28 Jun 2016 06:27:13 +0000 (06:27 +0000)]

Merge \\\"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\\\" am: 2acb2d5bcf am: 200da242a5
am: 00e23a1d8f

Change-Id: Ibf7c1fdeb9994b7c12ac3dd2fa8d8dec53b7d276

commit | commitdiff | tree

Hung-ying Tyan [Tue, 28 Jun 2016 06:24:48 +0000 (06:24 +0000)]

Merge \\"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\\" am: 2acb2d5bcf
am: 200da242a5

Change-Id: I93d1b301c23265e783e68de5e066606764b90ffc

commit | commitdiff | tree

Hung-ying Tyan [Tue, 28 Jun 2016 06:22:17 +0000 (06:22 +0000)]

Merge \"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\"
am: 2acb2d5bcf

Change-Id: I3c151949bcc6b8d75f2c46619b6ce38561084338

commit | commitdiff | tree

Treehugger Robot [Tue, 28 Jun 2016 06:17:32 +0000 (06:17 +0000)]

Merge "Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES"

commit | commitdiff | tree

Hung-ying Tyan [Fri, 20 May 2016 11:08:30 +0000 (19:08 +0800)]

Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES

Allow exceptions specified by module (VENDOR_EXCEPTION_MODULES) and
path (VENDOR_EXCEPTION_PATHS, not including leading vendor/).

BUG=26968426

Change-Id: I068e43f3eae14f8793c33ae916d46979ab1681d1

commit | commitdiff | tree

Ethan Xia [Tue, 28 Jun 2016 02:04:54 +0000 (02:04 +0000)]

Merge \\\\"releasetools: Change the default key path for bvbtool\\\\" am: 7c7571d510 am: 090e8eff5e am: e4efe69fae
am: 886846300d

Change-Id: I213b1ae5cf224f8ec5a10cd74c5a76fc647472de

commit | commitdiff | tree

Ethan Xia [Tue, 28 Jun 2016 02:02:12 +0000 (02:02 +0000)]

Merge \\\"releasetools: Change the default key path for bvbtool\\\" am: 7c7571d510 am: 090e8eff5e
am: e4efe69fae

Change-Id: If1d96c88a42d3894d7c9bccef6064f159bf185d2

commit | commitdiff | tree

Ethan Xia [Tue, 28 Jun 2016 01:59:47 +0000 (01:59 +0000)]

Merge \\"releasetools: Change the default key path for bvbtool\\" am: 7c7571d510
am: 090e8eff5e

Change-Id: I34f3cc1a38b860fd3100548f55a38af9faf69e19

commit | commitdiff | tree

Ethan Xia [Tue, 28 Jun 2016 01:57:26 +0000 (01:57 +0000)]

Merge \"releasetools: Change the default key path for bvbtool\"
am: 7c7571d510

Change-Id: Ic02f432c689edba37ecce684662d8f5f1cfc32b6

commit | commitdiff | tree

Treehugger Robot [Tue, 28 Jun 2016 01:52:36 +0000 (01:52 +0000)]

Merge "releasetools: Change the default key path for bvbtool"

commit | commitdiff | tree

Andreas Gampe [Tue, 28 Jun 2016 00:40:52 +0000 (00:40 +0000)]

Build: Add module-level product configuration of sanitization am: bb5454b6db
am: 2bc0421ef0

Change-Id: If3eab831cb6bb12fe49a08d1616a8b57b4df737e

commit | commitdiff | tree

Andreas Gampe [Tue, 28 Jun 2016 00:38:26 +0000 (00:38 +0000)]

Build: Add module-level product configuration of sanitization
am: bb5454b6db

Change-Id: I03c598091f51e179d278bfabaf3345f3cccc45d6

commit | commitdiff | tree

Allen Hair [Mon, 27 Jun 2016 19:32:50 +0000 (12:32 -0700)]

DO NOT MERGE Skip emma instrumentation if we're using jack.

Bug: 29777843
Change-Id: I09071ef08e0b2fe64a78cfd6d81c73aa9b80967f

commit | commitdiff | tree

Andreas Gampe [Mon, 27 Jun 2016 22:15:31 +0000 (15:15 -0700)]

Build: Add module-level product configuration of sanitization

To allow special sanitizer settings for modules shared between
products, add product-specific module settings.

This was copied from the product-specific dexopt settings.

Bug: 29498013
Change-Id: I17a96b975bb6ac7f4ffb3d5b08e2f00b21bd97a1

commit | commitdiff | tree

Ethan Xia [Mon, 27 Jun 2016 09:19:01 +0000 (17:19 +0800)]

releasetools: Change the default key path for bvbtool

The bvb path has been changed from 'system/bvb' to 'external/bvb'

Change-Id: I8587351b7d702a287883c6bd3c9de1cd3540435b

commit | commitdiff | tree

Dan Sandler [Sun, 26 Jun 2016 23:14:00 +0000 (23:14 +0000)]

Merge \\\"The easter egg is now its own APK.\\\" into nyc-dev am: 18ecea3986 am: e4224c46cb
am: 86b3671d81

Change-Id: I8fcf05f31dff419ed297292639b9b3c66c95fffb

commit | commitdiff | tree

Ian Pedowitz [Sun, 26 Jun 2016 23:07:35 +0000 (23:07 +0000)]

Merge \\"The easter egg is now its own APK.\\" into nyc-dev am: 18ecea3986
am: e4224c46cb

Change-Id: I7d05801270e0a938048a5f2fc505e3cd8630a42d

commit | commitdiff | tree

Dan Sandler [Sun, 26 Jun 2016 23:07:28 +0000 (23:07 +0000)]

Merge \\\"The easter egg is now its own APK.\\\" into nyc-dev am: 18ecea3986 am: 377d5bdb3f
am: c3e2c808de

Change-Id: I5510ccc04c4b3b1b334d8525bb5c0569d569b5ab

commit | commitdiff | tree

Ian Pedowitz [Sun, 26 Jun 2016 23:03:00 +0000 (23:03 +0000)]

Merge \\"The easter egg is now its own APK.\\" into nyc-dev am: 18ecea3986
am: 377d5bdb3f

Change-Id: I11f7501dcf768397acc4cfc74eee58d27013b6a4

commit | commitdiff | tree

Dan Sandler [Sun, 26 Jun 2016 22:56:05 +0000 (22:56 +0000)]

Merge \"The easter egg is now its own APK.\" into nyc-dev
am: 18ecea3986

Change-Id: I4712931d6e73ecb08dae76b77ad12585a914882b

commit | commitdiff | tree

Dan Sandler [Sun, 26 Jun 2016 22:56:03 +0000 (22:56 +0000)]

Merge \"The easter egg is now its own APK.\" into nyc-dev
am: 18ecea3986

Change-Id: Ica7456ab7bf01dba0f294fce3720b0e19db02f38

commit | commitdiff | tree

Ian Pedowitz [Sun, 26 Jun 2016 22:50:44 +0000 (22:50 +0000)]

Merge "The easter egg is now its own APK." into nyc-dev

commit | commitdiff | tree

Dan Sandler [Sat, 25 Jun 2016 14:54:39 +0000 (10:54 -0400)]

The easter egg is now its own APK.

It should be included wherever SystemUI is.

Bug: 27376882
Change-Id: Ibe2688c86e58bdfb8a5278c9c4939d7cdb524078

commit | commitdiff | tree

Christopher Wiley [Fri, 24 Jun 2016 21:37:01 +0000 (21:37 +0000)]

Merge \\\\"Fix typo in setting PRIVATE_MODULE for AIDL source\\\\" am: 05038d84dc am: 2ee4f68d38 am: 28db78a499
am: ef2a8bc195

Change-Id: I0f0932e507a4ab57eb6e7e9ee26fe756d7c64c31

commit | commitdiff | tree

Christopher Wiley [Fri, 24 Jun 2016 21:34:33 +0000 (21:34 +0000)]

Merge \\\"Fix typo in setting PRIVATE_MODULE for AIDL source\\\" am: 05038d84dc am: 2ee4f68d38
am: 28db78a499

Change-Id: I2f87f686a2083c12faa087b4601ff81f5936cea7

commit | commitdiff | tree

Christopher Wiley [Fri, 24 Jun 2016 21:32:07 +0000 (21:32 +0000)]

Merge \\"Fix typo in setting PRIVATE_MODULE for AIDL source\\" am: 05038d84dc
am: 2ee4f68d38

Change-Id: Ifd141422ed041b077ba1f3c098b85b8d93feda42

commit | commitdiff | tree

Christopher Wiley [Fri, 24 Jun 2016 21:29:55 +0000 (21:29 +0000)]

Merge \"Fix typo in setting PRIVATE_MODULE for AIDL source\"
am: 05038d84dc

Change-Id: I3fb16f448c48e9e14fb4e7080c2955c3d38c6d11

commit | commitdiff | tree

Treehugger Robot [Fri, 24 Jun 2016 21:16:23 +0000 (21:16 +0000)]

Merge "Fix typo in setting PRIVATE_MODULE for AIDL source"

commit | commitdiff | tree

Christopher Wiley [Fri, 24 Jun 2016 20:13:52 +0000 (13:13 -0700)]

Fix typo in setting PRIVATE_MODULE for AIDL source

Bug: 29619260
Change-Id: I59f883c1a92075800844cc2a77b307782a9ab800

commit | commitdiff | tree

Chih-hung Hsieh [Fri, 24 Jun 2016 18:26:26 +0000 (18:26 +0000)]

Merge \\\\"Add +/- buttons to expand/collapse warning categories.\\\\" am: 4837ce8ca6 am: 320d126394 am: a612b58464
am: 1a256fac08

Change-Id: I0597dcf0e06ab5e58d8fff9ed2a8e73b7e1842ce

commit | commitdiff | tree

David Sehr [Fri, 24 Jun 2016 18:26:26 +0000 (18:26 +0000)]

Merge \\\\"Filter logging from dexdump/dex2oat to errors only\\\\" am: be6b4fc1b3 am: 5efb73504d am: 0aa5ad21f1
am: d17cce2f60

Change-Id: I37c6c738f02750b403ff43b1b4f79d9b6fc6a687

commit | commitdiff | tree

Chih-Hung Hsieh [Fri, 24 Jun 2016 18:21:46 +0000 (18:21 +0000)]

Merge \\\"Add +/- buttons to expand/collapse warning categories.\\\" am: 4837ce8ca6 am: 320d126394
am: a612b58464

Change-Id: I3b1bc8ad038e92c2fec7029f2ecc526629424ae2

commit | commitdiff | tree

David Sehr [Fri, 24 Jun 2016 18:21:45 +0000 (18:21 +0000)]

Merge \\\"Filter logging from dexdump/dex2oat to errors only\\\" am: be6b4fc1b3 am: 5efb73504d
am: 0aa5ad21f1

Change-Id: Ifd4960cce511b284fc11661d23f78a4476a42a47

commit | commitdiff | tree

Chih-hung Hsieh [Fri, 24 Jun 2016 18:17:05 +0000 (18:17 +0000)]

Merge \\"Add +/- buttons to expand/collapse warning categories.\\" am: 4837ce8ca6
am: 320d126394

Change-Id: I637c546da197a7d9cc6b1ea91dc6f45f51f7ecda

commit | commitdiff | tree

David Sehr [Fri, 24 Jun 2016 18:17:04 +0000 (18:17 +0000)]

Merge \\"Filter logging from dexdump/dex2oat to errors only\\" am: be6b4fc1b3
am: 5efb73504d

Change-Id: I3a39624a5ce329f67c30ce71b00f685abd14f569

commit | commitdiff | tree

Tianjie Xu [Fri, 24 Jun 2016 18:12:38 +0000 (18:12 +0000)]

Merge \\"Avoid writing too much new data per transfer\\" into nyc-mr1-dev am: 21e6dde63c
am: 5af8cf9732

Change-Id: Ife118451bc1e39ee3af29cd760d0867e27ed6ca9

commit | commitdiff | tree

Tianjie Xu [Fri, 24 Jun 2016 18:12:13 +0000 (18:12 +0000)]

Merge \"Avoid writing too much new data per transfer\" into nyc-mr1-dev
am: 21e6dde63c

Change-Id: I4d9fae702e81cea01a0a602247e629e71dd4efc7

commit | commitdiff | tree

Chih-Hung Hsieh [Fri, 24 Jun 2016 18:12:10 +0000 (18:12 +0000)]

Merge \"Add +/- buttons to expand/collapse warning categories.\"
am: 4837ce8ca6

Change-Id: I56057da6bae847533cc59e9881e364f632927cd9

commit | commitdiff | tree

David Sehr [Fri, 24 Jun 2016 18:12:08 +0000 (18:12 +0000)]

Merge \"Filter logging from dexdump/dex2oat to errors only\"
am: be6b4fc1b3

Change-Id: Ib938b1bbf29e482d02c2c3b7d5a5948ba2afee9a

commit | commitdiff | tree

Ian Pedowitz [Fri, 24 Jun 2016 18:12:08 +0000 (18:12 +0000)]

Merge \\"Revert \\"Revert \\"Revert \\"Removing N from PLATFORM_VERSION_ALL_CODENAMES\\"\\"\\"\\" into nyc-mr1-dev am: 47383ac698
am: 3f93d12a4b -s ours

Change-Id: I665053709b39af3e80f601ba2a5ba0d5e61188cc

commit | commitdiff | tree

Chih-hung Hsieh [Fri, 24 Jun 2016 18:07:44 +0000 (18:07 +0000)]

Merge "Add +/- buttons to expand/collapse warning categories."

commit | commitdiff | tree

David Sehr [Fri, 24 Jun 2016 18:07:07 +0000 (18:07 +0000)]

Merge "Filter logging from dexdump/dex2oat to errors only"

commit | commitdiff | tree

Tianjie Xu [Fri, 24 Jun 2016 18:06:22 +0000 (18:06 +0000)]

Merge "Avoid writing too much new data per transfer" into nyc-mr1-dev

commit | commitdiff | tree

Ian Pedowitz [Fri, 24 Jun 2016 18:02:16 +0000 (18:02 +0000)]

Merge \"Revert \"Revert \"Revert \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\"\"\"\" into nyc-mr1-dev
am: 47383ac698

Change-Id: Ie77c32e654c396f59e92afdbd038d9c1ac4b211a

Add jdk.net to whitelist

Tracks libcore commit a434f3be3c22c6b3e7ddd426766808e76a5780fd

Bug: 29067535
Change-Id: I764b602aa0f2a991dc26b5fd42a1143bb58d67ba

commit | commitdiff | tree

Ian Pedowitz [Fri, 24 Jun 2016 17:53:02 +0000 (17:53 +0000)]

Merge "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""

commit | commitdiff | tree

Ian Pedowitz [Fri, 24 Jun 2016 17:53:00 +0000 (17:53 +0000)]

Merge "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""" into nyc-mr1-dev

commit | commitdiff | tree

Ian Pedowitz [Fri, 24 Jun 2016 17:52:33 +0000 (17:52 +0000)]

Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""

This reverts commit 091fa1edc91a45413650c7243f16d2aa82e1f61f.

Bug: 29117805
Bug: 28809789
Bug: 29621988
Change-Id: Ia127709ada69444a6c252f3e583835d4a4fcbeb8

commit | commitdiff | tree

Ian Pedowitz [Fri, 24 Jun 2016 17:52:29 +0000 (17:52 +0000)]

Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""

This reverts commit 369efe3d84f059ba41560d6522520c747f1274b2.

Bug: 29117805
Bug: 28809789
Bug: 29621988
Change-Id: Icd9e01d4cbd3f769237702f5df287eb61c7527cd

commit | commitdiff | tree

Christopher Wiley [Fri, 24 Jun 2016 16:32:20 +0000 (16:32 +0000)]

Merge \\\\"Fix path escaping for aidl generated java\\\\" am: 7e918b6a46 am: 752860dcfc am: 36b50e7897
am: fdf4f7ea21

Change-Id: I9ff51ce190c7c825666a89279558b448d7c10260

commit | commitdiff | tree

Christopher Wiley [Fri, 24 Jun 2016 16:27:53 +0000 (16:27 +0000)]

Merge \\\"Fix path escaping for aidl generated java\\\" am: 7e918b6a46 am: 752860dcfc
am: 36b50e7897

Change-Id: I09ea45c8d72263a49e207b1b1b6f82384e4695be

commit | commitdiff | tree

David Sehr [Fri, 24 Jun 2016 16:17:04 +0000 (09:17 -0700)]

Filter logging from dexdump/dex2oat to errors only

Change-Id: Idb3f1c3d216e2db87ce3b03cbacc6fc3ceff37e0

commit | commitdiff | tree

Christopher Wiley [Fri, 24 Jun 2016 16:23:31 +0000 (16:23 +0000)]

Merge \\"Fix path escaping for aidl generated java\\" am: 7e918b6a46
am: 752860dcfc

Change-Id: Ia7ffaba007d115872f1d06f9f98ddeb993d11c9e

commit | commitdiff | tree

Christopher Wiley [Fri, 24 Jun 2016 16:19:25 +0000 (16:19 +0000)]

Merge \"Fix path escaping for aidl generated java\"
am: 7e918b6a46

Change-Id: I8e50a344d17c4585a725db95386ef6e0eb50fa58

commit | commitdiff | tree

Christopher Wiley [Fri, 24 Jun 2016 16:00:33 +0000 (16:00 +0000)]

Merge "Fix path escaping for aidl generated java"

Merge \\\\"Fix the path for verity_key replacement when signing.\\\\" am: 46abc55954 am: 5b9921369e am: 1ea603491f
am: cac9724f5a

Change-Id: Ide449a42186b2a7262fd12def0fe1d6003eab9f2

Merge \\\\"Add ability to pass in payload_signer args\\\\" am: 8e6582b238 am: 8f9df9efb9 am: c8338f1c35
am: c9603a785e

Change-Id: I28e82fe68c35453bdb2e6d4627998375cfbae8aa

resolve merge conflicts of 63cc08f to nyc-mr1-dev-plus-aosp
am: 7df3890039

Change-Id: I4f3dd7b66e0e5807d89cd19542c39dd81ae6ddf3

Merge \\\"Fix the path for verity_key replacement when signing.\\\" am: 46abc55954 am: 5b9921369e
am: 1ea603491f

Change-Id: I8a2e24fdd1eca09ad25c74608d6c659078c5141c

commit | commitdiff | tree

Baligh Uddin [Fri, 24 Jun 2016 06:10:15 +0000 (06:10 +0000)]

Merge \\\"Add ability to pass in payload_signer args\\\" am: 8e6582b238 am: 8f9df9efb9
am: c8338f1c35

Change-Id: I7ee94c455769d2322ee877e25d97900cc2965060

resolve merge conflicts of 63cc08f to nyc-mr1-dev-plus-aosp

Change-Id: I238ed096a611ccb0f2ad38ba4c1a02ceefa21b39

resolve merge conflicts of fb45739 to nyc-mr1-dev-plus-aosp
am: 377f5944f6

Change-Id: I50110286e3ea25cab3038d64a37b1b5973e20117

resolve merge conflicts of fb45739 to nyc-mr1-dev-plus-aosp

Change-Id: I2e867189d4f827935a4ab8af6d5c1856a8413be0

resolve merge conflicts of b281433 to nyc-mr1-dev-plus-aosp
am: 707c4ae757

Change-Id: I5bce55dbaab58b7c650a0ad743a7ba90ac6160b2

resolve merge conflicts of b281433 to nyc-mr1-dev-plus-aosp

Change-Id: I392b6798ad68af80d13b7e45f7b7381b19a501ac

Merge \\"Fix the path for verity_key replacement when signing.\\" am: 46abc55954
am: 5b9921369e

Change-Id: Iae1fbc6e07d1cada56d0f34b87dad2074b4664a6

Merge \\"Add ability to pass in payload_signer args\\" am: 8e6582b238
am: 8f9df9efb9

Change-Id: I3603ac55a8836406ca60c05959efffffb7ffca3a

Merge \\"releasetools: Support using payload_signer.\\" am: 983a42bdf1
am: 9322317ee7

Change-Id: I13c5eede68149c1dda6da9bb33a2527adc05dd8c

Merge \\"releasetools: replace verity keyid\\" am: 6efa887f9b
am: 45d28d7392

Change-Id: I2104805b0de9ca28fde19f2c460b540977260dc2

Merge \\"Replace OTA keys when signing for A/B devices.\\" am: f2c34ece3c
am: deb116a65d

Change-Id: Ib57f472bdd232a908e0399dc1365f9aaf8ddf3ba

Merge \"Fix the path for verity_key replacement when signing.\"
am: 46abc55954

Change-Id: I9496d5826e077a470ac0ddd3565e3547611e6bf1

commit | commitdiff | tree

Baligh Uddin [Fri, 24 Jun 2016 05:27:02 +0000 (05:27 +0000)]

Merge \"Add ability to pass in payload_signer args\"
am: 8e6582b238

Change-Id: I83ab46e365fd09c7bf3d4a97fddf289e5d819ce0