Commit graph

55370 commits

Author SHA1 Message Date
Xin Li
af9d36715a [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: c2852177bb -s ours
am: c801230025 -s ours
am skip reason: subject contains skip directive

Change-Id: Id6432055f8db2ba0febed140a780d2049772b2ea
2019-08-14 23:49:24 -07:00
Xin Li
c801230025 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
am: c2852177bb -s ours
am skip reason: subject contains skip directive

Change-Id: I31703244f0d5dec81d43625277ef1bce4d6ad570
2019-08-14 23:29:27 -07: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
f595d3a216 [automerger skipped] Merge "Makefile uses add_img_to_target_files module." am: 27480a0cf4 -s ours am: 03e726ce10 -s ours
am: d531e4f984 -s ours
am skip reason: change_id Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117 with SHA1 c1966a8bdd is in history

Change-Id: I7565e807525c18ad619e85c743d8d4662749d3b5
2019-08-14 22:13:51 -07:00
Tao Bao
d531e4f984 [automerger skipped] Merge "Makefile uses add_img_to_target_files module." am: 27480a0cf4 -s ours
am: 03e726ce10 -s ours
am skip reason: change_id Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117 with SHA1 c1966a8bdd is in history

Change-Id: I46a6f921e67f78523b3940da59cff4bd065e2a17
2019-08-14 22:03:50 -07:00
Tao Bao
03e726ce10 [automerger skipped] Merge "Makefile uses add_img_to_target_files module."
am: 27480a0cf4 -s ours
am skip reason: change_id Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117 with SHA1 c1966a8bdd is in history

Change-Id: Ia777279685dc98bb7490380db88a31f32dac5921
2019-08-14 21:53:30 -07:00
Tao Bao
27480a0cf4 Merge "Makefile uses add_img_to_target_files module." 2019-08-15 04:27:08 +00:00
Hsin-Yi Chen
a44dbe5443 Merge "Add tags to lsdump_paths.txt" am: 7205361315 am: a489b755a0
am: c5a074798f

Change-Id: I8de9939fe9dddc1b4228801accba8ac7aadb5617
2019-08-14 20:03:42 -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
Paul Scovanner
3250cbd459 [DO NOT MERGE] Update Security Strings to 2019-10-01
Bug:139434268
Change-Id: Ie9e36ac0ace5c67468391650ad2fa1fa02941f6e
2019-08-15 02:52:20 +00: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
1e15d33232 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours am: 616d794540
am: 36c17b8465

Change-Id: I1672ee8dc5afb8e2b42df7c7e01cda4947722825
2019-08-14 19:44:28 -07:00
Paul Scovanner
0cafcd40dc [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours am: 616d794540
am: 5140669795

Change-Id: I14b56815c9078b256690abdff9492a540e4a8659
2019-08-14 19:36:12 -07:00
Android Build Merger (Role)
2021b3bc8e Merge "Update Security Strings to 2019-10-05 am: 84633edb22 am: e1d53f95a2" into qt-r1-dev-plus-aosp 2019-08-15 02:35:34 +00:00
Paul Scovanner
1a3c30ba72 Update Security Strings to 2019-10-05 am: 84633edb22
am: e1d53f95a2

Change-Id: I36210d628e0aec87c620894f241dd346b3c782c7
2019-08-14 19:35:22 -07:00
Paul Scovanner
28a43e18c7 Update Security Strings to 2019-10-05 am: 84633edb22
am: b6ef08709f

Change-Id: I4cf849301ae9106bdfff1844e28285d726bdd648
2019-08-14 19:35:18 -07:00
Paul Scovanner
36c17b8465 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours
am: 616d794540

Change-Id: I9582fb7b7b6160208d8e8bc26843dd4cdd3316cb
2019-08-14 19:34:55 -07:00
Paul Scovanner
5140669795 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01 am: b88c9853aa -s ours
am: 616d794540

Change-Id: I6464a4f9286fd3fafe1c5f5ca3f0766913dc98c2
2019-08-14 19:26:50 -07:00
Paul Scovanner
e1d53f95a2 Update Security Strings to 2019-10-05
am: 84633edb22

Change-Id: I360a2512006317b0999586a5567b0bf370ee120b
2019-08-14 19:26:11 -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
Paul Scovanner
616d794540 [automerger skipped] [DO NOT MERGE] Update Security Strings to 2019-09-01
am: b88c9853aa -s ours
am skip reason: subject contains skip directive

Change-Id: I9454feb6965bf8a9e56342a3f8348d5933ece914
2019-08-14 19:24:52 -07:00
Hsin-Yi Chen
7205361315 Merge "Add tags to lsdump_paths.txt" 2019-08-15 02:20:30 +00:00
Bill Peckham
2f880db3b6 Merge "Avoid adding VINTF manifest fragment more than once." am: fd25038f8a am: 861ffd1588
am: bdddae3195

Change-Id: Ibaca9bd017750cf2831245b62b375ae66c1d1aa0
2019-08-14 16:21:06 -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
Bill Peckham
fd25038f8a Merge "Avoid adding VINTF manifest fragment more than once." 2019-08-14 22:44:30 +00:00
Tao Bao
8ae2b470d1 Merge "Makefile uses add_img_to_target_files module." into stage-aosp-master am: 0a712a0834
am: 5b554c9814

Change-Id: Ib968f4a9528c5aad76372dac1fffbd4a814e34da
2019-08-14 15:27:53 -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
b88c9853aa [DO NOT MERGE] Update Security Strings to 2019-09-01
Bug:139434268
Change-Id: I802a7aeb0c65240ff71f91506b8932bfa44090bc
2019-08-14 22:17:07 +00:00
Tao Bao
0a712a0834 Merge "Makefile uses add_img_to_target_files module." into stage-aosp-master 2019-08-14 21:46:17 +00:00
Paul Scovanner
84633edb22 Update Security Strings to 2019-10-05
Bug:139434268
Change-Id: I063f0430347d9f1e6ea5a8133204585833ed5ddc
2019-08-14 21:11:01 +00:00
Xin Li
7207289400 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 5e0e14531d -s ours
am: 40068de16a

Change-Id: Id7c45531038611229c4e7e5a4be6131e78e90f3b
2019-08-14 13:43:00 -07:00
Xin Li
40068de16a [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
am: 5e0e14531d -s ours
am skip reason: subject contains skip directive

Change-Id: Idc30810f1b921b7f02d4ad725d3168844009cdeb
2019-08-14 13:17:55 -07:00
Xin Li
5e0e14531d DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
Bug: 134405016
Change-Id: I77df4ab2e9f680668c903a55394743b313082620
2019-08-14 11:35:07 -07: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
Tao Bao
af4ff5800b Merge "releasetools: Add more module building rules." am: 39369d08fb am: f4157c5859
am: 574b7d17cf

Change-Id: I4129b5dedd68a02c13795c67286f7a734d915a8f
2019-08-14 09:22:56 -07:00
Tao Bao
574b7d17cf Merge "releasetools: Add more module building rules." am: 39369d08fb
am: f4157c5859

Change-Id: Iefd1c96e0b2b145f596ac0ce8ec03cbf45a51834
2019-08-14 09:15:53 -07:00
Tao Bao
f4157c5859 Merge "releasetools: Add more module building rules."
am: 39369d08fb

Change-Id: Ic422023eceae40922a6251f32982cc1141f86aac
2019-08-14 09:08:50 -07:00
Tao Bao
39369d08fb Merge "releasetools: Add more module building rules." 2019-08-14 15:33:33 +00: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
android-build-team Robot
f31b1706bd Version bump to QP1A.190711.020 [core/build_id.mk]
Change-Id: I7d6a93de1023aede26137adeba5eb69cc67c8821
2019-08-14 00:24:13 +00: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
Dan Albert
d892b63a1d Link libc++demangle with libc++ for the device.
libc++demangle provides __cxa_demangle, which used to be a part of
libc++.so but is being moved out to save on resources since very few
libraries need it.

Test: make checkbuild
Bug: http://b/138245375
Change-Id: I677006dbbe87ccf2dd4df182114d2a6b985e3c00
2019-08-13 13:15:04 -07:00
Tao Bao
97ae716675 Merge "Revert "releasetools: Add a hard-coded codename-API mapping."" into qt-r1-dev-plus-aosp 2019-08-13 18:35:15 +00:00
Ramy Medhat
691df5187f Merge "Add labels to rewrapper cc compile action. Prevent ccwrapper from being used in links." am: f51a70b009 am: eef0efadb3
am: 65e4fb7ed0

Change-Id: I00ff9e8fdec4a729764f0879371aae4b45d80e3f
2019-08-13 11:00:15 -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