Paul Trautrim
d706864490
Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation" am: 23b46e54ac
am: bb78e6bfb8
am: bbcbababe7
am: 0104c9bbe1
...
am: 6319f2ac49
Change-Id: I983663eb2d25e3081d9e17830dd35720942b685e
2019-08-19 18:25:49 -07:00
Paul Trautrim
bbcbababe7
Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation" am: 23b46e54ac
...
am: bb78e6bfb8
Change-Id: I5928cc2d7c1620fee5750a026f10912af4899be4
2019-08-19 17:53:41 -07:00
Paul Trautrim
bb78e6bfb8
Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation"
...
am: 23b46e54ac
Change-Id: Idc47cbfa3c54faa3656d2df156fef55ba5546ebd
2019-08-19 17:43:39 -07:00
Paul Trautrim
23b46e54ac
Merge "Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation"
2019-08-20 00:07:35 +00:00
nelsonli
8311a92538
Merge "VTS: Add vts-core to the dependency of tests" am: 1413925ac4
am: 7dc1cbe13c
am: 5530deacd9
am: 13586d7aa0
...
am: 5ba1c3c713
Change-Id: Iefce3247a67aefecee92a31b35c1404bab9d3039
2019-08-15 19:48:12 -07:00
Tao Bao
681794907e
Merge "Merge "Stop packing system/update_engine/scripts." am: d994b4c062
am: 22fa2f20ae
am: b5de826520" into qt-r1-dev-plus-aosp am: 5a79920c47
...
am: 543cc0681f
Change-Id: Ica9b26c119ab6917c6271ec906ee70e86a9c79cd
2019-08-15 19:25:31 -07:00
nelsonli
5530deacd9
Merge "VTS: Add vts-core to the dependency of tests" am: 1413925ac4
...
am: 7dc1cbe13c
Change-Id: I1963cfc0f1bcf56d1e86c4c91fec1ed7ee9eec59
2019-08-15 19:00:23 -07:00
nelsonli
7dc1cbe13c
Merge "VTS: Add vts-core to the dependency of tests"
...
am: 1413925ac4
Change-Id: I6a2dd9858e0a9c30d1d08b0815c5fbc54e568c5c
2019-08-15 18:48:35 -07:00
Treehugger Robot
1413925ac4
Merge "VTS: Add vts-core to the dependency of tests"
2019-08-16 01:21:02 +00:00
Tao Bao
b5de826520
Merge "Stop packing system/update_engine/scripts." am: d994b4c062
...
am: 22fa2f20ae
Change-Id: I051e5058bc83d15b227c98b77c131e53d88718c7
2019-08-15 17:32:09 -07:00
Tao Bao
22fa2f20ae
Merge "Stop packing system/update_engine/scripts."
...
am: d994b4c062
Change-Id: Iaa3633d3c087d3962d3408c4aefe33037f68f430
2019-08-15 16:44:43 -07:00
Tao Bao
d994b4c062
Merge "Stop packing system/update_engine/scripts."
2019-08-15 23:09:21 +00:00
Colin Cross
7deabe55c9
Merge "Make javamicro a plugin" am: c61d0f966b
am: fb4c69eebc
am: 6c67eb9837
am: e982683c38
...
am: b8e58b16df
Change-Id: Ib4d677410b8446d30e7957209f3a222939afcbc8
2019-08-15 15:57:25 -07:00
Colin Cross
6c67eb9837
Merge "Make javamicro a plugin" am: c61d0f966b
...
am: fb4c69eebc
Change-Id: Iedaa4b1d2386c3f77696440ed0a2eee9cf1fcfcd
2019-08-15 13:35:17 -07:00
Colin Cross
fb4c69eebc
Merge "Make javamicro a plugin"
...
am: c61d0f966b
Change-Id: Ie4a9eca7b0fc9043f777947cf2cf3898f37c7c24
2019-08-15 13:13:23 -07:00
Tao Bao
07997f1bb4
Stop packing system/update_engine/scripts.
...
We once attempted to use them (by importing from releasetools scripts)
to parse payload. Due to the dependency on google.protobuf, we have
switched to delta_generator instead (commit 750385e4
).
Bug: 65261072
Test: `m -j otatools-package`; and check the related scripts are not
included.
Change-Id: Iaa8bcb0e2792e48512e1b8db29869db875ba8dc9
2019-08-15 12:10:05 -07:00
Treehugger Robot
c61d0f966b
Merge "Make javamicro a plugin"
2019-08-15 18:18:38 +00:00
Remi NGUYEN VAN
30d8199b87
Merge "Add a product build var for mainline module certs" am: a7832d5543
am: ff51a362fd
am: 79f85cbbca
am: c866dd5930
...
am: 09ecfdde00
Change-Id: Id7607f9f44e36e4c10f381cf8e06c81d077c1c98
2019-08-15 01:50:11 -07:00
Remi NGUYEN VAN
79f85cbbca
Merge "Add a product build var for mainline module certs" am: a7832d5543
...
am: ff51a362fd
Change-Id: I0f4991dfb7d9e84dae5f22b9a2c13295bbc3038d
2019-08-15 01:21:20 -07:00
Remi NGUYEN VAN
ff51a362fd
Merge "Add a product build var for mainline module certs"
...
am: a7832d5543
Change-Id: I00c77685a3b630049a2f578258d54cdc6e973e3a
2019-08-15 01:11:22 -07:00
Treehugger Robot
a7832d5543
Merge "Add a product build var for mainline module certs"
2019-08-15 07:43:46 +00:00
Treehugger Robot
c2852177bb
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
2019-08-15 06:13:48 +00:00
Tao Bao
27480a0cf4
Merge "Makefile uses add_img_to_target_files module."
2019-08-15 04:27:08 +00:00
Hsin-Yi Chen
7234d5e230
Merge "Add tags to lsdump_paths.txt" am: 7205361315
am: a489b755a0
am: c5a074798f
am: a44dbe5443
...
am: 8c2ff18afc
Change-Id: I253e700ffa1c5ed41b07b9dd4c07be09907e1430
2019-08-14 20:23:52 -07:00
Paul Scovanner
3dc48fb48c
Update Security Strings to 2019-10-05 am: 84633edb22
am: b6ef08709f
am: 28a43e18c7
...
am: d9cdf3078b
Change-Id: Icad8e87d0404dbe75b16f12dcb6ad9e73334557f
2019-08-14 19:54:27 -07:00
Hsin-Yi Chen
c5a074798f
Merge "Add tags to lsdump_paths.txt" am: 7205361315
...
am: a489b755a0
Change-Id: Iff9f0a21911dcd0478e93eab5452f0d6263af990
2019-08-14 19:54:10 -07:00
Hsin-Yi Chen
a489b755a0
Merge "Add tags to lsdump_paths.txt"
...
am: 7205361315
Change-Id: I4874b39acd4727e6969c8ddb235c773c46ee8972
2019-08-14 19:44:40 -07:00
Paul Scovanner
b6ef08709f
Update Security Strings to 2019-10-05
...
am: 84633edb22
Change-Id: Id72288336ca859f6f0bde987876d017f0d36b906
2019-08-14 19:25:16 -07:00
Hsin-Yi Chen
7205361315
Merge "Add tags to lsdump_paths.txt"
2019-08-15 02:20:30 +00:00
Bill Peckham
ec60885055
Merge "Avoid adding VINTF manifest fragment more than once." am: fd25038f8a
am: 861ffd1588
am: bdddae3195
am: 2f880db3b6
...
am: d6e81a6795
Change-Id: I74d24aed4bf8a155a1550aad4a22008d4ed0688a
2019-08-14 16:48:12 -07:00
Tao Bao
77033f6b4d
Merge "Makefile uses add_img_to_target_files module." into stage-aosp-master am: 0a712a0834
am: 5b554c9814
am: 8ae2b470d1
...
am: cc633571a5
Change-Id: Ie5d8b9750bc57807b6a941c8c7dac8b8237f8e1f
2019-08-14 16:30:13 -07:00
Bill Peckham
bdddae3195
Merge "Avoid adding VINTF manifest fragment more than once." am: fd25038f8a
...
am: 861ffd1588
Change-Id: Ia0fbf2ffc7425c2cfede6bd4ae6a2ed1c1c6ed25
2019-08-14 16:13:03 -07:00
Bill Peckham
861ffd1588
Merge "Avoid adding VINTF manifest fragment more than once."
...
am: fd25038f8a
Change-Id: I44c12257269e039c78f20330fa5713775fec3b65
2019-08-14 16:04:02 -07:00
Tao Bao
5b554c9814
Merge "Makefile uses add_img_to_target_files module." into stage-aosp-master
...
am: 0a712a0834
Change-Id: Ibb92b56d4cf339f8fbff2dade7aad0f7fc0dbd63
2019-08-14 15:18:52 -07:00
Paul Scovanner
84633edb22
Update Security Strings to 2019-10-05
...
Bug:139434268
Change-Id: I063f0430347d9f1e6ea5a8133204585833ed5ddc
2019-08-14 21:11:01 +00:00
Tao Bao
c1966a8bdd
Makefile uses add_img_to_target_files module.
...
Also pack additional tools into otatools.zip.
Bug: 63866463
Test: TreeHugger
Test: `m -j otatools-package`; Check the packed tools.
Change-Id: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
(cherry picked from commit 1cf8bf0c14
)
2019-08-14 10:44:53 -07:00
Tao Bao
1cf8bf0c14
Makefile uses add_img_to_target_files module.
...
Also pack additional tools into otatools.zip.
Bug: 63866463
Test: TreeHugger
Test: `m -j otatools-package`; Check the packed tools.
Change-Id: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
Merged-In: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
2019-08-14 10:34:59 -07:00
nelsonli
e7b71a18a4
VTS: Add vts-core to the dependency of tests
...
Bug: 137921421
Test: (1) m tests
(2) check vts-core-tests.zip
For migrating most existing VTS test to executable by Base TradeFed, we have to
create vts-core suite and test all of the modules in vts-core first.
And add the packaging rules for vts-core suite.
Bug: 137921421
Change-Id: Ifc92db205c78db98abf704aa6dfa50f1f77e983d
2019-08-14 09:47:21 +08:00
Colin Cross
869febddb9
Make javamicro a plugin
...
Treat LOCAL_PROTOC_OPTIMIZE_TYPE := javamicro as a plugin by
explicitly passing the path to protoc-gen-javamicro. This allows
removing the javamicro customizations from the core plugin code.
Bug: 117607748
Test: m checkbuild
Change-Id: I199f47a64a454594a2fff4c5580c53fd17e0bdee
2019-08-13 16:58:45 -07:00
Xin Li
bcb39c6c34
DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
...
Bug: 139369544
Change-Id: I205bd2801280b265407a31ec283c2ff9265b9a0a
2019-08-13 16:43:29 -07:00
Bill Peckham
6733381fce
Avoid adding VINTF manifest fragment more than once.
...
In the case of building a multilib library that defines LOCAL_VINTF_FRAGMENTS,
the previous code would create duplicate rules for the fragment. This change
uses the my_vintf_new_installed variable (which may be empty) to avoid the
duplication.
Bug: 139268165
Test: Verify that build warnings are gone, yet VINTF fragment still installed.
Change-Id: I579ec650019a29a6a105118ad5e5ae9376e8d9bc
2019-08-13 16:05:34 -07:00
Ramy Medhat
91c08f5454
Merge "Add labels to rewrapper cc compile action. Prevent ccwrapper from being used in links." am: f51a70b009
am: eef0efadb3
am: 65e4fb7ed0
am: 691df5187f
...
am: a576d9a9a2
Change-Id: Ibd38843100bda66505112f0b2b9f747082d24454
2019-08-13 11:18:48 -07:00
Ramy Medhat
65e4fb7ed0
Merge "Add labels to rewrapper cc compile action. Prevent ccwrapper from being used in links." am: f51a70b009
...
am: eef0efadb3
Change-Id: Id8f89f9d577c35b340d25c6656a3f019fe2333a9
2019-08-13 10:54:10 -07:00
Ramy Medhat
eef0efadb3
Merge "Add labels to rewrapper cc compile action. Prevent ccwrapper from being used in links."
...
am: f51a70b009
Change-Id: I08921d50243c3984a2edd518750465b58896b4d9
2019-08-13 10:48:10 -07:00
Ramy Medhat
f51a70b009
Merge "Add labels to rewrapper cc compile action. Prevent ccwrapper from being used in links."
2019-08-13 17:17:05 +00:00
android-build-team Robot
3ca130e871
Make change and version bump to PPRL.190801.002
...
Change-Id: I2f623d5f6e2a908aee4b3988df20179a3095a330
2019-08-13 16:39:58 +00:00
Paul Trautrim
4e14323a31
Add PRODUCT_BUILD_VBMETA_IMAGE to control vbmeta generation
...
In line with the existing PRODUCT_BUILD_*_IMAGE variables, add a flag to
control whether vbmeta is generated.
Bug: 139328573
Test: manual
Change-Id: Id71026f9b0de9019e82e8ef594e718a4b0f3628f
2019-08-13 16:43:39 +09:00
Ramy Medhat
e5839f912b
Add labels to rewrapper cc compile action. Prevent ccwrapper from being
...
used in links.
Test: Built aosp-arm64_eng with and without USE_RBE=1
Change-Id: I8d04069219a9467c3de9a028eb68e3115173f1e2
2019-08-12 14:13:31 -04:00
vichang
ded3fee103
Merge "Add new core-icu4j after separating icu4j from core-libart" am: ba6135bd80
am: 940002a285
am: fb32056caa
am: 9d824c1acc
...
am: 9159df09a8
Change-Id: Ibb400d8b5fdeffa2cdb32d911c3a4007db0857ea
2019-08-12 10:12:05 -07:00
vichang
fb32056caa
Merge "Add new core-icu4j after separating icu4j from core-libart" am: ba6135bd80
...
am: 940002a285
Change-Id: I94f1e9f9de78187e15452fbb1bba10609034e346
2019-08-12 09:22:11 -07:00