Tao Bao
77620b5a45
Revert "Revert "releasetools: Allow using futility-host to sign old TF.zip.""
...
This reverts commit d6145b6a16
.
The cause of the earlier breakage has been identified and fixed by
commit 4b577413ff
.
Bug: 35467608
Test: lunch ryu-userdebug; m dist otatools-package
(cherry picked from commit 4f30f7cfa1
)
2017-02-25 08:38:51 -08:00
Tao Bao
69ad150dd3
Revert "Revert "Build FUTILITY tool from futility-host.""
...
This reverts commit b9186f2b52
.
The cause of the earlier breakage has been identified and fixed by
commit 4b577413ff
.
Bug: 35467608
Test: lunch ryu-userdebug; m otatools-package
Change-Id: I0ca329a3844b7d5d74443f7495b363e0f1c1c391
(cherry picked from commit 9b524ef60d
)
2017-02-25 08:38:30 -08: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
a23d93bc8f
Merge "Port java.mk desugar changes to host_dalvik_java_library.mk" am: 12e17ca46c
...
am: d730a19870
Change-Id: Idc7f2b393b0d181e8aae3a15a9c376bf0189823a
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
Change-Id: I31bec1f575b0fcf9d4875f381a1f982abc2d9d7b
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
edef957aeb
Merge "Add a script to check OWNERS file syntax." am: d84721a2cc
...
am: a5b0fec8b6
Change-Id: I9cb8eb3737daa56621adcf237bcbb43b354497ef
2017-02-25 01:09:09 +00:00
Chih-Hung Hsieh
a5b0fec8b6
Merge "Add a script to check OWNERS file syntax."
...
am: d84721a2cc
Change-Id: I804d5a19873392d2069bd4662110f10386a8d431
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
Dan Willemsen
1e4fb7f161
Improve module tags warnings
...
Stop blaming base_rules.mk, put the module makefile at the beginning
of the line. That way scripts like warn.py can parse this better.
Test: multiproduct_kati, grep logs
Change-Id: I5e6844097b44e47b8126159c1760b7524134310d
2017-02-24 23:52:22 +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
Dan Willemsen
e19ca033c6
Improve warnings for package-modules.mk
...
Include the calling makefile and package name instead of just a warning
pointing to package-modules.mk
Test: multiproduct_kati, grep logs
Change-Id: I4fa35540b9695b44eea6c23463e137ec37d1d2c9
2017-02-24 15:49:50 -08:00
Dan Willemsen
594c3fc3d7
Fix all_named_products, remove kati_all_products
...
all_named_products was giving the file path instead of product name for
the name:path format of PRODUCT_MAKEFILES.
kati_all_products has been replaced with multiproduct_kati
Test: get_build_var all_named_products
Test: multiproduct_kati
Change-Id: I24015ef0778ac7cd45201aa55c1737b0553f09fe
2017-02-24 15:49:46 -08: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
f1ed0fb048
Merge "Statically link libwinpthread into windows binaries." am: 61d68b6152
...
am: aa19e7a2bb
Change-Id: I1f6ae14785d66e621ec8c07cc312655713e58436
2017-02-24 21:11:25 +00:00
Josh Gao
aa19e7a2bb
Merge "Statically link libwinpthread into windows binaries."
...
am: 61d68b6152
Change-Id: I616c7ddc16239086006f0d9a99fd0742ea0cd780
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
Dan Willemsen
d2445ea0b2
Merge "Add progress indicator to Android.mk includes" am: 353a659a31
...
am: 100edc4a4c
Change-Id: I15a726888d1487652e321c24b2c0d4e8ba86107b
2017-02-24 17:59:12 +00:00
Dan Willemsen
100edc4a4c
Merge "Add progress indicator to Android.mk includes"
...
am: 353a659a31
Change-Id: Iee11804f88b35c6b6c8da47792dc4568f9862307
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
Change-Id: Icaac7d166f3d7d61d7e4480dd15f72cc44817407
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
da00358465
DO NOT MERGE releasetools: allow for multiple OEM property values. am: 1c50b8154d
...
am: 4d57163b24
-s ours
Change-Id: I3494729a984359b7bce6e0cd91140c3f884d70f6
2017-02-23 23:38:59 +00:00
Alain Vongsouvanh
4d57163b24
DO NOT MERGE releasetools: allow for multiple OEM property values.
...
am: 1c50b8154d
Change-Id: Ibfc4cfb6e2b60687eac9e9475f86d904444f071a
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
Colin Cross
f72142cf1d
Merge "Remove cpusets and schedboost product variables" am: 1adeeb8b3c
...
am: dced3d40ad
Change-Id: Ie9e6c378aab3143fc4b43495d5bb33e4bca1cb7e
2017-02-23 19:23:14 +00:00
Colin Cross
dced3d40ad
Merge "Remove cpusets and schedboost product variables"
...
am: 1adeeb8b3c
Change-Id: I850154eab83fa021423630d935b84afa20e7eced
2017-02-23 19:21:13 +00:00
Treehugger Robot
1adeeb8b3c
Merge "Remove cpusets and schedboost product variables"
2017-02-23 19:16:07 +00:00
Tao Bao
a43edadb87
Merge "Makefile: Add the missing dependency on FUTILITY." am: 4e429cccd6
...
am: 3dec68ea3f
Change-Id: Ibc874c67971fa6cf7fba9cf6a4fde4c3f805dc1b
2017-02-23 18:54:45 +00:00
Tao Bao
3dec68ea3f
Merge "Makefile: Add the missing dependency on FUTILITY."
...
am: 4e429cccd6
Change-Id: I4e26b51ae65f1d13bf4d8e959422876c0956c568
2017-02-23 18:52:41 +00:00
Tao Bao
4e429cccd6
Merge "Makefile: Add the missing dependency on FUTILITY."
2017-02-23 18:47:13 +00:00
Colin Cross
14fce4b072
Merge "Pass min sdk version to dx and desugar" am: bbad7c3e1f
...
am: 4a4325d313
Change-Id: I9157bc2ce2f23371719b9731ee829529147580de
2017-02-23 18:22:44 +00:00
Colin Cross
4a4325d313
Merge "Pass min sdk version to dx and desugar"
...
am: bbad7c3e1f
Change-Id: I5bfc25abcca9a3cfcb22ed0c5bf39e626fe64ec4
2017-02-23 18:20:23 +00:00
Colin Cross
bbad7c3e1f
Merge "Pass min sdk version to dx and desugar"
2017-02-23 18:18:38 +00:00
Colin Cross
119e97b375
Remove cpusets and schedboost product variables
...
They are no longer needed, remove them.
Bug: 35129304
Bug: 35128496
Test: builds
Change-Id: Ic0bb04f80d78a1aef2adfeb2af816eecabdbc4ba
2017-02-23 09:47:36 -08:00
Tao Bao
4b577413ff
Makefile: Add the missing dependency on FUTILITY.
...
Bug: 35467608
Test: lunch aosp_dragon-userdebug; m dist
Change-Id: If3824ac22926f3c3cc09d5b82cb0f6da4132f937
2017-02-22 22:54:49 -08:00
Colin Cross
58dfc7dc0f
Merge "Don't duplicate default platform libraries into proguard flags" am: f7b6bf8cb1
...
am: c432176a09
Change-Id: Id86fa037599fd9eafc338da8544529d147d68cf0
2017-02-23 02:17:16 +00:00
Colin Cross
c432176a09
Merge "Don't duplicate default platform libraries into proguard flags"
...
am: f7b6bf8cb1
Change-Id: Ie0320268dcd5c751570fe333f0e32cfdd7c81524
2017-02-23 02:15:18 +00:00
Colin Cross
f7b6bf8cb1
Merge "Don't duplicate default platform libraries into proguard flags"
2017-02-23 02:12:27 +00:00
Colin Cross
5118a25bd9
Don't duplicate default platform libraries into proguard flags
...
Test: builds
Change-Id: Ib972d954972614f3e6ce522c58fce06beeda3cea
2017-02-22 14:37:03 -08:00
Simran Basi
c1eb9a69c8
Merge "Add device-tests and general-tests make targets." am: c436f9eeec
...
am: 0d0f7e1c7b
Change-Id: I49dad18755bc780749d60e2be18d02e4305a9e15
2017-02-22 19:47:47 +00:00
Simran Basi
0d0f7e1c7b
Merge "Add device-tests and general-tests make targets."
...
am: c436f9eeec
Change-Id: Ic238377df600af06397d31bd4f5661e9a7e5316e
2017-02-22 19:46:18 +00:00
Treehugger Robot
c436f9eeec
Merge "Add device-tests and general-tests make targets."
2017-02-22 19:35:47 +00:00
Dan Willemsen
33631b3580
Add progress indicator to Android.mk includes
...
Test: m -j
Change-Id: I1e6fd020a06b49c243be14953d9f417e64ac7b8b
2017-02-22 11:20:51 -08:00
Colin Cross
536ef4e35a
Pass min sdk version to dx and desugar
...
Test: make checkbuild
Change-Id: Idde9712508571ea623126c7d25d2fa67eccf4833
2017-02-22 11:10:37 -08:00
Paul Duffin
6c99b4bc49
Merge "Filter JUnit and android.test classes from applications using proguard" am: 38a231d6c3
...
am: 3e93d553ec
Change-Id: Iec55888705dedfc9b5aa7397057acd19a4627614
2017-02-22 12:22:54 +00:00
Paul Duffin
3e93d553ec
Merge "Filter JUnit and android.test classes from applications using proguard"
...
am: 38a231d6c3
Change-Id: I42f53657f38aaead6bfde4015992991dbb058575
2017-02-22 12:20:54 +00:00
Paul Duffin
38a231d6c3
Merge "Filter JUnit and android.test classes from applications using proguard"
2017-02-22 12:15:27 +00:00