Commit Graph

58057 Commits

Author SHA1 Message Date
Automerger Merge Worker d6437ec539 Merge "build_image: check value of "ext4_share_dup_blocks"" am: 9021d5c4b4
Change-Id: I5a7520122c6d6d43d5ddd882a0cdb1cad74d81a6
2020-02-13 16:20:11 +00:00
Automerger Merge Worker 9c2afcf9c6 Merge "Modify D8 template to not have inputs under the output directory." am: 8e3f73576f
Change-Id: Id3e17717fea5c99624dba7cad5c79ec6dda8f603
2020-02-13 16:20:01 +00:00
Colin Cross 9021d5c4b4 Merge "build_image: check value of "ext4_share_dup_blocks"" 2020-02-13 16:10:02 +00:00
Ramy Medhat 8e3f73576f Merge "Modify D8 template to not have inputs under the output directory." 2020-02-13 16:09:49 +00:00
Automerger Merge Worker 0296ecb601 Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint." am: 0445b496c1
Change-Id: I21b704bfee4d8b9b49cc4b06444001bcf0e97f58
2020-02-13 13:48:33 +00:00
Ulyana Trafimovich 0445b496c1 Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint." 2020-02-13 13:36:25 +00:00
Ulya Trafimovich 36101543e9 Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint.
This is to unify boot jars with system server jars:
PRODUCT_SYSTEM_SERVER_JARS and PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
do not overlap.

Test: aosp_walleye-userdebug boots

Exempt-From-Owner-Approval: cherry-pick.
Bug: 146363577
Change-Id: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
Merged-In: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
(cherry picked from commit 19ed3a0db7)
2020-02-13 13:36:11 +00:00
Ramy Medhat c3427499ca Modify D8 template to not have inputs under the output directory.
Test: presubmit

Change-Id: I800664acdeffa04ce83a8446bece411f018af2e2
2020-02-13 07:19:53 -05:00
Automerger Merge Worker d3a28a3676 Merge "Implement BOARD_VNDK_VERSION" am: b21ca5795e
Change-Id: I103d0e3a580ef3a7665502a3dd1dc95612045efc
2020-02-13 11:17:02 +00:00
Treehugger Robot b21ca5795e Merge "Implement BOARD_VNDK_VERSION" 2020-02-13 11:01:10 +00:00
Automerger Merge Worker a026dfb5dc Merge "rm libbinderthreadstate" am: 6bf4a7d0be
Change-Id: I403d91e9b1de2c4cad020708f1576a8adccd88fa
2020-02-12 21:12:32 +00:00
Steven Moreland 6bf4a7d0be Merge "rm libbinderthreadstate" 2020-02-12 21:10:48 +00:00
David Zeuthen 361ca8fd81 Port IdentityCredential HAL to AIDL.
Bug: 111446262
Test: atest android.security.identity.cts
Test: VtsHalIdentityTargetTest
Test: android.hardware.identity-support-lib-test
Change-Id: I471569a6db9311171faf7520697cd7f67f80078c
2020-02-12 09:57:41 -05:00
Automerger Merge Worker 70248b3392 Merge "core/Makefile: pass value of PRODUCT_USE_DYNAMIC_PARTITION_SIZE" am: 77ffb564a9
Change-Id: Idffbd1ee45442fb11bd92f2bc67bd1409aa2ee86
2020-02-12 01:42:46 +00:00
Treehugger Robot 77ffb564a9 Merge "core/Makefile: pass value of PRODUCT_USE_DYNAMIC_PARTITION_SIZE" 2020-02-12 01:26:51 +00:00
Automerger Merge Worker 823e8030a8 Merge "Implement vendor snapshot" am: 7decc032c2
Change-Id: I88f0d8228aa78c84931bf9cca10d486ff5b707eb
2020-02-10 23:52:53 +00:00
Treehugger Robot 7decc032c2 Merge "Implement vendor snapshot" 2020-02-10 23:40:50 +00:00
Automerger Merge Worker 7bb6cf5277 Merge "Do not assign 'false' to PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE" am: 10a1d48e31
Change-Id: Id7a7b8a6d498601e149fd64a75bab3f35d9381a6
2020-02-10 21:40:27 +00:00
Treehugger Robot 10a1d48e31 Merge "Do not assign 'false' to PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE" 2020-02-10 21:26:21 +00:00
Justin Yun 03f4ed3415 Do not assign 'false' to PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE
When OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE is set to
false, it must not copy the value to
PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE but leave it empty
because Soong always set EnforceProductPartitionInterface to true if
PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE has value.

Bug: 148952638
Test: Build with
      OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE=false

