Commit Graph

6265 Commits

Author SHA1 Message Date
Automerger Merge Worker
f2d54333ba Merge "[automerger skipped] Set min_sdk_version to be part of mainline modules am: b22347cb33 -s ours am: 1e384a12b1 -s ours" into rvc-d1-dev-plus-aosp am: 2155cb20de -s ours am: 4e1a6f80fb -s ours
am skip reason: Change-Id I23cb55a3a17ac242e7f599fe574ca30074b43506 with SHA-1 b22347cb33 is in history

Change-Id: I3a6655bd0b7d7a020217521c03794da53b5f5748
2020-05-20 01:41:39 +00:00
Jooyung Han
460881c954 [automerger skipped] Set min_sdk_version to be part of mainline modules am: b22347cb33 am: 09e4d59b70 am: a15eefdd38 -s ours am: e82d3e495b -s ours
am skip reason: Change-Id I23cb55a3a17ac242e7f599fe574ca30074b43506 with SHA-1 b22347cb33 is in history

Change-Id: Icffa414d027b419cb2dfd3393bd0146f41a3425f
2020-05-20 01:40:58 +00:00
Jooyung Han
5133b93194 [automerger skipped] Set min_sdk_version to be part of mainline modules am: b22347cb33 am: 09e4d59b70 -s ours am: 1ba2bb69c1 -s ours am: e34dc8b71c -s ours
am skip reason: Change-Id I23cb55a3a17ac242e7f599fe574ca30074b43506 with SHA-1 f65f67c622 is in history

Change-Id: I1e72147d849924b7c8c5946b11f6e18add8bdf28
2020-05-20 01:40:38 +00:00
Automerger Merge Worker
4e1a6f80fb Merge "[automerger skipped] Set min_sdk_version to be part of mainline modules am: b22347cb33 -s ours am: 1e384a12b1 -s ours" into rvc-d1-dev-plus-aosp am: 2155cb20de -s ours
am skip reason: Change-Id I23cb55a3a17ac242e7f599fe574ca30074b43506 with SHA-1 b22347cb33 is in history

Change-Id: Id9722290abb9a01f0578007a6b720571c9b4574e
2020-05-20 01:28:43 +00:00
Jooyung Han
e82d3e495b [automerger skipped] Set min_sdk_version to be part of mainline modules am: b22347cb33 am: 09e4d59b70 am: a15eefdd38 -s ours
am skip reason: Change-Id I23cb55a3a17ac242e7f599fe574ca30074b43506 with SHA-1 b22347cb33 is in history

Change-Id: Ie78942643078b125bcde43c85b3559872a798624
2020-05-20 01:28:17 +00:00
Jooyung Han
e34dc8b71c [automerger skipped] Set min_sdk_version to be part of mainline modules am: b22347cb33 am: 09e4d59b70 -s ours am: 1ba2bb69c1 -s ours
am skip reason: Change-Id I23cb55a3a17ac242e7f599fe574ca30074b43506 with SHA-1 f65f67c622 is in history

Change-Id: I6958a0115130944cd33f34ba020c36111602d35a
2020-05-20 01:28:07 +00:00
Automerger Merge Worker
2155cb20de Merge "[automerger skipped] Set min_sdk_version to be part of mainline modules am: b22347cb33 -s ours am: 1e384a12b1 -s ours" into rvc-d1-dev-plus-aosp 2020-05-20 01:00:22 +00:00
Jooyung Han
14938cad00 [automerger skipped] Set min_sdk_version to be part of mainline modules am: b22347cb33 -s ours am: 1e384a12b1 -s ours
am skip reason: Change-Id I23cb55a3a17ac242e7f599fe574ca30074b43506 with SHA-1 f65f67c622 is in history

Change-Id: I7fa52e641425586763495eae138fef4c872d1f62
2020-05-20 01:00:19 +00:00
Jooyung Han
1ba2bb69c1 [automerger skipped] Set min_sdk_version to be part of mainline modules am: b22347cb33 am: 09e4d59b70 -s ours
am skip reason: Change-Id I23cb55a3a17ac242e7f599fe574ca30074b43506 with SHA-1 f65f67c622 is in history

Change-Id: I73c7b857220086b4cf19b2ed67fc52d2473f9634
2020-05-20 01:00:13 +00:00
Jooyung Han
a15eefdd38 Set min_sdk_version to be part of mainline modules am: b22347cb33 am: 09e4d59b70
Change-Id: Ibf90b14f755a642b39100af86196ff5922c6d93e
2020-05-20 01:00:10 +00:00
Jooyung Han
1e384a12b1 [automerger skipped] Set min_sdk_version to be part of mainline modules am: b22347cb33 -s ours
am skip reason: Change-Id I23cb55a3a17ac242e7f599fe574ca30074b43506 with SHA-1 f65f67c622 is in history

