Bill Peckham
5f2ae4e685
Merge "Extract common.UnzipToDir, invoke that from merge_target_files.py" am: a2f536f9fa
...
am: 0ea998133c
Change-Id: Ibe123e2da4a7adde01e1bc64b5781bd4f3b4d64a
2019-02-25 22:07:35 -08:00
Dan Willemsen
662380e517
Merge "Deprecate *.c[pp].arm" am: fb8c9673e7
...
am: 5d340e1552
Change-Id: I01be7a169848987dc94e57c97e7e87f36de9502d
2019-02-25 21:57:21 -08:00
Nicolas Geoffray
66ce15bd22
Merge "Support for install multiple boot images." am: 3b813d10bb
am: 605280d1dc
...
am: 3278e301b9
Change-Id: Ida110b67c847857097cd85b054c2ab04845e327f
2019-02-25 21:06:05 -08:00
Ray Essick
a8e1d084bb
Remove libmediaplayerservice from base components
...
Let libmediaplayerservice be pulled as a dependency from mediaserver. This
also means that it only pulls in the flavor (32/64-bit) needed for mediaserver.
Bug: 16890215
Test: build, check results, boot
2019-02-25 21:00:15 -08:00
Nicolas Geoffray
3278e301b9
Merge "Support for install multiple boot images." am: 3b813d10bb
...
am: 605280d1dc
Change-Id: I4cd36a78c96e0be2a873168ee07901f0e047db1f
2019-02-25 20:10:07 -08:00
Xin Li
5cca159adb
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master am: 1cc579adef
-s ours
...
am: b114022197
-s ours
am skip reason: subject contains skip directive
Change-Id: Id0acb96f4ddae1162e9b314e05e480f340206066
2019-02-25 17:41:46 -08:00
Xin Li
3ad3b3ac62
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 0e2ccf21c9
-s ours
...
am: 4dfd48f297
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibb3f2944ad28298203abd126d7dd30397bf8cd3c
2019-02-25 17:13:22 -08:00
Xin Li
b114022197
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master
...
am: 1cc579adef
-s ours
am skip reason: subject contains skip directive
Change-Id: Iaf18a09143518d140494caac1d71ddac57532362
2019-02-25 17:10:47 -08:00
Yifan Hong
accf09b2e0
Fix dynamic partition size check for devices with recovery
...
Devices with TARGET_NO_RECOVERY unset will contain a patch
of the recovery image in the system image. Fix
corresponding size checks.
Fixes: 120043292
Bug: 124489494
Test: build cuttlefish with DAP
Change-Id: I508881f421672180ab852c0f9216184b925d83ad
2019-02-25 16:10:43 -08:00
Xin Li
4dfd48f297
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
am: 0e2ccf21c9
-s ours
am skip reason: subject contains skip directive
Change-Id: Ieb11745cb0644e64bcca221c32995843ca75eaa9
2019-02-25 16:10:15 -08:00
Bill Peckham
0ea998133c
Merge "Extract common.UnzipToDir, invoke that from merge_target_files.py"
...
am: a2f536f9fa
Change-Id: I10fcfc3008d0699c92c53405d488c66571ef66ec
2019-02-25 15:55:39 -08:00
Bill Peckham
a2f536f9fa
Merge "Extract common.UnzipToDir, invoke that from merge_target_files.py"
2019-02-25 23:42:44 +00:00
Dan Willemsen
5d340e1552
Merge "Deprecate *.c[pp].arm"
...
am: fb8c9673e7
Change-Id: I45b1d106affd02ea2e9c77fd462d1d6e7269377f
2019-02-25 14:57:01 -08:00
Dan Willemsen
fb8c9673e7
Merge "Deprecate *.c[pp].arm"
2019-02-25 21:28:31 +00:00
Nicolas Geoffray
605280d1dc
Merge "Support for install multiple boot images."
...
am: 3b813d10bb
Change-Id: I86e2d5507616c9f91f2748b3238e851f3c56eb47
2019-02-24 05:46:37 -08:00
Nicolas Geoffray
3b813d10bb
Merge "Support for install multiple boot images."
2019-02-24 13:37:01 +00:00
Paul Duffin
f0d5d718af
Merge "Remove usages of legacy-test and legacy-android-test" am: 8f948fe292
am: 44b8a17093
...
am: 0854851f7e
Change-Id: Ia796c224e8949fd3cc24009056cd7a5a961527e6
2019-02-22 20:53:48 -08:00
Bill Peckham
d8c9c2d58f
Merge "Convert common.RunAndWait method to raise an exception on subprocess failure." am: dd4e2e59aa
am: ecd47a1991
...
am: 108afbcde6
Change-Id: Ic1b389d8114229aaa3d45ebdcdfb74f4ebad85b3
2019-02-22 20:52:42 -08:00
Anton Hansson
bf590c2aaa
Merge "Add support for *_CPU_VARIANT_RUNTIME flags" am: 4208c81ab9
am: bc732bf45b
...
am: a2d24017f3
Change-Id: I9f1455d5c51a6343289c1189f19491a2bbaa73af
2019-02-22 20:51:34 -08:00
Orion Hodson
561c9a0bf5
Merge "Add libartpalette-system" am: 6997dbd6ca
am: 1cc983f9b2
...
am: 4a3b7fa166
Change-Id: I54271964ac4d70e09e2b319eff1ec2bc2e19a704
2019-02-22 20:50:30 -08:00
Anton Hansson
ee466e1a5f
Merge "Move ART cpu properties to /vendor" am: b5312392a0
am: 768455a3d4
...
am: 8fae47028f
Change-Id: Id3607f688a885333cfba72e26479b84621b2fcb6
2019-02-22 20:49:23 -08:00
Anton Hansson
751f86f81a
Merge "Add more BoardConfig variables to stash list" am: 299ffb7870
am: 56a0405ec6
...
am: 17a4def424
Change-Id: I02adf1b9d144ddab649a50dcd99c7baaba55a4b4
2019-02-22 20:48:07 -08:00
Logan Chien
26e7e59514
Merge "Refine lsdump_paths.txt dependencies" am: 7d35910451
am: a3146e8c0a
...
am: e12bfc81b9
Change-Id: I38ef4948e3bc8f07df6735fb56dd682d5baf41e6
2019-02-22 20:47:04 -08:00
Sasha Smundak
baaaf97e72
Merge "Add a wrapper file for the vts_config module." am: f97ed91448
am: f097a2248c
...
am: dd3122dc48
Change-Id: I9818a95d84894151e2743b388617a2146d066024
2019-02-22 20:45:30 -08:00
Colin Cross
6ef81e0397
Merge "Get DEXPREOPT_BOOT_JARS_MODULES from Soong" am: 6128b1e8d6
am: 54ac6ed073
...
am: 0ee78f3aa1
Change-Id: Id4cb7ce5818b302d936487ec964b24b3af44d42f
2019-02-22 20:43:35 -08:00
Paul Duffin
0854851f7e
Merge "Remove usages of legacy-test and legacy-android-test" am: 8f948fe292
...
am: 44b8a17093
Change-Id: I34c39afae056a067e25abb87732a902baf9c35c9
2019-02-22 20:38:13 -08:00
Bill Peckham
108afbcde6
Merge "Convert common.RunAndWait method to raise an exception on subprocess failure." am: dd4e2e59aa
...
am: ecd47a1991
Change-Id: Ie0609d3e09dcc060bb98b9b67d70a7128e6da420
2019-02-22 20:37:30 -08:00
Tianjie Xu
376907886a
Merge "Dump a copy of metadata file for full OTA" am: df5978803d
am: 407c972bfa
...
am: 061dfe08eb
Change-Id: I9cef1b8f71954b66ce6a0abda28103edada08b67
2019-02-22 20:37:16 -08:00
Anton Hansson
a2d24017f3
Merge "Add support for *_CPU_VARIANT_RUNTIME flags" am: 4208c81ab9
...
am: bc732bf45b
Change-Id: If5adc4e9d24575bfadcdc30dacaa2a26afd34326
2019-02-22 20:36:47 -08:00
Orion Hodson
4a3b7fa166
Merge "Add libartpalette-system" am: 6997dbd6ca
...
am: 1cc983f9b2
Change-Id: Id747ea9e4853d2ad326a524e2a9144cdafaf226c
2019-02-22 20:36:00 -08:00
Colin Cross
6389c88239
Merge "Update calls to dexpreopt_gen" am: 0450863eca
am: 39fb391e8f
...
am: c4114d9641
Change-Id: Id3c60d88280b065a907ce0fe4b67e710b8fe3901
2019-02-22 20:35:33 -08:00
Anton Hansson
8fae47028f
Merge "Move ART cpu properties to /vendor" am: b5312392a0
...
am: 768455a3d4
Change-Id: I7e149ab5fe1218bc9a90d26693ef72275be7b599
2019-02-22 20:35:16 -08:00
Anton Hansson
17a4def424
Merge "Add more BoardConfig variables to stash list" am: 299ffb7870
...
am: 56a0405ec6
Change-Id: I51ca88c3a5c665a3d48783d272fed24f41af23c6
2019-02-22 20:34:31 -08:00
Logan Chien
e12bfc81b9
Merge "Refine lsdump_paths.txt dependencies" am: 7d35910451
...
am: a3146e8c0a
Change-Id: I91aceb743c7131206a39b11434c102d91bdd013a
2019-02-22 20:33:49 -08:00
Sasha Smundak
dd3122dc48
Merge "Add a wrapper file for the vts_config module." am: f97ed91448
...
am: f097a2248c
Change-Id: I80b74bc7083a4dd4c3c0154636b9dec947f3a53d
2019-02-22 20:33:06 -08:00
Colin Cross
0ee78f3aa1
Merge "Get DEXPREOPT_BOOT_JARS_MODULES from Soong" am: 6128b1e8d6
...
am: 54ac6ed073
Change-Id: Iebdc7eabb9b5692832099c04ef84db9142912921
2019-02-22 20:31:28 -08:00
Tianjie Xu
061dfe08eb
Merge "Dump a copy of metadata file for full OTA" am: df5978803d
...
am: 407c972bfa
Change-Id: I910f06f7dd01013b7b21cafab3d06e38514a5963
2019-02-22 20:30:41 -08:00
Colin Cross
c4114d9641
Merge "Update calls to dexpreopt_gen" am: 0450863eca
...
am: 39fb391e8f
Change-Id: I6093e9e136d8215d12d25fd22cddb5cbe61d08b2
2019-02-22 20:29:19 -08:00
Xin Li
1cc579adef
Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master
2019-02-23 00:39:21 +00:00
Dan Willemsen
ce54b9c8d8
Merge "Revert "First pass at creating PRODUCT_HOST_PACKAGES""
2019-02-22 22:03:32 +00:00
Dan Willemsen
086f8f002c
Revert "First pass at creating PRODUCT_HOST_PACKAGES"
...
This reverts commit 7218a21ed0
.
Reason for revert: broke some side branches, and the mac build
Change-Id: Ifa52f2dbf9a383f69e07ba0aceb4742b05376364
Fixes: 125912305
2019-02-22 22:02:23 +00:00
Dan Willemsen
5cd6dc5a40
Merge "First pass at creating PRODUCT_HOST_PACKAGES"
2019-02-22 20:24:36 +00:00
Paul Duffin
44b8a17093
Merge "Remove usages of legacy-test and legacy-android-test"
...
am: 8f948fe292
Change-Id: I31808af63cbb2ceaa86c7243581d01048f39d406
2019-02-22 12:16:29 -08:00
Treehugger Robot
8f948fe292
Merge "Remove usages of legacy-test and legacy-android-test"
2019-02-22 19:58:16 +00:00
Bill Peckham
8ff3fbdd08
Extract common.UnzipToDir, invoke that from merge_target_files.py
...
This change adds another utility function to common.py: UnzipToDir, which is
generally useful. Refactor merge_target_files.py to use it, and also refactor
other uses in common.py to use it.
Test: ota_from_target_files.py, validate_target_files.py, test_common.py
Bug: 124464492
Change-Id: Ia571070bceb7d3c8002304836bdf688485bf0dd9
2019-02-22 10:57:43 -08:00
Paul Duffin
a0d31e733b
Remove usages of legacy-test and legacy-android-test
...
Bug: 63127064
Test: TH
Change-Id: I2f71b8dab6a5303cae24e36d6519a4001af66063
2019-02-22 15:45:03 +00:00
Nicolas Geoffray
269bc741a5
Support for install multiple boot images.
...
Bug: 119800099
Test: m && /system/framework/arm/apex*.art files exist
Change-Id: I78023f1086446c2c44ff6b282993537b053c0588
2019-02-22 15:33:23 +00:00
Bill Peckham
ecd47a1991
Merge "Convert common.RunAndWait method to raise an exception on subprocess failure."
...
am: dd4e2e59aa
Change-Id: I39d130ace39aefccdd55b7b2daa5e4da6325fd07
2019-02-22 06:42:41 -08:00
Bill Peckham
dd4e2e59aa
Merge "Convert common.RunAndWait method to raise an exception on subprocess failure."
2019-02-22 14:32:07 +00:00
Anton Hansson
bc732bf45b
Merge "Add support for *_CPU_VARIANT_RUNTIME flags"
...
am: 4208c81ab9
Change-Id: I6db4e1b734fe50bc09688b83b2cb6977cca53c37
2019-02-22 04:46:22 -08:00