Commit Graph

49138 Commits

Author SHA1 Message Date
Dan Albert f93f99d4f1 Merge "Revert "Differentiate between runtime apex jars and framework jars.""
am: fc67ea8dd3

Change-Id: I466c022c3f10aa1309204d591cdbaa61e1aed53e
2019-01-24 15:30:27 -08:00
Dan Albert fc67ea8dd3 Merge "Revert "Differentiate between runtime apex jars and framework jars."" 2019-01-24 23:16:20 +00:00
Nicolas Geoffray 12746221c2 Revert "Differentiate between runtime apex jars and framework jars."
This reverts commit 6bcc93983b.

Reason for revert: Sailfish running out of space.

Change-Id: I2a82aa27bb4388a3cdb94f9271c712644064bfad
2019-01-24 20:37:37 +00:00
Hsin-Yi Chen d5b62bf90e Merge "Add security patch level to hashtree footer of system" am: 8faac3669e
am: 3e0a271f61

Change-Id: I580e658ae8254c819b19bbf256ecbf92d6818271
2019-01-24 12:09:28 -08:00
Hsin-Yi Chen 3e0a271f61 Merge "Add security patch level to hashtree footer of system"
am: 8faac3669e

Change-Id: I96415c5a24eb4c3fc27e8ead84b6a76b6bd96f0c
2019-01-24 11:57:10 -08:00
Treehugger Robot 8faac3669e Merge "Add security patch level to hashtree footer of system" 2019-01-24 19:28:29 +00:00
Paul Duffin 7d2a8a5668 Merge "Remove REMOVE_OAHL_FROM_BCP flag" am: 22efcc114e
am: 5941366ce2

Change-Id: I1078642bd545e387b9e43184ca8f03a1b685d70f
2019-01-24 08:17:09 -08:00
Paul Duffin 5941366ce2 Merge "Remove REMOVE_OAHL_FROM_BCP flag"
am: 22efcc114e

Change-Id: I44119648a93a299a3d1901fcad695c57372743f9
2019-01-24 08:10:56 -08:00
Paul Duffin 22efcc114e Merge "Remove REMOVE_OAHL_FROM_BCP flag" 2019-01-24 16:01:40 +00:00
Nicolas Geoffray 9828c28666 Merge "Differentiate between runtime apex jars and framework jars." am: 9f5ed17225
am: af71ed2cd5

Change-Id: Ic45a96107a7a786bf9d2ce12fd7d7883e9f1e8fb
2019-01-24 07:05:20 -08:00
Nicolas Geoffray af71ed2cd5 Merge "Differentiate between runtime apex jars and framework jars."
am: 9f5ed17225

Change-Id: I9c15b673b1fc85fb1949ab825440c4264f60b5c5
2019-01-24 06:50:53 -08:00
Nicolas Geoffray 9f5ed17225 Merge "Differentiate between runtime apex jars and framework jars." 2019-01-24 14:38:17 +00:00
Nicolas Geoffray 6bcc93983b Differentiate between runtime apex jars and framework jars.
And use the apex paths of runtime apex jars.

Test: m
Change-Id: I7bd6e6029c2d5d596d672545271b5ed9819090b6
2019-01-24 13:10:22 +00:00
Calin Juravle 546c59fb27 Merge "Replace PRODUCT_BOOT_JARS with DEXPREOPT_BOOT_JARS_MODULES for nopreloads" am: ba3e26d5da
am: de29dfc599

Change-Id: I14c50440d9fb7a613b3cb327214d986016061d0f
2019-01-24 00:13:51 -08:00
Calin Juravle de29dfc599 Merge "Replace PRODUCT_BOOT_JARS with DEXPREOPT_BOOT_JARS_MODULES for nopreloads"
am: ba3e26d5da

