Commit Graph

59256 Commits

Author SHA1 Message Date
Ulyana Trafimovich 6780e0aaa1 Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint." 2020-02-13 10:53:13 +00:00
Automerger Merge Worker 8b50f17e22 Merge "rm libbinderthreadstate" am: 6bf4a7d0be am: a026dfb5dc am: 7a81802e2a
Change-Id: I9bc6b19c7c506158f19049c73cdf34a8a804f6ee
2020-02-12 21:34:24 +00:00
Automerger Merge Worker 7a81802e2a Merge "rm libbinderthreadstate" am: 6bf4a7d0be am: a026dfb5dc
Change-Id: I0b8235dda478fee020a28229f84592948500ab95
2020-02-12 21:20:25 +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
Ulya Trafimovich 19ed3a0db7 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: walleye-userdebug boots

Bug: 146363577
Change-Id: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
2020-02-12 16:16:55 +00:00
Narayan Kamath af5a0e7b98 Merge "Reland: Rework platform version to hide codenames." 2020-02-12 08:42:17 +00:00
Automerger Merge Worker 017ff9f36d Merge "core/Makefile: pass value of PRODUCT_USE_DYNAMIC_PARTITION_SIZE" am: 77ffb564a9 am: 70248b3392 am: 529e7eadc1
Change-Id: I8c1e680df7584fd78fbecdd7fa8866ed2ebd4de1
2020-02-12 02:12:29 +00:00
Automerger Merge Worker 529e7eadc1 Merge "core/Makefile: pass value of PRODUCT_USE_DYNAMIC_PARTITION_SIZE" am: 77ffb564a9 am: 70248b3392
Change-Id: I6dd2e545758193966668685573522a83422bde92
2020-02-12 01:55:53 +00: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 50a99cbedc Update Security String to 2020-04-05 am: d451ad7167 am: fcfd5b554a
Change-Id: Ic383f938d12f9fac0d93364ba737f0c401fb0a01
2020-02-11 18:02:44 +00:00
Automerger Merge Worker fcfd5b554a Update Security String to 2020-04-05 am: d451ad7167
Change-Id: I4e5b07e96a1ddc23057b373a1ff7d9f54ae361bb
2020-02-11 17:51:51 +00:00
Dianne Hackborn 25648e60b2 Reland: Rework platform version to hide codenames.
The public platform version no longer can be a codename, it is
always the most recently released platform.  A new build property
and API provides either the offical version or the current codename
as appropriate.  This will avoid breaking apps that look at the
platform version while development is under a codename.

Changes from the original version:
- Logic for emitting system properties has also been added to
  buildinfo_common.sh to make sure that ro.${partition}.build.*
  are consistent with ro.build.*.
- We also use PLATFORM_VERSION_LAST_STABLE as the value set in the
  boot image os_version header / hash tree additional headers to
  ensure they match with the ro.build.version.release system property.
  This is hopefully a temporary workaround while we stop using the
  system property for this purpose.

