Tao Bao
7e48403012
Merge "releasetools: Fix an equality check bug when asserting stash size." am: 2af09af86b am: db5463d8dd
...
am: 9def0e5609
2017-02-26 21:42:54 +00:00
Tao Bao
9def0e5609
Merge "releasetools: Fix an equality check bug when asserting stash size." am: 2af09af86b
...
am: db5463d8dd
2017-02-26 21:39:23 +00:00
Tao Bao
db5463d8dd
Merge "releasetools: Fix an equality check bug when asserting stash size."
...
am: 2af09af86b
2017-02-26 21:35:52 +00:00
Treehugger Robot
2af09af86b
Merge "releasetools: Fix an equality check bug when asserting stash size."
2017-02-26 21:31:24 +00:00
Tao Bao
34c9678b0a
Makefile: Add the missing dependency on FUTILITY. am: 1c4c8c4532 am: b9c4a17cf6 am: 6ea25dfd92 am: 837e497632 am: 5773ddaabd am: 6bcaa0924e
...
am: a6459b885d
2017-02-26 19:04:43 +00:00
Tao Bao
f8397eb1b4
Makefile: Add the missing dependency on FUTILITY. am: 1c4c8c4532 am: b9c4a17cf6 am: 6ea25dfd92 am: 84ec323c9b am: 0873d8c71a
...
am: 583235d048
2017-02-26 19:01:42 +00:00
Tao Bao
a6459b885d
Makefile: Add the missing dependency on FUTILITY. am: 1c4c8c4532 am: b9c4a17cf6 am: 6ea25dfd92 am: 837e497632 am: 5773ddaabd
...
am: 6bcaa0924e
2017-02-26 19:01:42 +00:00
Tao Bao
e8c68a03c8
releasetools: Fix an equality check bug when asserting stash size.
...
Otherwise the comparison is inconsistent between ReviseStashSize() and
WriteTransfers().
Bug: 35775675
Test: Successfully generate a previously failed incremental.
Change-Id: I554a51a210bf322cb5c79e28cf85607a417b094a
2017-02-26 10:58:22 -08:00
Tao Bao
583235d048
Makefile: Add the missing dependency on FUTILITY. am: 1c4c8c4532 am: b9c4a17cf6 am: 6ea25dfd92 am: 84ec323c9b
...
am: 0873d8c71a
2017-02-26 18:57:43 +00:00
Tao Bao
6bcaa0924e
Makefile: Add the missing dependency on FUTILITY. am: 1c4c8c4532 am: b9c4a17cf6 am: 6ea25dfd92 am: 837e497632
...
am: 5773ddaabd
2017-02-26 18:57:41 +00:00
Tao Bao
0873d8c71a
Makefile: Add the missing dependency on FUTILITY. am: 1c4c8c4532 am: b9c4a17cf6 am: 6ea25dfd92
...
am: 84ec323c9b
2017-02-26 18:54:42 +00:00
Tao Bao
5773ddaabd
Makefile: Add the missing dependency on FUTILITY. am: 1c4c8c4532 am: b9c4a17cf6 am: 6ea25dfd92
...
am: 837e497632
2017-02-26 18:54:41 +00:00
Tao Bao
837e497632
Makefile: Add the missing dependency on FUTILITY. am: 1c4c8c4532 am: b9c4a17cf6
...
am: 6ea25dfd92
2017-02-26 18:51:11 +00:00
Tao Bao
84ec323c9b
Makefile: Add the missing dependency on FUTILITY. am: 1c4c8c4532 am: b9c4a17cf6
...
am: 6ea25dfd92
2017-02-26 18:51:10 +00:00
Tao Bao
6ea25dfd92
Makefile: Add the missing dependency on FUTILITY. am: 1c4c8c4532
...
am: b9c4a17cf6
2017-02-26 18:47:41 +00:00
Tao Bao
b9c4a17cf6
Makefile: Add the missing dependency on FUTILITY.
...
am: 1c4c8c4532
2017-02-26 18:44:09 +00:00
Tao Bao
1c4c8c4532
Makefile: Add the missing dependency on FUTILITY.
...
Bug: 35467608
Test: lunch aosp_dragon-userdebug; m dist
Change-Id: If3824ac22926f3c3cc09d5b82cb0f6da4132f937
(cherry picked from commit 4b577413ff
2017-02-25 08:32:48 -08:00
Colin Cross
f169ed2a1c
Merge "Port java.mk desugar changes to host_dalvik_java_library.mk" am: 12e17ca46c am: d730a19870
...
am: a23d93bc8f
2017-02-25 01:46:50 +00:00
Colin Cross
a23d93bc8f
Merge "Port java.mk desugar changes to host_dalvik_java_library.mk" am: 12e17ca46c
...
am: d730a19870
2017-02-25 01:43:49 +00:00
Colin Cross
d730a19870
Merge "Port java.mk desugar changes to host_dalvik_java_library.mk"
...
am: 12e17ca46c
2017-02-25 01:40:50 +00:00
Treehugger Robot
12e17ca46c
Merge "Port java.mk desugar changes to host_dalvik_java_library.mk"
2017-02-25 01:34:31 +00:00
Chih-Hung Hsieh
eb27d0ef2e
Merge "Add a script to check OWNERS file syntax." am: d84721a2cc am: a5b0fec8b6
...
am: edef957aeb
2017-02-25 01:11:08 +00:00
Chih-Hung Hsieh
edef957aeb
Merge "Add a script to check OWNERS file syntax." am: d84721a2cc
...
am: a5b0fec8b6
2017-02-25 01:09:09 +00:00
Chih-Hung Hsieh
a5b0fec8b6
Merge "Add a script to check OWNERS file syntax."
...
am: d84721a2cc
2017-02-25 01:06:38 +00:00
Treehugger Robot
d84721a2cc
Merge "Add a script to check OWNERS file syntax."
2017-02-25 01:00:18 +00:00
Colin Cross
8f2f7b9fab
Port java.mk desugar changes to host_dalvik_java_library.mk
...
host_dalvik_java_library.mk shares less of the implementation
with the device side than I thought, port the desugar changes
from java.mk.
Test: m -j ANDROID_FORCE_JACK_ENABLED=disabled core-oj-hostdex
Change-Id: I5e09673c5eae6bf95d63540e7b626c67da87e9f1
2017-02-24 23:51:12 +00:00
Tao Bao
53e0ce75e9
Merge "Fix the bad merge of conditionally packaging VBOOT_SIGNER tools CL."
2017-02-24 23:33:47 +00:00
Chih-Hung Hsieh
adaed14ff3
Add a script to check OWNERS file syntax.
...
* -v option to print found files and email addresses.
* -c option to check found email addresses.
Bug: 33166666
Test: ./checkowners.py -v -c `find . -name OWNERS`
Change-Id: I32f23f19e904055e421ddec713536c8a5c970af4
2017-02-24 15:28:29 -08:00
Josh Gao
5794e3baac
Merge "Statically link libwinpthread into windows binaries." am: 61d68b6152 am: aa19e7a2bb
...
am: f1ed0fb048
2017-02-24 21:14:27 +00:00
Josh Gao
f1ed0fb048
Merge "Statically link libwinpthread into windows binaries." am: 61d68b6152
...
am: aa19e7a2bb
2017-02-24 21:11:25 +00:00
Josh Gao
aa19e7a2bb
Merge "Statically link libwinpthread into windows binaries."
...
am: 61d68b6152
2017-02-24 21:08:55 +00:00
Josh Gao
61d68b6152
Merge "Statically link libwinpthread into windows binaries."
2017-02-24 21:02:25 +00:00
Tao Bao
f52bdd758b
Fix the bad merge of conditionally packaging VBOOT_SIGNER tools CL.
...
Commit d2aed4309a
2017-02-24 12:44:02 -08:00
Dan Willemsen
433e7e4d45
Merge "Add progress indicator to Android.mk includes" am: 353a659a31 am: 100edc4a4c
...
am: d2445ea0b2
2017-02-24 18:01:52 +00:00
Tao Bao
ee4ab96b00
resolve merge conflicts of e44f4e439d to nyc-mr2-dev-plus-aosp
...
am: 82b7b27d15
2017-02-24 18:01:39 +00:00
Dan Willemsen
d2445ea0b2
Merge "Add progress indicator to Android.mk includes" am: 353a659a31
...
am: 100edc4a4c
2017-02-24 17:59:12 +00:00
Dan Willemsen
100edc4a4c
Merge "Add progress indicator to Android.mk includes"
...
am: 353a659a31
2017-02-24 17:56:08 +00:00
Tao Bao
82b7b27d15
resolve merge conflicts of e44f4e439d to nyc-mr2-dev-plus-aosp
...
Change-Id: I6ef514b7338c589b5913d002e4608998d2cd738e
2017-02-24 09:55:17 -08:00
Dan Willemsen
353a659a31
Merge "Add progress indicator to Android.mk includes"
2017-02-24 17:50:13 +00:00
Tao Bao
e44f4e439d
Merge "Make the packaging of VBOOT_SIGNER tools conditional."
...
am: 56a2d9ff56
2017-02-24 17:45:07 +00:00
Tao Bao
56a2d9ff56
Merge "Make the packaging of VBOOT_SIGNER tools conditional."
2017-02-24 17:41:33 +00:00
Josh Gao
4d9268e704
Statically link libwinpthread into windows binaries.
...
Statically link libwinpthread.a, so that we don't have to ship a
libwinpthread dll with all of our windows exectuables.
Bug: http://b/31665213
Test: wine adb.exe
Test: wine fastboot.exe
Change-Id: I96414e980d8894f8f6a58c1c7bbd9dc5e0f5169c
2017-02-23 17:56:44 -08:00
Alain Vongsouvanh
484f662ee1
DO NOT MERGE releasetools: allow for multiple OEM property values. am: 1c50b8154d am: 4d57163b24 -s ours
...
am: da00358465
2017-02-23 23:41:29 +00:00
Alain Vongsouvanh
da00358465
DO NOT MERGE releasetools: allow for multiple OEM property values. am: 1c50b8154d
...
am: 4d57163b24
2017-02-23 23:38:59 +00:00
Alain Vongsouvanh
4d57163b24
DO NOT MERGE releasetools: allow for multiple OEM property values.
...
am: 1c50b8154d
2017-02-23 22:53:27 +00:00
Tao Bao
d2aed4309a
Make the packaging of VBOOT_SIGNER tools conditional.
...
Otherwise it may fail the targets that don't have
external/vboot_reference in the manifest.
Bug: 35467608
Test: lunch aosp_dragon-userdebug; m otatools-package
Test: lunch aosp_bullhead-userdebug; m otatools-package
Change-Id: I35700a4d7d0723992badcfb4a03be85d07a4b9a9
2017-02-23 14:32:44 -08:00
Tao Bao
bd56b54c94
Merge changes from topic 'ryu-revert-revert'
...
* changes:
Revert "Revert "releasetools: Allow using futility-host to sign old TF.zip.""
Revert "Revert "Build FUTILITY tool from futility-host.""
2017-02-23 21:04:20 +00:00
Colin Cross
70c1400c91
Merge "Compute PLATFORM_VERSION and PLATFORM_VERSION_CODENAME"
2017-02-23 20:20:35 +00:00
Colin Cross
768aa50d0f
Merge "Remove cpusets and schedboost product variables" am: 1adeeb8b3c am: dced3d40ad
...
am: f72142cf1d
2017-02-23 19:26:15 +00:00
Colin Cross
f72142cf1d
Merge "Remove cpusets and schedboost product variables" am: 1adeeb8b3c
...
am: dced3d40ad
2017-02-23 19:23:14 +00:00
