Commit Graph

48019 Commits

Author SHA1 Message Date
Jiyong Park
1ba4c7f11e Reland "Add $(PRODUCT_OUT)/apex to the artifact path whitelist"
This reverts commit 4cf7cde9aa.

Bug: 120846816
Test: build/soong/build_test.bash -dist -products mainline_system_arm64
Test: lunch aosp_cf_x86_pasan-userdebug; m && SANITIZE_TARGET=address m

Change-Id: I6fbf23dcef450da17fafafa78def3816792d83c8
2019-01-30 12:32:49 +09:00
Tom Cherry
c683233b64 Merge "Remove ro.expect.recovery_id" 2019-01-29 17:07:51 +00:00
Anton Hansson
02d7d48d4a Merge "Allow merging product_services into /product" 2019-01-29 09:28:40 +00:00
Treehugger Robot
d6b231faaa Merge "Enforce no unused HALs when product matrix exists." 2019-01-29 01:48:24 +00:00
Treehugger Robot
3a296fde5f Merge "base_vendor += dumpsys_vendor" 2019-01-29 01:46:08 +00:00
Yifan Hong
ab1ec4dbe3 Enforce no unused HALs when product matrix exists.
Also, remove old TODO message because it cannot be fixed.

Bug: 120600021
Test: builds
Test: remove entry from product matrix, build fails.

Change-Id: I9a6e954a1003aa4ad1bbca184ad7041ffad6b99b
2019-01-28 15:09:54 -08:00
Treehugger Robot
68e2dc2086 Merge "releasetools: Really allow removing partitions" 2019-01-28 22:18:09 +00:00
Ruchi Kandoi
fee423e64d Merge "add android.hardware.secure_element@1.1" 2019-01-28 21:49:55 +00:00
Anton Hansson
d26e4eeec8 Allow merging product_services into /product
Allow devices to specify TARGET_COPY_OUT_PRODUCT_SERVICES := product,
which in effect treats all product_services modules the same as product
modules.

Do not generate license and build props for product_services when
this settings is enabled.

Bug: 113098451
Test: boot downstream product
Change-Id: Id51230b969900bebcf19d0138dfd6187dfce25b1
2019-01-28 21:24:59 +00:00
Yifan Hong
bb2658d5e2 releasetools: Really allow removing partitions
- Add hashtree_info to EmptyImage so that BlockDifference.Compute()
can accept EmptyImage() as target image, which is the case when
a partition is removed.

- BlockDifference also checks source_info_dict to determine
whether a partition is dynamic. When a partition is removed,
its name does not appear in target_info_dict.

- Add tests to ensure DynamicPartitionDifference() still works.

Test: DynamicPartitionDifferenceTest
Test: test_blockimgdiff

Change-Id: Iadb1db075f5dc344db6d5ade358c83b01231e443
2019-01-28 11:10:48 -08:00
Tom Cherry
56ff89a90a Remove ro.expect.recovery_id
This is not used by anyone and the other half of the code to compare
against it is already functionally dead, so remove this.

Test: build
Change-Id: I44ed087cb7735bbc23e30b6c310c80eb3b7b6488
2019-01-28 10:56:37 -08:00
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
Steven Moreland
442e983241 base_vendor += dumpsys_vendor
Bug: 123433249
Test: adb shell /vendor/bin/dumpsys
Change-Id: I989825c65d759fd07ff0d0f690bc45d056637528
2019-01-25 19:15:20 -08: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