Bowgo Tsai
b4c268eb7b
Merge "Support signing custom images with AVB HASH or AVB HASHTREE" am: fe7aeb1de7
am: 16b64cbb58
...
am: 3989b738b8
Change-Id: I11393e1833db97301ffdd31ec3db0968e87c1a24
2017-05-31 03:38:24 +00:00
Bowgo Tsai
3989b738b8
Merge "Support signing custom images with AVB HASH or AVB HASHTREE" am: fe7aeb1de7
...
am: 16b64cbb58
Change-Id: I67b3fa64f13d08ee3e4232547d08f6d91e2676d7
2017-05-31 03:33:54 +00:00
Bowgo Tsai
16b64cbb58
Merge "Support signing custom images with AVB HASH or AVB HASHTREE"
...
am: fe7aeb1de7
Change-Id: I96bab62c4fa6088ba3d67376b3f7d047e4a16d59
2017-05-31 03:28:53 +00:00
Treehugger Robot
fe7aeb1de7
Merge "Support signing custom images with AVB HASH or AVB HASHTREE"
2017-05-31 03:24:25 +00:00
Tianjie Xu
9307492d4e
Merge "Remove the obsolete UnpackPackageDir() in edify generator" am: f7a76f9a30
am: cb2490c645
...
am: 932a9c8a61
Change-Id: I616920f452b7fda545d87dd285474f9f0acd5b14
2017-05-31 01:25:19 +00:00
Tianjie Xu
932a9c8a61
Merge "Remove the obsolete UnpackPackageDir() in edify generator" am: f7a76f9a30
...
am: cb2490c645
Change-Id: Ibfb2a433d379cf62540e09cc71d81cfdef67dbf8
2017-05-31 01:21:15 +00:00
Tianjie Xu
cb2490c645
Merge "Remove the obsolete UnpackPackageDir() in edify generator"
...
am: f7a76f9a30
Change-Id: Ic7f855642457cd6cb977af73fad1ef808326d414
2017-05-31 01:17:43 +00:00
Tianjie Xu
f7a76f9a30
Merge "Remove the obsolete UnpackPackageDir() in edify generator"
2017-05-31 01:08:15 +00:00
Yueyao Zhu
99dd478b09
Merge "Makefile: support build and avb signing of dtbo img" into oc-dev
...
am: 48c8af949b
Change-Id: Ia8cc33e8d7de634f80235ab5607ed10c04f368dd
2017-05-31 01:05:43 +00:00
TreeHugger Robot
48c8af949b
Merge "Makefile: support build and avb signing of dtbo img" into oc-dev
2017-05-31 00:50:37 +00:00
Tao Bao
e6e6557135
Merge "Makefile: Add the dependency for BUILT_OTATOOLS_PACKAGE." am: c6ad99c926
am: f5529878f8
...
am: c7b91ee05a
Change-Id: I2db86c959abd5f65b6a51b97da9f7475e9e26838
2017-05-30 23:31:07 +00:00
Tao Bao
c7b91ee05a
Merge "Makefile: Add the dependency for BUILT_OTATOOLS_PACKAGE." am: c6ad99c926
...
am: f5529878f8
Change-Id: Idb2cc5081903e70b9869741d8bf4bd355701631e
2017-05-30 23:27:05 +00:00
Tao Bao
f5529878f8
Merge "Makefile: Add the dependency for BUILT_OTATOOLS_PACKAGE."
...
am: c6ad99c926
Change-Id: I5f65ae5cba1423cd26c078a7739b0a028ff9cc2d
2017-05-30 23:23:36 +00:00
Treehugger Robot
c6ad99c926
Merge "Makefile: Add the dependency for BUILT_OTATOOLS_PACKAGE."
2017-05-30 23:12:50 +00:00
Tianjie Xu
3a97af0ca4
Merge "Move recovery building from sign_target_files_apk to add_img_to_target_files" am: 0996f815db
am: d50b6e4cae
...
am: 38800822ef
Change-Id: Ib2a237c601142fa168f0f73f6c12fd28c3ac4b79
2017-05-30 21:02:27 +00:00
Tianjie Xu
38800822ef
Merge "Move recovery building from sign_target_files_apk to add_img_to_target_files" am: 0996f815db
...
am: d50b6e4cae
Change-Id: I6be9a08f8fce371603cb41016e8ca2ed2a7baad4
2017-05-30 20:58:55 +00:00
Tianjie Xu
d50b6e4cae
Merge "Move recovery building from sign_target_files_apk to add_img_to_target_files"
...
am: 0996f815db
Change-Id: I8927d4eae11d8f5f65051ae038de336a60b2d462
2017-05-30 20:54:57 +00:00
Tianjie Xu
0996f815db
Merge "Move recovery building from sign_target_files_apk to add_img_to_target_files"
2017-05-30 20:40:19 +00:00
Jeff Gaston
a236fa5d12
Merge "Add blueprint_tools as default target" am: 81787c1bbc
am: 2cbed51e36
...
am: 61510fa696
Change-Id: I0c368aa1a12a8c670e2a459c7c7883f733608772
2017-05-30 19:45:52 +00:00
Jeff Gaston
61510fa696
Merge "Add blueprint_tools as default target" am: 81787c1bbc
...
am: 2cbed51e36
Change-Id: Ic16e1eafd192ccdfbb32f34113f6eb50546b4fe4
2017-05-30 19:41:51 +00:00
Jeff Gaston
2cbed51e36
Merge "Add blueprint_tools as default target"
...
am: 81787c1bbc
Change-Id: I4911ddca78b5314a17a00f84fe6a3b070a2c6ea9
2017-05-30 19:37:51 +00:00
Treehugger Robot
81787c1bbc
Merge "Add blueprint_tools as default target"
2017-05-30 19:30:51 +00:00
Julius D'souza
b38b4c95c0
Merge "Add the option to reserve headroom for partition images. This is useful for device with low disk space with different build variants." into oc-dev
...
am: 290b8c71e4
-s ours
Change-Id: Id3fab922ccadc11936990fc4eb4707d26b808b41
2017-05-30 18:08:17 +00:00
TreeHugger Robot
290b8c71e4
Merge "Add the option to reserve headroom for partition images. This is useful for device with low disk space with different build variants." into oc-dev
2017-05-30 18:03:15 +00:00
Tianjie Xu
0ba01a614a
Merge "Update the recovery files under SYSTEM/ if recovery patch is rebuilt" am: ada0854169
am: 9080b10f3a
...
am: d153e86abd
Change-Id: Ic7e6731d8a5da15353c793acd33b6106e11382b2
2017-05-27 00:27:44 +00:00
Tianjie Xu
d153e86abd
Merge "Update the recovery files under SYSTEM/ if recovery patch is rebuilt" am: ada0854169
...
am: 9080b10f3a
Change-Id: Ie735c40b3e3240389ff8ce38dc9692452594f4ae
2017-05-27 00:25:42 +00:00
Tianjie Xu
9080b10f3a
Merge "Update the recovery files under SYSTEM/ if recovery patch is rebuilt"
...
am: ada0854169
Change-Id: I78c545cc1236d0392c67223a379386a07a0fd6d2
2017-05-27 00:23:14 +00:00
Tianjie Xu
616fbeb144
Move recovery building from sign_target_files_apk to add_img_to_target_files
...
Currently we're building the boot/recovery image twice, which is
redundant. And b/38455129 shows a problematic case when the image
from two builds doesn't match. We should only build the recovery
image once in the add_img_to_target_files.
Bug: 62021378
Test: call sign_target_files_apk on an angler target file,
recovery-from-boot.p generates successfully; and SHA of recovery.img
matches the one in install-recovery.sh.
Change-Id: I01e033501d80c18a87cbb870300eee5c19a04441
2017-05-26 17:20:22 -07:00
Tianjie Xu
ada0854169
Merge "Update the recovery files under SYSTEM/ if recovery patch is rebuilt"
2017-05-27 00:15:58 +00:00
Jeff Gaston
143f2b1fe5
Add blueprint_tools as default target
...
Bug: 38351765
Test: rm out -rf && m -j && stat out/soong/host/*/bin/bpfmt
Change-Id: I60ededa1b13fb575616162d6dc1b0b8159f97f20
2017-05-26 17:12:40 -07:00
Miao Wang
b19c923c77
Merge "Update RenderScript build config and definitions." am: dddd7738d0
am: 4751b9e700
...
am: 527eee8b8f
Change-Id: Ife66e15b0c458a9fb622e56b7ab348e345d780b0
2017-05-26 22:51:36 +00:00
Miao Wang
527eee8b8f
Merge "Update RenderScript build config and definitions." am: dddd7738d0
...
am: 4751b9e700
Change-Id: I954a88adba2b071f415cfc87ccc87d4029d8c86f
2017-05-26 22:44:37 +00:00
Tianjie Xu
38af07ff20
Update the recovery files under SYSTEM/ if recovery patch is rebuilt
...
If we pass "rebuild_recovery" to add_img_to_target_files, the recovery
patch is rebuilt. But related files under SYSTEM/ (e.g.
SYSTEM/recovery-from-boot.p && SYSTEM/bin/install-recovery.sh) are not
updated.
This may cause a mismatch between system.img and SYSTEM/, and
may lead to a failure in validate_target_files.py.
Bug: 62096364
Test: Rebuild the system image in the TF and observe the recovery files
under SYSTEM/ get updated.
Change-Id: I7d679a612a86d02cf2eff81d1d120c0067138ed9
2017-05-26 22:40:23 +00:00
Miao Wang
4751b9e700
Merge "Update RenderScript build config and definitions."
...
am: dddd7738d0
Change-Id: I4a901ca9c2c9dcd7390d67f14e0e01679434a997
2017-05-26 22:35:43 +00:00
Treehugger Robot
dddd7738d0
Merge "Update RenderScript build config and definitions."
2017-05-26 22:29:36 +00:00
Dan Willemsen
118ceaea9a
Merge changes I73787aff,I0d149812 am: 64caaf4679
am: 060e215f84
...
am: 6106d440c1
Change-Id: I509ee75ca9ee6c8dcacb839103d499bfe790dd23
2017-05-26 22:16:34 +00:00
Dan Willemsen
6106d440c1
Merge changes I73787aff,I0d149812 am: 64caaf4679
...
am: 060e215f84
Change-Id: Ia7980c979b1d3a4cff9d434e9ff644a3083f7e4a
2017-05-26 22:14:33 +00:00
Dan Willemsen
060e215f84
Merge changes I73787aff,I0d149812
...
am: 64caaf4679
Change-Id: I6ab81dc88f6b642637ed6c87c2f551d5bdd4d661
2017-05-26 22:12:35 +00:00
Treehugger Robot
64caaf4679
Merge changes I73787aff,I0d149812
...
* changes:
Move APP-% and PRODUCT-% implementation out of Kati
Remove the rest of showcommands, dist goal
2017-05-26 22:08:49 +00:00
Miao Wang
a9fed83fae
Update RenderScript build config and definitions.
...
Bug: 38342163
- obj/lib is deprecated and TARGET_OUT_INTERMEDIATE_LIBRARIES will be
removed. We need to use per-module intermediates directory instead.
- prebuilts/ndk/current folder is gone. For libm and libc, we just
need ndk/r10 as stub libs for linking.
Test: mm and made sure this does not affect on device target.
Test: make -j50 FORCE_BUILD_RS_COMPAT=true RSTest_Compat works as
expected.
Change-Id: I8fbf5c10322707849a23c6b0dacc28b028db451e
2017-05-26 13:48:08 -07:00
Dan Willemsen
9bfcbc8a71
Move APP-% and PRODUCT-% implementation out of Kati
...
This way we'll share ninja files with the equivalent normal configs. We
were already parsing them in the make config step in order to fix
TARGET_PRODUCT / TARGET_BUILD_VARIANT / TARGET_BUILD_APPS, now they
replace themselves in MAKECMDGOALS with the appropriate goals.
If we're not going to pass any goals to ninja, pass the default goal.
Test: ALLOW_MISSING_DEPENDENCIES=true m -j APP-Calculator
Test: m -j PRODUCT-aosp_fugu-eng
Test: m -j PRODUCT-aosp_fugu-eng sdk
Test: m -j PRODUCT-aosp_fugu-sdk
Test: lunch aosp_arm64-userdebug; m -j
Test: lunch aosp_arm64-userdebug; m -j dist
Test: lunch aosp_arm64-userdebug; m -j adb
Change-Id: I73787aff9f74aed328e3fa75c571ae15a28851b0
2017-05-26 12:57:04 -07:00
Dan Willemsen
562baccae8
Remove the rest of showcommands, dist goal
...
showcommands is all handled in soong_ui, make/kati/ninja never see the
argument.
Remove the dist goal, since we'll never pass it to ninja, only to Kati
as a modifier.
Remove DUMP_%, since that's not used anywhere (it appears to be in our
code search via the NDK build system)
Test: m -j showcommands dist
Change-Id: I0d1498128caece685e98c2c2b5b0c3f545da0e11
2017-05-26 12:57:04 -07:00
Colin Cross
ce6d54c56b
Merge "Pass TARGET_BUILD_PDK to soong" am: 7bc6eb12f4
am: 999cc61a33
...
am: a7f07f6750
Change-Id: I2d5b90eae127bd5c050f76f568047b4783371d20
2017-05-26 19:45:24 +00:00
Colin Cross
a7f07f6750
Merge "Pass TARGET_BUILD_PDK to soong" am: 7bc6eb12f4
...
am: 999cc61a33
Change-Id: I29dad564098ae4bc2b61a8ccde73622b8187d44e
2017-05-26 19:42:54 +00:00
Colin Cross
999cc61a33
Merge "Pass TARGET_BUILD_PDK to soong"
...
am: 7bc6eb12f4
Change-Id: Ice6f5402d0f1e5af1bb36b71e3888c04ff6bb492
2017-05-26 19:39:54 +00:00
Colin Cross
7bc6eb12f4
Merge "Pass TARGET_BUILD_PDK to soong"
2017-05-26 19:34:32 +00:00
Tobias Thierer
206b85e3b2
Merge changes from topic 'bug_38177295_checkbuild' am: bc8f82ff25
am: 0556ad1a71
...
am: 3dd019b9c4
Change-Id: I7dd63314b4aace5f308aca6b28bf4af671f183fa
2017-05-26 15:49:36 +00:00
Tobias Thierer
3dd019b9c4
Merge changes from topic 'bug_38177295_checkbuild' am: bc8f82ff25
...
am: 0556ad1a71
Change-Id: Id348090022adb631a5cd8f568dbc38a4c8d4d550
2017-05-26 12:19:40 +00:00
Tobias Thierer
0556ad1a71
Merge changes from topic 'bug_38177295_checkbuild'
...
am: bc8f82ff25
Change-Id: Id1ecb9598aa7ed3675d7d602821a1b9d376b627d
2017-05-26 12:14:01 +00:00
Tobias Thierer
bc8f82ff25
Merge changes from topic 'bug_38177295_checkbuild'
...
* changes:
Let signapk access internal APIs under OpenJDK 9 toolchain
Desugar: allow reflection over internal APIs.
2017-05-26 12:08:39 +00:00