Change-Id: I3f11bd8ff984bca6872ec703e0f71dfcab3ef796
2020-05-20 00:45:57 +00:00
Jooyung Han
09e4d59b70 Set min_sdk_version to be part of mainline modules am: b22347cb33
Change-Id: Ide7d06310673609e85b98db0223da2566484d27d
2020-05-20 00:45:40 +00:00
Jooyung Han
b22347cb33 Set min_sdk_version to be part of mainline modules
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

"apex_inherit" is a special alias to represent "the minimum of all
that the apexes require".

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Merged-In: I23cb55a3a17ac242e7f599fe574ca30074b43506
Change-Id: I23cb55a3a17ac242e7f599fe574ca30074b43506
(cherry picked from commit f65f67c622)
2020-05-04 14:42:46 +09:00
Jooyung Han
5eec25f9b8 Set min_sdk_version to be part of mainline modules am: f65f67c622 am: 1447d718ca am: 3f6ee4bad8 am: 1d25228bfa am: 2a4b4c513c
Change-Id: I5b609ecce436b008cdb69d6190d2d7949968cebe
2020-05-02 01:44:46 +00:00
Jooyung Han
2a4b4c513c Set min_sdk_version to be part of mainline modules am: f65f67c622 am: 1447d718ca am: 3f6ee4bad8 am: 1d25228bfa
Change-Id: I0135b9299b01ec7d7b0b7f5447108419366e403a
2020-05-02 01:31:50 +00:00
Jooyung Han
1d25228bfa Set min_sdk_version to be part of mainline modules am: f65f67c622 am: 1447d718ca am: 3f6ee4bad8
Change-Id: I17a0bcac6b6bf47b266df847963efac991ad654a
2020-05-02 01:18:51 +00:00
Jooyung Han
3f6ee4bad8 Set min_sdk_version to be part of mainline modules am: f65f67c622 am: 1447d718ca
Change-Id: I9726e37a51ec62824e50147832fc7a89a4b8f69a
2020-05-02 01:06:10 +00:00
Jooyung Han
1447d718ca Set min_sdk_version to be part of mainline modules am: f65f67c622
Change-Id: Ibcadc26087965028ec8f5cd9de738af6d87c9471
2020-05-02 00:51:52 +00:00
Jooyung Han
f65f67c622 Set min_sdk_version to be part of mainline modules
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

"apex_inherit" is a special alias to represent "the minimum of all
that the apexes require".

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Change-Id: I23cb55a3a17ac242e7f599fe574ca30074b43506
2020-05-02 02:20:32 +09:00
Bob Badour
781800d132 Add METADATA to libcxx: LLVM+Apache+BSD+MIT=NOTICE am: 2bdf5baf96 am: 9ba553130a am: ce6bc06004 am: 3678ca47a5 am: 0472223a42
Change-Id: I2cc501c7ec5cc67e507f97cdbe21baddef75ed3e
2020-04-29 00:40:34 +00:00
Bob Badour
0472223a42 Add METADATA to libcxx: LLVM+Apache+BSD+MIT=NOTICE am: 2bdf5baf96 am: 9ba553130a am: ce6bc06004 am: 3678ca47a5
Change-Id: I7a795bf3b8f7e396de8b9615e4771b4ed785a416
2020-04-29 00:25:25 +00:00
Bob Badour
3678ca47a5 Add METADATA to libcxx: LLVM+Apache+BSD+MIT=NOTICE am: 2bdf5baf96 am: 9ba553130a am: ce6bc06004
Change-Id: I20d8f089cebaabb8d3184f02dbdd42c5bdcc67b0
2020-04-29 00:10:20 +00:00
Bob Badour
ce6bc06004 Add METADATA to libcxx: LLVM+Apache+BSD+MIT=NOTICE am: 2bdf5baf96 am: 9ba553130a
Change-Id: Ibc176d334dfae01dd3bf5f0745e5a034aeef093c
2020-04-28 23:54:34 +00:00
Bob Badour
9ba553130a Add METADATA to libcxx: LLVM+Apache+BSD+MIT=NOTICE am: 2bdf5baf96
Change-Id: I50f1654078accb395c5a2771f698a23a46f385d2
2020-04-28 23:41:37 +00:00
Bob Badour
2bdf5baf96 Add METADATA to libcxx: LLVM+Apache+BSD+MIT=NOTICE
Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: I4fbc4dd54135279892fad1914773925ab2580473
2020-04-28 10:15:19 -07:00
Jiyong Park
35d5d6041f [automerger skipped] Set apex_available property am: a36fbf76cb am: 1dfb19f255 am: 228eec80a8 am: 8cf26664c1 -s ours am: dfe36ae5c5 -s ours
am skip reason: Change-Id I60e1ae6fa837772c2682d4a26ea34bd80e69bc9e with SHA-1 a36fbf76cb is in history