Change-Id: I40c47b96e53386373855f4375146775a549cc83f
2019-01-24 00:09:19 -08:00
Calin Juravle ba3e26d5da Merge "Replace PRODUCT_BOOT_JARS with DEXPREOPT_BOOT_JARS_MODULES for nopreloads" 2019-01-24 07:56:37 +00:00
Suren Baghdasaryan 8820fdc909 [automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup into VNDK"" am: 5fe50948da -s ours
am: f9a10fbe64 -s ours
am skip reason: subject contains skip directive

Change-Id: I1c33f0734eb94bad0e501e37b2119529fac61b4a
2019-01-23 23:25:34 -08:00
Suren Baghdasaryan 7cb580d77f [automerger skipped] DO NOT MERGE: Revert "Add libprocessgroup into VNDK" am: fec192e98f -s ours
am: 797d1ba328 -s ours
am skip reason: subject contains skip directive

Change-Id: Ide369ba67f2c4559c2959d4f94268097d45f43a4
2019-01-23 23:14:57 -08:00
Suren Baghdasaryan f9a10fbe64 [automerger skipped] Merge "DO NOT MERGE: Revert "Add libprocessgroup into VNDK""
am: 5fe50948da -s ours
am skip reason: subject contains skip directive

Change-Id: I044e73272bd6c0f3fb99f929e2321d400b015ca6
2019-01-23 23:12:05 -08:00
Suren Baghdasaryan 797d1ba328 [automerger skipped] DO NOT MERGE: Revert "Add libprocessgroup into VNDK"
am: fec192e98f -s ours
am skip reason: subject contains skip directive

Change-Id: Ibd8fe0c7a3ff51cb43583a5f78c6b4bc4542f4d6
2019-01-23 23:05:46 -08:00
bralee 8896421768 Merge "Build System: Add java lib header files to module dependency list im module-info.mk" am: b045705971
am: 36497b2791

Change-Id: Idea430e553781616aa49dafbdd0ed42d92089cf4
2019-01-23 23:01:02 -08:00
Suren Baghdasaryan 5fe50948da Merge "DO NOT MERGE: Revert "Add libprocessgroup into VNDK"" 2019-01-24 06:57:55 +00:00
Nicolas Geoffray ae63550b3b Merge "Pass the right dex files to dex preopt." am: 3d54ce08fe
am: c219a59da3

Change-Id: I6144df80f044af79168e58a7ba37eb28157fe484
2019-01-23 22:55:59 -08:00
bralee 36497b2791 Merge "Build System: Add java lib header files to module dependency list im module-info.mk"
am: b045705971

Change-Id: Icabe38dbb21c11dace4d8415006f6dcbd699968f
2019-01-23 22:55:51 -08:00
Nicolas Geoffray c219a59da3 Merge "Pass the right dex files to dex preopt."
am: 3d54ce08fe

Change-Id: I07cebde182b6fead8d3040172be70a40e598c954
2019-01-23 22:51:50 -08:00
Treehugger Robot b045705971 Merge "Build System: Add java lib header files to module dependency list im module-info.mk" 2019-01-24 06:50:33 +00:00
Nicolas Geoffray 3d54ce08fe Merge "Pass the right dex files to dex preopt." 2019-01-24 06:37:40 +00:00
Dan Willemsen 53d62fed72 Bump the remaining 32-bit arm configs to require neon
Stop using armv7-a without neon for 32-bit unbundled apps, and update
generic_x86_arm to match the cuttlefish configuration that includes
neon.

Test: treehugger
Change-Id: Ieb6a2106655803a8ca609907c12168e628ee1b85
2019-01-23 22:27:33 -08:00
Bowgo Tsai eaf3071e8d Merge "Sign system_other.img with AVB" am: d2da2ce398
am: f58452cade

Change-Id: I92200b8374ffb56568fb25d362b1327c587b4bbd
2019-01-23 21:55:03 -08:00
Bowgo Tsai f58452cade Merge "Sign system_other.img with AVB"
am: d2da2ce398

Change-Id: I5951ee7fd9b6b1acd99571b4cfdb350369bfab6a
2019-01-23 21:43:28 -08:00
Treehugger Robot d2da2ce398 Merge "Sign system_other.img with AVB" 2019-01-24 05:31:37 +00:00
Suren Baghdasaryan fec192e98f DO NOT MERGE: Revert "Add libprocessgroup into VNDK"
This reverts commit 1877db4591.

Reason for revert: Broke AOSP

Change-Id: I4f4b8bae60966f1459365387bbde5a1f60c7b727
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-23 20:52:04 -08:00
Calin Juravle b741d1cfa9 Replace PRODUCT_BOOT_JARS with DEXPREOPT_BOOT_JARS_MODULES for nopreloads
boot_profile_jars.zip is used to process the boot image profile (by
filtering out data that does not belong to the boot classpath).
We only need the jars that are actually preloaded, and not the ones which
are updatable.

Test: launch taimen_nopreload-userdebug; m
Bug: 123313750
Change-Id: I630f78dda3d9b38aac04b0f364b25fbcda4e26a3
2019-01-23 18:06:50 -08:00
bralee 090336232e Build System: Add java lib header files to module dependency list im module-info.mk
To solve AIDEGen issue: DocumentsUI have no dependency libcore.

Bug: 122557164
Test: 1. m  `build/soong/soong_ui.bash --dumpvar-mode PRODUCT_OUT`/module-info.json
      2. open $ANDROID_PRODUCT_OUT/module-info.json
         "out/target/common/obj/JAVA_LIBRARIES/core-lambda-stubs_intermediates/classes-header.jar",
         "out/target/common/obj/JAVA_LIBRARIES/core.platform.api.stubs_intermediates/classes-header.jar",
	 "out/target/common/obj/JAVA_LIBRARIES/ext_intermediates/classes-header.jar",
	 "out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-header.jar"
	 will be added to DocumentsUI's dependencies.

Change-Id: I6b20c315f3367ff2a016d305ec6fe2a8de620a14
2019-01-24 09:27:48 +08:00
Yifan Hong 498fbce890 Merge "Really support removing / adding partitions." am: 2c0a7bc56d
am: ebd97b08f5

Change-Id: I004a23f429e434e1b7c14e7ef84959ef4ff8e779
2019-01-23 17:05:16 -08:00
Yifan Hong ebd97b08f5 Merge "Really support removing / adding partitions."
am: 2c0a7bc56d

Change-Id: Ie374b6a21adf70db9d8f9fbaa1c670dd099576d7
2019-01-23 17:01:02 -08:00
Yifan Hong 2c0a7bc56d Merge "Really support removing / adding partitions." 2019-01-24 00:51:32 +00:00
Joe Onorato 62472b676a When using inherit-package for a test, also allow specifying a new test suite.
Test: make
Change-Id: I2c9b5d998e6cc3159e4d23d7547bfd0b865f714c
2019-01-23 14:50:07 -08:00
Hridya Valsaraju 5c672336d9 Merge "Support including DTB image" am: 2463c3ab2a
am: 0322d59b4b

Change-Id: Id7dfd3b1c45026a04be228fcb7901bc72f8397d7
2019-01-23 13:30:21 -08:00
Hridya Valsaraju 0322d59b4b Merge "Support including DTB image"
am: 2463c3ab2a

Change-Id: I70d5ed98d2c1ba423aea2560979544626d5376cf
2019-01-23 13:11:32 -08:00
Treehugger Robot 2463c3ab2a Merge "Support including DTB image" 2019-01-23 20:56:55 +00:00
Yifan Hong 28ee89dda1 Add product_compatibitility_matrix.xml to base_product.
The module refers to framework compatibitlity matrix
that defined OEM modules.

Also, renamed framework_compatibility_matrix.xml
to system_compatibility_matrix.xml, since
framework_compatibility_matrix.xml consists of both
system and product compatibility matrices. This fixes
mainline build.

Test: build
Test: boot device with product compatibility matrix

Bug: 120600021
Change-Id: Ibfb12578c3ec77b6baede4eed852074e08022119
2019-01-23 12:22:04 -08:00
Hridya Valsaraju 9683b2f136 Support including DTB image
Bug: 111136242
Test: When BOARD_PREBUILT_DTB_DIR is set correctly,
generated $OUT/boot.img contains the DTB image.

Change-Id: I282e31b04cc60383377b9e9b54f8fe64a8140242
2019-01-23 09:14:55 -08:00
Nicolas Geoffray f084e7847e Pass the right dex files to dex preopt.
We currently pass the boot dex files installed on /system, but these
may be eg stripped. That's currently OK as dex2oat is looking
at the dex files in boot.oat, but dex2oat could look at them for
various reasons.

Test: m
Change-Id: I85915c979cf94ec29751b10a0d8a5957b6cea956
2019-01-23 16:07:02 +00:00
Bowgo Tsai 1e04bf7260 Sign system_other.img with AVB
Support signing system_other.img but shouldn't include it into the
top-level vbmeta.img. system_other verifiation will not be included
in /vbmeta chains and will be done separately.

Bug: 112103720
Test: avbtool info_image --image $OUT/system_other.img
Test: avbtool info_image --image $OUT/vbmeta.img, checks 'system_other' is NOT included.
Test: Checks $OUT/obj/PACKAGING/system_other_intermediates/system_other_image_info.txt
      See the following:
        avb_system_other_hashtree_enable=true
        avb_system_other_add_hashtree_footer_args=--rollback_index 1551744000
        avb_system_other_key_path=external/avb/test/data/testkey_rsa4096.pem
        avb_system_other_algorithm=SHA256_RSA4096

Change-Id: Ia152aaab1387dcf556a42222adb39ea76881263a
2019-01-23 15:17:41 +00:00
Anton Hansson f09d5ed23c Merge "Move ModuleMetadata to base_product" am: 2ec9fcd951
am: 999a9f4b28

Change-Id: Ib2efd5da437ad4ee58eccfaa339803268dd543b4
2019-01-23 03:32:22 -08:00
Anton Hansson 999a9f4b28 Merge "Move ModuleMetadata to base_product"
am: 2ec9fcd951

Change-Id: I65f9d38fbfb818bc3d8b3dc099ae0177b573e8f7
2019-01-23 03:25:12 -08:00
Anton Hansson 2ec9fcd951 Merge "Move ModuleMetadata to base_product" 2019-01-23 11:17:43 +00:00
Anton Hansson a9ea6d883c Merge "Enable 64-bit mediadrmserver for mainline" am: 767569b489
am: 9c67ac4003

Change-Id: Iad4bf1909cdba150d10a273536a4937bf7887555
2019-01-23 02:18:55 -08:00
Anton Hansson 9c67ac4003 Merge "Enable 64-bit mediadrmserver for mainline"
am: 767569b489

Change-Id: I60bf6ace059c59a6078349d6a73ec2dfadd10e2f
2019-01-23 02:14:43 -08:00