Change-Id: I6435157ff993e53669b4244c9be74efbcc84107d
2020-02-11 04:05:24 +09:00
Tamas Petz c0a8c63935 build_image: check value of "ext4_share_dup_blocks"
Regardless of the value of "ext4_share_dup_blocks" "-c" flag is passed
unconditionally. The correct behavior is to check if
"ext4_share_dup_blocks" is set to "true".

Test: 1. build bonito with "BOARD_EXT4_SHARE_DUP_BLOCKS := false"
      2. check for "shared_blocks" feature of system.img
         ./out/host/linux-x86/bin/tune2fs -l \
         ./out/target/product/bonito/system.img | \
         grep -o shared_blocks

Change-Id: I8c0e5606658dd0f47b71cfc6c453a77a57da4f42
2020-02-10 11:45:06 +01:00
Tamas Petz 89418f058e core/Makefile: pass value of PRODUCT_USE_DYNAMIC_PARTITION_SIZE
Regardless of the value of PRODUCT_USE_DYNAMIC_PARTITION_SIZE
"use_dynamic_partition_size=true" is passed to build_image.sh.
Pass the value of PRODUCT_USE_DYNAMIC_PARTITION_SIZE just like it is
done for other properties.

Test: 1. build a target with fixed partition sizes and
         "PRODUCT_USE_DYNAMIC_PARTITION_SIZE := false".
      2. check the value of "use_dynamic_partition_size" in the
         corresponding system_image_info.txt.
      3. repeat steps 1 and 2 with this fix and see the difference.

Change-Id: Ia121d3d67f554f8ae4e211ad4e2c381a43409f01
2020-02-10 11:34:48 +01:00
Automerger Merge Worker bfb27d2a25 Merge "Remove UseApexImage and GenerateApexImage." am: 1dffdf84d1
Change-Id: I7b58e16d9c0ec0784ba86ee0ed102b6a49d661cf
2020-02-09 23:17:22 +00:00
Nicolas Geoffray 1dffdf84d1 Merge "Remove UseApexImage and GenerateApexImage." 2020-02-09 22:53:56 +00:00
Nicolas Geoffray 02df14a67a Remove UseApexImage and GenerateApexImage.
These options are not used anymore.

Bug: 119800099
Exempt-From-Owner-Approval: Rebase after conflict
Test: m
Change-Id: I1057a6fc420b45e326ec7744b6df159f950ad853
2020-02-09 22:53:25 +00:00
Automerger Merge Worker 36f981bc9e [automerger skipped] Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: e31e093b85 -s ours
am skip reason: Change-Id I0f06b04cf4c824b9c975d9b84f4a0e8171acef75 with SHA-1 f3cd49787a is in history

Change-Id: I9141a698ef5c62c8fc46cc9d5e8e1a19ddb8c846
2020-02-08 01:48:24 +00:00
Automerger Merge Worker 0335c232ea [automerger skipped] DO NOT MERGE - Merge QQ1A.200205.002 into master am: 85eb793810 -s ours
am skip reason: Change-Id I0f06b04cf4c824b9c975d9b84f4a0e8171acef75 with SHA-1 f3cd49787a is in history

Change-Id: I72d12f6092fed2cb85223772e12bc17a774830b6
2020-02-08 01:38:43 +00:00
Treehugger Robot e31e093b85 Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" 2020-02-08 01:29:23 +00:00
Automerger Merge Worker 35797dc5dd Merge "Update VNDK library list adding Lights AIDL HAL" am: 91a54cd80b
Change-Id: I33176e7f24ffd93e008a01bb3667ecb69193b7b6
2020-02-07 20:36:08 +00:00
Treehugger Robot 91a54cd80b Merge "Update VNDK library list adding Lights AIDL HAL" 2020-02-07 20:22:52 +00:00
Xin Li 85eb793810 DO NOT MERGE - Merge QQ1A.200205.002 into master
Bug: 147428392
Change-Id: I5aef3e956613109476784479f54b43f081ab734f
Merged-In: I0f06b04cf4c824b9c975d9b84f4a0e8171acef75
2020-02-07 19:29:26 +00:00
Automerger Merge Worker 5a7f8f1359 Merge "Remove building WAPPushManager same as Q" am: 80eb043393
Change-Id: I321edef8c216ecba6a40fb3809d585779e90784c
2020-02-07 17:41:24 +00:00
Treehugger Robot 80eb043393 Merge "Remove building WAPPushManager same as Q" 2020-02-07 17:28:26 +00:00
Automerger Merge Worker e95dbbfc69 Merge "Use ART image for make-based preopt." am: d1d4b74f63
Change-Id: If240bf1c5875a0ce858b185d617d594ee5708110
2020-02-07 17:07:44 +00:00
Vladimir Marko d1d4b74f63 Merge "Use ART image for make-based preopt." 2020-02-07 16:58:04 +00:00
Vladimir Marko 7ea8a3d9fa Use ART image for make-based preopt.
Test: taimen-userdebug boots when built with
      DEXPREOPT_USE_ART_IMAGE=true