Change-Id: Id3d9b742b97b200bb3d8dea5eb06372c5e306a13
2020-04-21 12:16:01 +00:00
Jiyong Park
dfe36ae5c5 [automerger skipped] Set apex_available property am: a36fbf76cb am: 1dfb19f255 am: 228eec80a8 am: 8cf26664c1 -s ours
am skip reason: Change-Id I60e1ae6fa837772c2682d4a26ea34bd80e69bc9e with SHA-1 a36fbf76cb is in history

Change-Id: Ib40027fc1c8d7fe37927b73f4aac0971fe2d6f93
2020-04-21 11:59:08 +00:00
Jiyong Park
8336444dee [automerger skipped] Set apex_available property am: a36fbf76cb am: 1dfb19f255 -s ours am: a5cb4d5577 -s ours am: 8814adf7f6 -s ours
am skip reason: Change-Id I60e1ae6fa837772c2682d4a26ea34bd80e69bc9e with SHA-1 a36fbf76cb is in history

Change-Id: I19b5d6a3290b803864d69a6b275a1eff9a653215
2020-04-21 11:59:07 +00:00
Jiyong Park
8cf26664c1 Set apex_available property am: a36fbf76cb am: 1dfb19f255 am: 228eec80a8
Change-Id: I157787a7b6755197f098af31a64c65c5e1146c19
2020-04-21 11:44:24 +00:00
Jiyong Park
8814adf7f6 [automerger skipped] Set apex_available property am: a36fbf76cb am: 1dfb19f255 -s ours am: a5cb4d5577 -s ours
am skip reason: Change-Id I60e1ae6fa837772c2682d4a26ea34bd80e69bc9e with SHA-1 a36fbf76cb is in history

Change-Id: Ifaf1bee6c4af49e5a1735acbd0a10dc20a326311
2020-04-21 11:33:25 +00:00
Jiyong Park
228eec80a8 Set apex_available property am: a36fbf76cb am: 1dfb19f255
Change-Id: I1557536ce0b7003ab4db779a44d9dc03a29426af
2020-04-21 11:29:54 +00:00
Jiyong Park
a5cb4d5577 [automerger skipped] Set apex_available property am: a36fbf76cb am: 1dfb19f255 -s ours
am skip reason: Change-Id I60e1ae6fa837772c2682d4a26ea34bd80e69bc9e with SHA-1 a36fbf76cb is in history

Change-Id: I9350e3debb7719209cfdb213779d8c354b0a3420
2020-04-21 11:26:55 +00:00
Jiyong Park
1dfb19f255 Set apex_available property am: a36fbf76cb
Change-Id: I18393376017802ea5c4fb60c07f754b83f895bf7
2020-04-21 11:20:33 +00:00
Jiyong Park
e1bd4233b2 [automerger skipped] Set apex_available property am: a36fbf76cb -s ours am: bc95b9b9cb -s ours am: 6621809545 -s ours am: 4ee6f53417 -s ours
am skip reason: Change-Id I60e1ae6fa837772c2682d4a26ea34bd80e69bc9e with SHA-1 2d6d9ab848 is in history

Change-Id: I3337f1a20096474659868d9b18cf4213a6add912
2020-04-21 04:28:42 +00:00
Jiyong Park
4ee6f53417 [automerger skipped] Set apex_available property am: a36fbf76cb -s ours am: bc95b9b9cb -s ours am: 6621809545 -s ours
am skip reason: Change-Id I60e1ae6fa837772c2682d4a26ea34bd80e69bc9e with SHA-1 2d6d9ab848 is in history

Change-Id: I54e51c714e4fb6da46f3d50da4289f2b5fc8b1b8
2020-04-21 04:13:32 +00:00
Jiyong Park
6621809545 [automerger skipped] Set apex_available property am: a36fbf76cb -s ours am: bc95b9b9cb -s ours
am skip reason: Change-Id I60e1ae6fa837772c2682d4a26ea34bd80e69bc9e with SHA-1 2d6d9ab848 is in history