Bug:  143175463
Test: manual
Change-Id: Iaeefb35137de01c6ea57115d8830dd9bc30eccba
2020-02-11 13:20:20 +00:00
Automerger Merge Worker 7f4a2cdb68 Update Security String to 2020-04-01 am: f9edfe3714 am: 611d93a988
Change-Id: If997f5b9843944d82f7c19a057718efe9255d01c
2020-02-11 00:27:52 +00:00
Automerger Merge Worker 611d93a988 Update Security String to 2020-04-01 am: f9edfe3714
Change-Id: I6949123a1bddcab72e0d918338b44799ec9652e7
2020-02-11 00:27:28 +00:00
Automerger Merge Worker e0f40d1537 Merge "Implement vendor snapshot" am: 7decc032c2 am: 823e8030a8 am: 3e45e5f4d9
Change-Id: I996ca4a6c5f21c82eb375000f26c5834aa95f7b2
2020-02-11 00:27:28 +00:00
Paul Scovanner d451ad7167 Update Security String to 2020-04-05
Bug:149240442
2020-02-11 00:13:07 +00:00
Automerger Merge Worker 3e45e5f4d9 Merge "Implement vendor snapshot" am: 7decc032c2 am: 823e8030a8
Change-Id: I877442e69f3d27a33dff1e8f8588a98bec9c0ec0
2020-02-11 00:08:22 +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 33e9e4853c Merge "Do not assign 'false' to PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE" am: 10a1d48e31 am: 7bb6cf5277 am: 98bc85f9f9
Change-Id: Icb328d70532d02654132ba9f5711696514f0af8e
2020-02-10 22:10:14 +00:00
Automerger Merge Worker 98bc85f9f9 Merge "Do not assign 'false' to PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE" am: 10a1d48e31 am: 7bb6cf5277
Change-Id: I2d7b97a11720436e9c955c85fbb84dc2fd0cbcfa
2020-02-10 21:59:12 +00:00
Paul Scovanner f9edfe3714 Update Security String to 2020-04-01
Bug:149240442
2020-02-10 21:45:49 +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 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 6750886fce Merge "Remove UseApexImage and GenerateApexImage." am: 1dffdf84d1 am: bfb27d2a25 am: 7d1ed118eb
Change-Id: I19576a4c5d18ea52801ecefe805d6d62969054ed
2020-02-09 23:44:08 +00:00
Automerger Merge Worker 7d1ed118eb Merge "Remove UseApexImage and GenerateApexImage." am: 1dffdf84d1 am: bfb27d2a25
Change-Id: I37804034f42176f397197eeaa6a363331e10e765
2020-02-09 23:33:08 +00: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 377ea20d87 [automerger skipped] Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: e31e093b85 -s ours am: 36f981bc9e -s ours am: 74cb6bd35f -s ours
am skip reason: subject contains skip directive

Change-Id: I99cc9104aee89004de883e446df103627c1c9798
2020-02-08 02:23:11 +00:00
Automerger Merge Worker d69e62ef43 [automerger skipped] DO NOT MERGE - Merge QQ1A.200205.002 into master am: 85eb793810 -s ours am: 0335c232ea -s ours am: 1f737a96f3 -s ours
am skip reason: subject contains skip directive

Change-Id: If2a516aa035d716e913269d2ab8becf9193e87c2
2020-02-08 02:22:10 +00:00
Automerger Merge Worker 74cb6bd35f [automerger skipped] Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: e31e093b85 -s ours am: 36f981bc9e -s ours
am skip reason: Change-Id I0f06b04cf4c824b9c975d9b84f4a0e8171acef75 with SHA-1 f3cd49787a is in history

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

Change-Id: Iab29a95eaee82040fc0fee51151a9866013141ee
2020-02-08 01:55:28 +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
TreeHugger Robot dc7d4881a0 Merge "Add version 2.1 of camera server interface" 2020-02-08 00:32:40 +00:00
Automerger Merge Worker 21141c663e [automerger skipped] Merge "Update VNDK library list adding Lights AIDL HAL" am: 91a54cd80b am: 35797dc5dd am: 7b86d7b969 -s ours
am skip reason: Change-Id Ie1c9d9b4285dfeb1aefd33c51e85a74ee02744d8 with SHA-1 382d51575d is in history

Change-Id: Ief3e73c44048812eb34734c36fe812b9a1d9a5a4
2020-02-07 21:09:14 +00:00
Automerger Merge Worker 7b86d7b969 Merge "Update VNDK library list adding Lights AIDL HAL" am: 91a54cd80b am: 35797dc5dd
Change-Id: Ib7ec9d4e0b0ae255991b937e79915c9158dd5312
2020-02-07 20:55:43 +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
Amit Mahajan 703c8757f7 Merge "Revert "Create telephony apex."" 2020-02-07 19:57:15 +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 2d01b662d6 [automerger skipped] Merge "Remove building WAPPushManager same as Q" am: 80eb043393 am: 5a7f8f1359 am: ffdfb16af4 -s ours
am skip reason: Change-Id I3fa2664286222a5cecdb95fdff089a22e57b9f8c with SHA-1 80d723e7ff is in history

Change-Id: I4f227b5b9aba942da99378a4a4c992c4a4893bcb
2020-02-07 18:12:33 +00:00
Automerger Merge Worker ffdfb16af4 Merge "Remove building WAPPushManager same as Q" am: 80eb043393 am: 5a7f8f1359
Change-Id: I3d71b9db924d9c0f2aeb6aa099530e25c0b05dd3
2020-02-07 17:54:51 +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