Test: Check logcat for checksum verification failures.
      (Build ART with extra logging in OatFileAssistant.)
Test: Check that bootclasspath-checksums from some prebuilt
      oat files contain only one image checksum followed by
      dex file checksums with
          grep -az -A1 -E '^bootclasspath-checksums$' <oat-file> | \
          xargs -0 echo | gawk '{print $2}'
Bug: 119800099
Change-Id: I241b65d7323901906ffcde91ca9ba173e1755ad7
2020-02-07 14:42:09 +00:00
Automerger Merge Worker 11b0f7cc06 Merge "Support dexpreopt against the primary boot image." am: c3f9db077e
Change-Id: I242e0950b35cb605058ee2f3463095664c47b9df
2020-02-07 14:30:47 +00:00
Vladimir Marko c3f9db077e Merge "Support dexpreopt against the primary boot image." 2020-02-07 14:12:52 +00:00
Vladimir Marko 30bbf37de2 Support dexpreopt against the primary boot image.
Test: taimen-userdebug boots when built with
      DEXPREOPT_USE_ART_IMAGE=true
Bug: 119800099
Change-Id: I1c0860de87a0280d93a63b9135d071c595f1d925
2020-02-07 09:54:59 +00:00
Automerger Merge Worker 8c86a2872d Merge "Extend add_soong_config_var to support variable list" am: 00e02e97d5
Change-Id: I133ad8bfd074af04d5ce08ae7b1b29726dc4e394
2020-02-07 03:54:23 +00:00
Bill Peckham 00e02e97d5 Merge "Extend add_soong_config_var to support variable list" 2020-02-07 03:34:32 +00:00
Automerger Merge Worker e5656d0eba Merge "Add PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29" am: 562d15a67d
Change-Id: I9db247a6d43b628a3af3e53f06e10ef8cae4d855
2020-02-07 02:02:49 +00:00
Treehugger Robot 562d15a67d Merge "Add PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29" 2020-02-07 01:46:41 +00:00
Automerger Merge Worker c543f548a5 Merge "Remove the key parameter when verifying avb images in validate_target_files" am: 1fc958b4fe
Change-Id: I8c218dda48facd192286c86f5ddb8d8f262b6881
2020-02-07 01:07:00 +00:00
Baligh Uddin 1fc958b4fe Merge "Remove the key parameter when verifying avb images in validate_target_files" 2020-02-07 00:52:43 +00:00
Ivailo Karamanolev d8ffc1d61a Update VNDK library list adding Lights AIDL HAL
Test: manual; build succeeds after adding new HAL
Bug: 142230898
Change-Id: I6f8a90eb93c3b342849992e25dbb14a2a5f9d8e1
Merged-In: Ie1c9d9b4285dfeb1aefd33c51e85a74ee02744d8
2020-02-07 01:49:18 +01:00
Bill Peckham 62f5a4711e Extend add_soong_config_var to support variable list
Bug: b/149049342
Test: Supply list, inspect $(OUT)/soong/soong.variables
Change-Id: I905229441e392f6190bea6ae2169b0ecd1743d45
2020-02-06 15:30:46 -08:00
Tianjie Xu 9bd832a012 Remove the key parameter when verifying avb images in validate_target_files
If a key is specified, the avbtool always use the input key to verify
all the chained images. And this will cause failures when the vbmeta &
system use different keys (e.g. RSA 4096 vs RSA2048). Because the public
key to vbmeta will always fail to verify the system image. Remove the
'--key' parameter in the verification command, so the avbtool will use
the embedded public in the image.

Test: validate target-file from sdk_gphone_x86_64
Bug: 148916990
Change-Id: I9d31be0f8c32af605af94fa73d07818f40f51ec4
2020-02-06 13:31:26 -08:00
Jayachandran C c9f7482e89 Remove building WAPPushManager same as Q
This is needed only for very few carriers and can be enabled by OEMs

Bug: 148106198
Test: Built and verified WAPPushManager is not built
Change-Id: I3fa2664286222a5cecdb95fdff089a22e57b9f8c
Merged-In: I3fa2664286222a5cecdb95fdff089a22e57b9f8c
2020-02-06 21:12:26 +00:00
Steven Moreland 8a73c7ff6f rm libbinderthreadstate
Empty, since the functionality was moved to libbinder/libhwbinder to
remove extra lib dependency.

Bug: 148692216
Test: N/A
Change-Id: I9b2dbd50caff1bb6526834f1438c1fcf90432986
2020-02-06 13:11:34 -08:00