Yifan Hong
0316dd616a
Merge "Add product_compatibitility_matrix.xml to base_product." am: bf21932408
...
am: ba52952af3
Change-Id: Ifcfd78916a206ef464ce43b3965f1228f711d708
2019-01-28 20:36:31 -08:00
Yifan Hong
ba52952af3
Merge "Add product_compatibitility_matrix.xml to base_product."
...
am: bf21932408
Change-Id: Iec4393644b1221a4c5d5c34f66e836a35f86dbab
2019-01-28 19:36:12 -08:00
Yifan Hong
bf21932408
Merge "Add product_compatibitility_matrix.xml to base_product."
2019-01-28 18:08:44 +00:00
Anton Hansson
bd57a28943
Merge "Move mainline_arm64 over to use mainline device" am: ad9ee4b504
...
am: 2b219b051f
Change-Id: Idf769e5d1965a445704bdb88ded8012b09995aef
2019-01-28 03:02:40 -08:00
Anton Hansson
b5ca00950b
Merge "Add recovery_refresh to mainline_system" am: 8fbdd25457
...
am: 628e7ff762
Change-Id: If09775db0f2371cc631d1d0b1a825a41395bbc86
2019-01-28 03:01:52 -08:00
Anton Hansson
2b219b051f
Merge "Move mainline_arm64 over to use mainline device"
...
am: ad9ee4b504
Change-Id: If66d50f5eb603099877abe94951a8d54da976275
2019-01-28 02:57:19 -08:00
Anton Hansson
628e7ff762
Merge "Add recovery_refresh to mainline_system"
...
am: 8fbdd25457
Change-Id: I3cd215b54a4673a325ba88080e0dc0a5d3778b0f
2019-01-28 02:56:40 -08: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
7c1890f536
Merge "Auto-include device_manifest.xml when necessary" am: 096b88bf90
...
am: 1cff5df789
Change-Id: I919a87d53824a7af5ddcba6253d657d149f9a35f
2019-01-28 01:41:29 -08:00
Nicolas Geoffray
07c2c7c837
Merge "Move remaining libcore JNI libraries to APEX." am: 93626d9616
...
am: 8b227ab6d9
Change-Id: Ie99f9a759b867ce5eb5827009638021ddbb0035d
2019-01-28 01:39:46 -08:00
Anton Hansson
1cff5df789
Merge "Auto-include device_manifest.xml when necessary"
...
am: 096b88bf90
Change-Id: I446db799a7529fa074451582911d3db989a9fce4
2019-01-28 01:30:58 -08:00
Nicolas Geoffray
8b227ab6d9
Merge "Move remaining libcore JNI libraries to APEX."
...
am: 93626d9616
Change-Id: Id031131da1fcfd27ecdbf7e9da95bba2ade3ff36
2019-01-28 01:28:53 -08: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
70323e8e21
Merge "Remove obsolete proguard flags" am: 8a508cbc0b
...
am: 80e86c8ff8
Change-Id: I1becd4c650be4f19a0286b23dd114e29b5fec84d
2019-01-25 18:44:41 -08:00
Colin Cross
80e86c8ff8
Merge "Remove obsolete proguard flags"
...
am: 8a508cbc0b
Change-Id: Ib6fa2150c3f1b7da148e8a1a1271b1b2ea1d719b
2019-01-25 18:40:34 -08:00
Colin Cross
8a508cbc0b
Merge "Remove obsolete proguard flags"
2019-01-26 02:30:55 +00:00
Joe Onorato
f1847c0a18
Merge "When using inherit-package for a test, also allow specifying a new test suite." am: c51c523b88
...
am: ac00ab680e
Change-Id: I13bc3b38e4f359515b1e70c45c49f31ac3ec5fe2
2019-01-25 17:16:36 -08:00
Joe Onorato
ac00ab680e
Merge "When using inherit-package for a test, also allow specifying a new test suite."
...
am: c51c523b88
Change-Id: I4cdb982aacdcdf3842b9f4619e431ca010af0adf
2019-01-25 17:11:24 -08: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
Jiyong Park
60beb2863a
Merge "Add APK container signing key/cert pairs for APEXes" am: 1ff476e216
...
am: 8bb658cb89
Change-Id: I2830ea9e6e38a8536f872a6b1c535abd514fb7d3
2019-01-25 11:59:09 -08:00
Jiyong Park
8bb658cb89
Merge "Add APK container signing key/cert pairs for APEXes"
...
am: 1ff476e216
Change-Id: Ieaee6753e8ece81a04657773d6b2d8fc358de706
2019-01-25 11:54:57 -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
6c10f21f5a
Merge "Revert "Revert "Differentiate between runtime apex jars and framework jars.""" am: 1174b010f6
...
am: cdd640e40e
Change-Id: Ifcc2c79b01d4ab747be890f89f80105aa283c16f
2019-01-25 11:21:58 -08:00
Nicolas Geoffray
cdd640e40e
Merge "Revert "Revert "Differentiate between runtime apex jars and framework jars."""
...
am: 1174b010f6
Change-Id: If615caeab26258b213a1847ca9575623543e97f5
2019-01-25 11:16:33 -08:00
Nicolas Geoffray
1174b010f6
Merge "Revert "Revert "Differentiate between runtime apex jars and framework jars."""
2019-01-25 19:02:13 +00:00
Anton Hansson
ff7f7e61f8
Merge "Fix typo of PRODUCT_BUILD_PRODUCT_SERVICES_IMAGE" am: 18977ff3a9
...
am: 7004e33836
Change-Id: Ie56dfc190475f6a3e9129ce925dc2c9648ea1e8b
2019-01-25 10:33:48 -08:00
Anton Hansson
7004e33836
Merge "Fix typo of PRODUCT_BUILD_PRODUCT_SERVICES_IMAGE"
...
am: 18977ff3a9
Change-Id: I77fcb7807b98b3511ec32c603dd8be9bd41c1ecb
2019-01-25 10:28:35 -08:00
Treehugger Robot
18977ff3a9
Merge "Fix typo of PRODUCT_BUILD_PRODUCT_SERVICES_IMAGE"
2019-01-25 18:19:11 +00:00
Suren Baghdasaryan
f49c0ce49c
[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup into VNDK""" am: 6d2ae0b628
-s ours
...
am: e8e28870da
-s ours
am skip reason: subject contains skip directive
Change-Id: If988c126aab2bdfaeb1f8ab18c9b3b121ad9d54a
2019-01-25 09:28:23 -08: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
e8e28870da
[automerger skipped] Merge "DO NOT MERGE: Revert "Revert "Add libprocessgroup into VNDK"""
...
am: 6d2ae0b628
-s ours
am skip reason: subject contains skip directive
Change-Id: I915ca64ac351a0d4f9886c0d20ded6aa53f60e5b
2019-01-25 09:17:45 -08: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
67014e8f4a
Merge "Move PrintRecommendationService back to handheld_system" am: 673cbcd6f8
...
am: 6529ac841a
Change-Id: I64512313db1f13581484223971b25e36ce57f9b9
2019-01-25 08:25:38 -08:00
Anton Hansson
6529ac841a
Merge "Move PrintRecommendationService back to handheld_system"
...
am: 673cbcd6f8
Change-Id: I818fe4c0cadcaa7c368267e594cacfe9b82caa1e
2019-01-25 08:19:29 -08: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
f60131d3d8
Merge "Bump the remaining 32-bit arm configs to require neon" am: 1fdf5d789b
...
am: 7ce2e247d9
Change-Id: I70b4889ca20d8bc29bb8454eb841f78a962f2157
2019-01-24 20:10:11 -08:00
Dan Willemsen
7ce2e247d9
Merge "Bump the remaining 32-bit arm configs to require neon"
...
am: 1fdf5d789b
Change-Id: I51fd1a89aae654e9e34ecaa21eff5b66987b981f
2019-01-24 19:58:20 -08: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
18bbee4706
Merge "Revert "Differentiate between runtime apex jars and framework jars."" am: fc67ea8dd3
...
am: f93f99d4f1
Change-Id: I9cb317df9bb7f588a60095385134b78e7eb743c5
2019-01-24 15:36:06 -08:00