Change-Id: Ic2c3303f90b321e4f6a5ac7f6728fa6468d755fc
2020-04-21 03:53:18 +00:00
Jiyong Park
bc95b9b9cb [automerger skipped] Set apex_available property am: a36fbf76cb -s ours
am skip reason: Change-Id I60e1ae6fa837772c2682d4a26ea34bd80e69bc9e with SHA-1 2d6d9ab848 is in history

Change-Id: I3b1a45769f7d86fbc5da4d097ed6122e9c1a8a8c
2020-04-21 03:35:02 +00:00
Jiyong Park
a36fbf76cb Set apex_available property
The marked library(ies) were available to the APEXes via the hand-written
whitelist in build/soong/apex/apex.go. Trying to remove the whitelist
by adding apex_available property to the Android.bp of the libraries.

Exempt-From-Owner-Approval: cherry-pick from AOSP

Bug: 150999716
Test: m
Merged-In: I60e1ae6fa837772c2682d4a26ea34bd80e69bc9e
(cherry picked from commit 2d6d9ab848)
Change-Id: I60e1ae6fa837772c2682d4a26ea34bd80e69bc9e
2020-04-20 16:02:17 +09:00
Dan Albert
7fd4d02eb4 Note about why this isn't vendor_available. am: eda4e913a5 am: a397aa2e2a am: 24812125c2 am: 5b0d47ac54 am: ec29a1eb3b
Change-Id: If6dee31efc768a57d062ca4f93d9ee51bdbc0fe1
2020-04-13 23:53:53 +00:00
Dan Albert
ec29a1eb3b Note about why this isn't vendor_available. am: eda4e913a5 am: a397aa2e2a am: 24812125c2 am: 5b0d47ac54
Change-Id: I7bd2f060a131b3bcc0629a1c1b89fb1e652cdd4d
2020-04-13 23:24:57 +00:00
Dan Albert
5b0d47ac54 Note about why this isn't vendor_available. am: eda4e913a5 am: a397aa2e2a am: 24812125c2
Change-Id: I8f4ffa7497ab769a115439031bd50466f5beb78d
2020-04-13 22:51:58 +00:00
Dan Albert
24812125c2 Note about why this isn't vendor_available. am: eda4e913a5 am: a397aa2e2a
Change-Id: Icb25530785ee9de279b697a981fc8a5fe45512dc
2020-04-13 22:27:43 +00:00
Dan Albert
a397aa2e2a Note about why this isn't vendor_available. am: eda4e913a5
Change-Id: Id9a6da98d21e000e6ef4b9d9a8a4d7c52840a076
2020-04-13 21:58:45 +00:00
Dan Albert
eda4e913a5 Note about why this isn't vendor_available.
Test: None
Bug: None
Change-Id: I0c37a344dfb542000424615dfbead3ff7eab8aab
2020-04-13 12:08:37 -07:00
Xin Li
d0869b8ab7 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 2abdac868f -s ours am: 1f0aa09b05 am: d4648d81ff am: d7da84f059 -s ours
am skip reason: subject contains skip directive

Change-Id: If201a988a9044dd451297d245d941d26425ed54d
2020-04-10 04:27:46 +00:00
Xin Li
d7da84f059 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 2abdac868f -s ours am: 1f0aa09b05 am: d4648d81ff
Change-Id: Ib5722cbd2966280e5dca57a105b5e5a3de546cbe
2020-04-10 04:03:08 +00:00
Xin Li
d4648d81ff [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 2abdac868f -s ours am: 1f0aa09b05
Change-Id: I01cc84c99074052f3804472c91aa18f1ac847cfb
2020-04-10 03:41:30 +00:00
Xin Li
1f0aa09b05 [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 2abdac868f -s ours
am skip reason: subject contains skip directive

Change-Id: I25944063b33ee2a74b92b7db38b57713246d1c71
2020-04-10 03:14:59 +00:00
Xin Li
2abdac868f DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master
Bug: 151763422
Change-Id: I7cbe49fd172a0a3984967c181e94efb82084ed92
2020-04-09 17:50:45 -07:00
Xin Li
d603dc161c [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: a5b4625ad3 -s ours am: 87ef742159 am: 8e6416c234 am: f30248baa6 -s ours
am skip reason: subject contains skip directive

Change-Id: I55f3a0553c1a87e3075169c6f99303d2e00adddc
2020-03-19 05:35:54 +00:00