Commit graph

48006 commits

Author SHA1 Message Date
Yifan Hong
47b53c4136 Merge "dynamic partition update order is deterministic." 2019-01-28 18:44:59 +00:00
Yifan Hong
bf21932408 Merge "Add product_compatibitility_matrix.xml to base_product." 2019-01-28 18:08:44 +00:00
Anton Hansson
ad9ee4b504 Merge "Move mainline_arm64 over to use mainline device" 2019-01-28 10:49:32 +00:00
Anton Hansson
8fbdd25457 Merge "Add recovery_refresh to mainline_system" 2019-01-28 10:49:16 +00:00
Anton Hansson
096b88bf90 Merge "Auto-include device_manifest.xml when necessary" 2019-01-28 09:18:34 +00:00
Nicolas Geoffray
93626d9616 Merge "Move remaining libcore JNI libraries to APEX." 2019-01-28 09:16:21 +00:00
Pete Bentley
b8b08bdd02 Move remaining libcore JNI libraries to APEX.
Test: Flash and boot on Taimen
Test: atest CtsLibcoreTestCases CtsJniTestCases
Bug: 119090773
Change-Id: Ia9e7077327d2abc3f637c09acc5933b9c1682d5a
Exempt-From-Owner-Approval: Simple clean steps rule
2019-01-28 09:14:12 +00:00
Colin Cross
8a508cbc0b Merge "Remove obsolete proguard flags" 2019-01-26 02:30:55 +00:00
Treehugger Robot
c51c523b88 Merge "When using inherit-package for a test, also allow specifying a new test suite." 2019-01-26 00:57:14 +00:00
Colin Cross
2ac9c6219a Remove obsolete proguard flags
R8 now warns:
Warning in ./build/make/core/proguard_basic_keeps.flags:
  Ignoring option: -optimizations

Remove the flags, they are not used by R8.

Fixes: 123401079
Test: m checkbuild
Change-Id: I8b0c558be8bcf943652dddb71802ddc145ae42c1
2019-01-25 21:30:13 +00:00
Yifan Hong
79997e5a18 dynamic partition update order is deterministic.
Use an OrderedDict.
Test: builds

Change-Id: Ic3782c1961f0c2a735540b054eb3cace720c50bd
2019-01-25 12:36:17 -08:00
Treehugger Robot
1ff476e216 Merge "Add APK container signing key/cert pairs for APEXes" 2019-01-25 19:46:08 +00:00
Nicolas Geoffray
1174b010f6 Merge "Revert "Revert "Differentiate between runtime apex jars and framework jars.""" 2019-01-25 19:02:13 +00:00
Treehugger Robot
18977ff3a9 Merge "Fix typo of PRODUCT_BUILD_PRODUCT_SERVICES_IMAGE" 2019-01-25 18:19:11 +00:00
Jiyong Park
74f27716f3 Add APK container signing key/cert pairs for APEXes
Created via
openssl req -x509 -newkey rsa:4096 -nodes -days 999999 -keyout key.pem -out com.android.tzdata.x509.pem
openssl pkcs8 -topk8 -inform PEM -outform DER -in key.pem -out com.android.tzdata.pk8 -nocrypt

Test: m com.android.tzdata
jarsigner -verify -verbose -certs out/target/product/blueline/system/apex/com.android.tzdata.apex shows
...
X.509, CN=com.android.tzdata, OU=Android, O=Android, L=Mountain View, ST=California, C=US

Change-Id: I19f6efaaa6468e65e9891e4e61704fb48f0b986a
2019-01-26 02:19:58 +09:00
Suren Baghdasaryan
6d2ae0b628 Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup into VNDK""" 2019-01-25 17:09:02 +00:00
Suren Baghdasaryan
3a14d98f11 DO NOT MERGE: Revert "Revert "Add libprocessgroup into VNDK""
This reverts commit fec192e98f.

Reason for revert: AOSP is fixed with new vendor image

Change-Id: I2b7f4683139cf28bb5b8fa64c5c5273cf5c935a3
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-25 16:52:50 +00:00
Anton Hansson
673cbcd6f8 Merge "Move PrintRecommendationService back to handheld_system" 2019-01-25 16:09:48 +00:00
Anton Hansson
d5e069e405 Auto-include device_manifest.xml when necessary
It doesn't make sense to specify a DEVICE_MANIFEST_FILE but the
build not including it. The conditional definition of the module
makes it problematic to have it listed in the PRODUCT_PACKAGES
of a generic mk.

Test: build mainline_arm64 + mainline_system_arm64
Change-Id: I40e435ce114263ceabbd373d3d719318c592fc13
2019-01-25 13:50:47 +00:00
Anton Hansson
14fb72c15c Move mainline_arm64 over to use mainline device
Possible now that it has TARGET_COPY_OUT set for vendor and
product.

Update the whitelist too.

Bug: 120974093
Test: make
Change-Id: I99eb718f5f4e79b9224a4079f2ff4595cd2b7ae2
2019-01-25 11:29:26 +00:00
Anton Hansson
91fddbbd95 Add recovery_refresh to mainline_system
Needed by recovery on devices without a cache partition.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I71fd35022b0928016f6767cea35971ce14bf03fe
2019-01-25 11:27:27 +00:00
Anton Hansson
dca5c961a2 Move PrintRecommendationService back to handheld_system
This app is not intended to be moved to /product.

Bug: 122353713
Test: lunch mainline_arm64; m nothing
Change-Id: I65464975a77e187591b3e2de2521f1b2876b5abf
2019-01-25 11:14:47 +00:00
Anton Hansson
9bab4c2622 Fix typo of PRODUCT_BUILD_PRODUCT_SERVICES_IMAGE
Test: treehugger
Change-Id: I087d865c12d9aff7bdc0018256c1a87657d8550c
2019-01-25 10:15:22 +00:00
Nicolas Geoffray
14c052ec9b Revert "Revert "Differentiate between runtime apex jars and framework jars.""
This reverts commit 12746221c2.

Reason for revert: Sailfish size issues resolved.

Change-Id: I59e3ebf67d89f25d84d65cbfbe2a69ba1d8c30a3
2019-01-25 09:40:21 +00:00
Dan Willemsen
1fdf5d789b Merge "Bump the remaining 32-bit arm configs to require neon" 2019-01-25 03:52:17 +00: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
Treehugger Robot
8faac3669e Merge "Add security patch level to hashtree footer of system" 2019-01-24 19:28:29 +00:00
Paul Duffin
22efcc114e Merge "Remove REMOVE_OAHL_FROM_BCP flag" 2019-01-24 16:01:40 +00: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
ba3e26d5da Merge "Replace PRODUCT_BOOT_JARS with DEXPREOPT_BOOT_JARS_MODULES for nopreloads" 2019-01-24 07:56:37 +00:00
Suren Baghdasaryan
5fe50948da Merge "DO NOT MERGE: Revert "Add libprocessgroup into VNDK"" 2019-01-24 06:57:55 +00: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
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
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
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
2ec9fcd951 Merge "Move ModuleMetadata to base_product" 2019-01-23 11:17:43 +00:00
Anton Hansson
767569b489 Merge "Enable 64-bit mediadrmserver for mainline" 2019-01-23 09:56:46 +00:00
Logan Chien
9779c57cd0 Merge "Add $(SOONG_OUT_DIR)/ndk/% to artifact whitelist" 2019-01-23 07:22:43 +00:00