OSDN Git Service
Evgenii Stepanov [Thu, 30 Jun 2016 23:50:50 +0000 (23:50 +0000)]
Merge \"Only add libdl dependency for ASan/TSan on target.\"
am:
3d8ee8896b
Change-Id: I97e2daed8c10a325e27969c2fcaac1848dfefa80
Evgenii Stepanov [Thu, 30 Jun 2016 23:49:26 +0000 (23:49 +0000)]
Merge "Only add libdl dependency for ASan/TSan on target."
Evgenii Stepanov [Thu, 12 May 2016 20:07:36 +0000 (13:07 -0700)]
Only add libdl dependency for ASan/TSan on target.
Only sanitizers that intercept stuff need that. For example,
SafeStack does not, and I think UBSan too.
Bug:
27729263
Change-Id: I413cd46cc6c6914a363a3c53da7954beacd8f0d8
Evgenii Stepanov [Thu, 30 Jun 2016 23:34:49 +0000 (16:34 -0700)]
resolve merge conflicts of
ff3341b to stage-aosp-master
Change-Id: I1883410889b8e6c6505042fcebca6c8764e15e9a
Evgenii Stepanov [Thu, 30 Jun 2016 22:49:52 +0000 (22:49 +0000)]
Merge "Add LOCAL_NOSANITIZE."
Evgenii Stepanov [Thu, 12 May 2016 20:07:17 +0000 (13:07 -0700)]
Add LOCAL_NOSANITIZE.
This can be used to selectively disable individual sanitizers on a
target. For example, some parts of libc should be built with
SafeStack (when requested with SANITIZE_TARGET), but never with
AddressSanitizer. Current build rules specify LOCAL_SANITIZE := never
to disable AddressSanitizer; the idea is to change that to
LOCAL_NOSANITIZE := address thread.
Bug:
27729263
Change-Id: I2b770f2ce3faf6ad6798792327e96adb86fe4a4f
Dan Willemsen [Wed, 29 Jun 2016 20:39:42 +0000 (20:39 +0000)]
Merge \"Detect \`uname -m\` == i686 as a 32-bit host\"
am:
55d4a46f6d
Change-Id: Ia66952b98541755c55df1eb98775d749d2155dc1
Treehugger Robot [Wed, 29 Jun 2016 20:37:13 +0000 (20:37 +0000)]
Merge "Detect `uname -m` == i686 as a 32-bit host"
Dan Willemsen [Wed, 29 Jun 2016 19:26:53 +0000 (12:26 -0700)]
Detect `uname -m` == i686 as a 32-bit host
Change-Id: I0350629ce6ea7a5f0224489bafc98bc190e70932
Test: UNAME from https://groups.google.com/d/msg/android-building/nGQna2xuW5s/eEcXSo9ZBgAJ
Tianjie Xu [Wed, 29 Jun 2016 18:45:57 +0000 (18:45 +0000)]
Merge \"Skip copying existing vendor images\"
am:
1767d3f918
Change-Id: I5f929adedb17b6d32d2e0e284aa37c39c643c3ea
Tianjie Xu [Wed, 29 Jun 2016 18:37:38 +0000 (18:37 +0000)]
Merge "Skip copying existing vendor images"
Tianjie Xu [Tue, 28 Jun 2016 21:34:03 +0000 (14:34 -0700)]
Skip copying existing vendor images
add_img_to_target_files.py has an option of "-a" to add missing
images only. Under this option, the script should skip copying
the radio images for A/B devices when given image exists already
under "IMAGES/".
Test: Run the command on an A/B device, the existing radio images under "IMAGES/" don't get overwritten; and missing images are added correctly.
Bug:
29608905
Change-Id: Ie034b85a5d777d53e367f99470cea4d19cb1aaaf
Yi Kong [Wed, 29 Jun 2016 11:06:23 +0000 (11:06 +0000)]
Merge \"Add jdk.net to whitelist\"
am:
d2f4cbbf88
Change-Id: I80f7f529659953fd5664211e2a779d09e2245d34
Yi Kong [Wed, 29 Jun 2016 11:00:47 +0000 (11:00 +0000)]
Merge "Add jdk.net to whitelist"
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
Badhri Jagan Sridharan [Tue, 28 Jun 2016 23:36:22 +0000 (23:36 +0000)]
Merge "Extract public key ID from cert"
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
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
Treehugger Robot [Tue, 28 Jun 2016 19:41:39 +0000 (19:41 +0000)]
Merge "Turn unused source files from warning to error"
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
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
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
Treehugger Robot [Tue, 28 Jun 2016 06:17:32 +0000 (06:17 +0000)]
Merge "Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES"
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
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
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
Treehugger Robot [Tue, 28 Jun 2016 01:52:36 +0000 (01:52 +0000)]
Merge "releasetools: Change the default key path for bvbtool"
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
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
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
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
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
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
Treehugger Robot [Fri, 24 Jun 2016 21:16:23 +0000 (21:16 +0000)]
Merge "Fix typo in setting PRIVATE_MODULE for AIDL source"
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
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
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
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
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
Chih-hung Hsieh [Fri, 24 Jun 2016 18:07:44 +0000 (18:07 +0000)]
Merge "Add +/- buttons to expand/collapse warning categories."
David Sehr [Fri, 24 Jun 2016 18:07:07 +0000 (18:07 +0000)]
Merge "Filter logging from dexdump/dex2oat to errors only"
Yi Kong [Fri, 24 Jun 2016 17:57:55 +0000 (18:57 +0100)]
Add jdk.net to whitelist
Tracks libcore commit
a434f3be3c22c6b3e7ddd426766808e76a5780fd
Bug:
29067535
Change-Id: I764b602aa0f2a991dc26b5fd42a1143bb58d67ba
David Sehr [Fri, 24 Jun 2016 16:17:04 +0000 (09:17 -0700)]
Filter logging from dexdump/dex2oat to errors only
Change-Id: Idb3f1c3d216e2db87ce3b03cbacc6fc3ceff37e0
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
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
Christopher Wiley [Fri, 24 Jun 2016 16:00:33 +0000 (16:00 +0000)]
Merge "Fix path escaping for aidl generated java"
Tao Bao [Fri, 24 Jun 2016 05:30:31 +0000 (05:30 +0000)]
Merge \\"Fix the path for verity_key replacement when signing.\\" am:
46abc55954
am:
5b9921369e
Change-Id: Iae1fbc6e07d1cada56d0f34b87dad2074b4664a6
Tao Bao [Fri, 24 Jun 2016 05:30:31 +0000 (05:30 +0000)]
Merge \\"Add ability to pass in payload_signer args\\" am:
8e6582b238
am:
8f9df9efb9
Change-Id: I3603ac55a8836406ca60c05959efffffb7ffca3a
Tao Bao [Fri, 24 Jun 2016 05:30:31 +0000 (05:30 +0000)]
Merge \\"releasetools: Support using payload_signer.\\" am:
983a42bdf1
am:
9322317ee7
Change-Id: I13c5eede68149c1dda6da9bb33a2527adc05dd8c
Tao Bao [Fri, 24 Jun 2016 05:30:30 +0000 (05:30 +0000)]
Merge \\"releasetools: replace verity keyid\\" am:
6efa887f9b
am:
45d28d7392
Change-Id: I2104805b0de9ca28fde19f2c460b540977260dc2
Tao Bao [Fri, 24 Jun 2016 05:30:30 +0000 (05:30 +0000)]
Merge \\"Replace OTA keys when signing for A/B devices.\\" am:
f2c34ece3c
am:
deb116a65d
Change-Id: Ib57f472bdd232a908e0399dc1365f9aaf8ddf3ba
Tao Bao [Fri, 24 Jun 2016 05:27:03 +0000 (05:27 +0000)]
Merge \"Fix the path for verity_key replacement when signing.\"
am:
46abc55954
Change-Id: I9496d5826e077a470ac0ddd3565e3547611e6bf1
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
Tao Bao [Fri, 24 Jun 2016 05:27:02 +0000 (05:27 +0000)]
Merge \"releasetools: Support using payload_signer.\"
am:
983a42bdf1
Change-Id: I027ae0f71c3a57ffad476791721b111605844f1d
Badhri Jagan Sridharan [Fri, 24 Jun 2016 05:27:01 +0000 (05:27 +0000)]
Merge \"releasetools: replace verity keyid\"
am:
6efa887f9b
Change-Id: I63b11e2e0d27100a58a05ea91c0e7c29bb0597ff
Tao Bao [Fri, 24 Jun 2016 05:27:00 +0000 (05:27 +0000)]
Merge \"Replace OTA keys when signing for A/B devices.\"
am:
f2c34ece3c
Change-Id: I7eb287bd486d197b3c2c96616b558e7bc9536329
Tao Bao [Fri, 24 Jun 2016 05:20:20 +0000 (05:20 +0000)]
Merge "Fix the path for verity_key replacement when signing."
Tao Bao [Fri, 24 Jun 2016 05:20:06 +0000 (05:20 +0000)]
Merge "Add ability to pass in payload_signer args"
Tao Bao [Fri, 24 Jun 2016 05:19:53 +0000 (05:19 +0000)]
Merge "releasetools: Support using payload_signer."
Tao Bao [Fri, 24 Jun 2016 05:19:40 +0000 (05:19 +0000)]
Merge "releasetools: replace verity keyid"
Tao Bao [Fri, 24 Jun 2016 05:19:22 +0000 (05:19 +0000)]
Merge "Replace OTA keys when signing for A/B devices."
Tao Bao [Sat, 18 Jun 2016 00:01:22 +0000 (17:01 -0700)]
Fix the path for verity_key replacement when signing.
system_root_image expects the key at ROOT/verity_key as opposed to
BOOT/verity_key. Also refactor the verity key replacement lines.
Bug:
29397395
Test: 'sign_target_files_apks.py --replace_verity_private_key newkey --replace_verity_public_key newkey.pub target_files.zip signed-target_files.zip' and verify the replaced key in boot.img.
Change-Id: I58a5defff4be008ad55d4b5a5b7148569c3b8d66
(cherry picked from commit
e0ee794fa16b206e792eac0942f448df34247fd8)
Baligh Uddin [Wed, 22 Jun 2016 19:14:16 +0000 (12:14 -0700)]
Add ability to pass in payload_signer args
Bug:
28701652
Change-Id: I110d5fc14446e4a6a0f8e25dcb0d300decdf09a4
(cherry picked from commit
2abbbd03339947327ada0becba5bd4ef41f1bdab)
Tao Bao [Tue, 21 Jun 2016 00:55:06 +0000 (17:55 -0700)]
releasetools: Support using payload_signer.
For A/B OTAs, by default it calls 'openssl pkeyutl' to sign the payload
and metadata with the package private key. If the private key cannot be
accessed directly, a payload signer that knows how to do that should be
supplied via "--payload_signer <signer>".
The signer will be called with "-inkey <path_to_private_key>",
"-in <input_file>" and "-out <output_file>" parameters.
Test: Use a dummy signer, call 'ota_from_target_files.py --payload_signer <signer> <target_files.zip> <ota.zip>' and verify the signatures in the generated package.
Bug:
28701652
Change-Id: I26cfdd3fdba6fc90799221741b75426988e46fd3
(cherry picked from commit
dea0f8bfed01fa620d23d7dd8ff533246f26e8a0)
Badhri Jagan Sridharan [Fri, 17 Jun 2016 02:58:44 +0000 (19:58 -0700)]
releasetools: replace verity keyid
Replace verity keyid with the keyid extracted from cert
passed through --replace_verity_keyid. The veritykeyid in the
BOOT/cmdline of input target files is replaced with keyid
extracted from --replace_verity_keyid and written to the
output target files.
BUG:
28384658
Change-Id: Ic683f36f543c4fcd94b6f95e40f01200fbf45ee1
(cherry picked from commit
b58d23fe00697a0cf9c7c9c75639fd8c7b5bb016)
Tao Bao [Thu, 16 Jun 2016 21:41:24 +0000 (14:41 -0700)]
Replace OTA keys when signing for A/B devices.
It replaces the package verification key (change of path due to
system_root_image flag), as well as the payload verification key.
Bug:
29397395
Change-Id: I10435072aaf4356f2d8b5e1b6e82eb9cead7ad62
(cherry picked from commit
24a72064309dd55d4aa80b70480eed55c54f818d)
Daniel Micay [Fri, 24 Jun 2016 03:40:22 +0000 (03:40 +0000)]
resolve merge conflicts of
012144f to nyc-dev
am:
bb9a8d8eb8
Change-Id: I140f5b3da3b65cd35cd7eb00d8406870f3c0c4ca
Christopher Wiley [Thu, 23 Jun 2016 23:44:47 +0000 (16:44 -0700)]
Fix path escaping for aidl generated java
Bug:
29619260
Change-Id: I806044573661c61e691adf36a47092188db87ab6
Test: Generated java with ../ in paths appears in the right place.
Jeff Vander Stoep [Thu, 23 Jun 2016 22:04:24 +0000 (15:04 -0700)]
resolve merge conflicts of
012144f to nyc-dev
Change-Id: If918f56d5c33db10978b4efc51cf3fe42ed71f1a
Daniel Micay [Thu, 23 Jun 2016 21:10:35 +0000 (21:10 +0000)]
Merge \\\"disable unpriv perf by default in user{,debug} builds\\\" into mnc-dev am:
11c84f95fb am:
a0c61fc832
am:
3cceebf11e
Change-Id: Ia91276546041b5e36ddeeb4d855d8efac6101da5
Jeffrey Vander Stoep [Thu, 23 Jun 2016 21:07:28 +0000 (21:07 +0000)]
Merge \\"disable unpriv perf by default in user{,debug} builds\\" into mnc-dev am:
11c84f95fb
am:
a0c61fc832
Change-Id: I3eb533e3084fe53f1739a0428ffe5ff583b1ba91
Daniel Micay [Thu, 23 Jun 2016 21:04:53 +0000 (21:04 +0000)]
Merge \"disable unpriv perf by default in user{,debug} builds\" into mnc-dev
am:
11c84f95fb
Change-Id: Ic82b49068c2d6c834bafb01ea3f698bb9e84d1ac
Jeffrey Vander Stoep [Thu, 23 Jun 2016 21:00:03 +0000 (21:00 +0000)]
Merge "disable unpriv perf by default in user{,debug} builds" into mnc-dev
Chih-Hung Hsieh [Thu, 23 Jun 2016 02:15:12 +0000 (19:15 -0700)]
Add +/- buttons to expand/collapse warning categories.
* Add expand/collapse-all buttons to expand/collapse all warnings.
* Use HTML styles to reduce output file size.
Change-Id: Ica188cc4f123ce0ab8547f88315325c3e0560a39
Test: Checked output html file with Chrome browser.
Alex Klyubin [Thu, 23 Jun 2016 00:40:11 +0000 (00:40 +0000)]
Merge \\"Use Builder pattern for ApkVerifier parameters.\\" am:
744e7746c4
am:
7dbd1ea408
Change-Id: I425095197f451a3ea089cea75da13fbb01036f43
Alex Klyubin [Thu, 23 Jun 2016 00:37:28 +0000 (00:37 +0000)]
Merge \"Use Builder pattern for ApkVerifier parameters.\"
am:
744e7746c4
Change-Id: I36d18044ea627ff9f5f83ef8463476de07ce45ff
Treehugger Robot [Thu, 23 Jun 2016 00:31:53 +0000 (00:31 +0000)]
Merge "Use Builder pattern for ApkVerifier parameters."
Alex Klyubin [Tue, 21 Jun 2016 17:46:56 +0000 (10:46 -0700)]
Use Builder pattern for ApkVerifier parameters.
This should make it easier to add parameters/options without breaking
existing clients.
Bug:
27461702
Change-Id: Ia4577f78d703a6b91828dd08492c78d5e9afb110
Dan Willemsen [Wed, 22 Jun 2016 20:44:42 +0000 (20:44 +0000)]
Merge \\"Finish refactoring tests to NATIVE_TESTS\\" am:
239f2b0f9f
am:
fed8d9e9f7
Change-Id: I66fd8b66a0acbc2fbb653bf2d90d3a68727d14e8
Dan Willemsen [Wed, 22 Jun 2016 20:41:57 +0000 (20:41 +0000)]
Merge \"Finish refactoring tests to NATIVE_TESTS\"
am:
239f2b0f9f
Change-Id: If34f994893a9ad00cadb3a6124ee21ccf36b142c
Treehugger Robot [Wed, 22 Jun 2016 20:37:40 +0000 (20:37 +0000)]
Merge "Finish refactoring tests to NATIVE_TESTS"
Dan Willemsen [Wed, 22 Jun 2016 07:27:54 +0000 (00:27 -0700)]
Finish refactoring tests to NATIVE_TESTS
Now that the source trees all use NATIVE_TESTS for intermediate files
and generated sources, make it a requirement.
Change-Id: Id5718fabe63f6e8dde7981a6f0f5bd89e0ec7ee5
Tianjie Xu [Wed, 22 Jun 2016 05:17:42 +0000 (05:17 +0000)]
Merge \"Limit the number of blocks in command zero\" into nyc-dev
am:
0eade3f027
Change-Id: I7f5cc1319863eb1ec1d87b6bf3e9cb62f3401e41
Tianjie Xu [Wed, 22 Jun 2016 05:11:24 +0000 (05:11 +0000)]
Merge "Limit the number of blocks in command zero" into nyc-dev
Zach Jang [Wed, 22 Jun 2016 01:46:17 +0000 (01:46 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb am:
e7bc1542db am:
1be6c69524
am:
1f87a820ad
Change-Id: If484b9ee55f16b85cead3587d08c757ae8df6d2b
Zach Jang [Wed, 22 Jun 2016 01:43:47 +0000 (01:43 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb am:
e7bc1542db
am:
1be6c69524
Change-Id: If5d6ea4889550f45ef2a8f0ebf53a1e656c39010
Zach Jang [Wed, 22 Jun 2016 01:41:13 +0000 (01:41 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2 am:
3749025ccb
am:
e7bc1542db
Change-Id: I316c25839b0e111bda05ba586733e3712eda5a32
Zach Jang [Wed, 22 Jun 2016 01:38:31 +0000 (01:38 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94 am:
9fc3cf7ba2
am:
3749025ccb
Change-Id: Idadb32ede7b3699e0db8ce632d37e7d2cf99e82b
Zach Jang [Wed, 22 Jun 2016 01:35:58 +0000 (01:35 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29 am:
cbf1e2cc94
am:
9fc3cf7ba2
Change-Id: Idcd5da62fd7c36da94af3a15f35d179e1a3940f2
Zach Jang [Wed, 22 Jun 2016 01:33:23 +0000 (01:33 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40 am:
cf51c6cb29
am:
cbf1e2cc94
Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
Zach Jang [Wed, 22 Jun 2016 01:30:23 +0000 (01:30 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev am:
0c672afc40
am:
cf51c6cb29
Change-Id: Id5206a36ff4cee1de3e15f9d5efc64ee731434ee
Zach Jang [Wed, 22 Jun 2016 01:27:49 +0000 (01:27 +0000)]
resolve merge conflicts of
12db224 to lmp-mr1-dev
am:
0c672afc40
Change-Id: Ibfaa4fa1c68fff09bbee52855a99e296bb603d45
Zach Jang [Wed, 22 Jun 2016 01:23:46 +0000 (18:23 -0700)]
resolve merge conflicts of
12db224 to lmp-mr1-dev
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
Zach Jang [Wed, 22 Jun 2016 01:13:17 +0000 (18:13 -0700)]
resolve merge conflicts of
24cfbfa to lmp-dev
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
Guang Zhu [Wed, 22 Jun 2016 01:00:44 +0000 (01:00 +0000)]
Merge \\"move test artifact build rules into open source location\\" am:
59e060e1c6
am:
c8e8f38faa
Change-Id: I81bf4856cb2489e7983b0859df3dc36f2bee2e01
Guang Zhu [Wed, 22 Jun 2016 00:52:30 +0000 (00:52 +0000)]
Merge \"move test artifact build rules into open source location\"
am:
59e060e1c6
Change-Id: I5bb807dec5cffc0a60f28f54341c83f6c4224d10
Treehugger Robot [Wed, 22 Jun 2016 00:47:27 +0000 (00:47 +0000)]
Merge "move test artifact build rules into open source location"
Zach Jang [Wed, 22 Jun 2016 00:44:33 +0000 (00:44 +0000)]
Updating security string to 2016-08-05 am:
5b14c1f7ce
am:
26acdf0c13
Change-Id: I5fa856d2a68d672f314f36c315c3f1857fd386ba
Zach Jang [Wed, 22 Jun 2016 00:41:51 +0000 (00:41 +0000)]
Updating security string to 2016-08-05
am:
5b14c1f7ce
Change-Id: I5b2665a6e208d676169b33c08c6761d9de8b8320
Tianjie Xu [Tue, 21 Jun 2016 22:54:09 +0000 (15:54 -0700)]
Limit the number of blocks in command zero
Limit the number of blocks in command zero to 1024 blocks. This
prevents the target size of one command from being too large and
might help to avoid fsync errors during the OTA update.
Bug:
29535618
Change-Id: Ic630cea2599138516162bd0029e2e4b2af75bf4f
(cherry picked from commit
bb848c54a78572ec2ded3e8ed05ee01f5e8290d9)