Commit Graph

73678 Commits

Author SHA1 Message Date
Treehugger Robot
ce19509a15 Merge "Fix a failure in signing test" am: 936e704999 am: 5c8fc606d4 am: aeba7359a0 am: 86250621a3
Original change: https://android-review.googlesource.com/c/platform/build/+/1879016

Change-Id: Ibe9e6568762f8be2225a8b4e080041d3e53682c1
2021-11-04 10:24:23 +00:00
Treehugger Robot
86250621a3 Merge "Fix a failure in signing test" am: 936e704999 am: 5c8fc606d4 am: aeba7359a0
Original change: https://android-review.googlesource.com/c/platform/build/+/1879016

Change-Id: Ibe9d264e14e91fb6c953a4729171ed899e27fb7a
2021-11-04 10:08:28 +00:00
Treehugger Robot
aeba7359a0 Merge "Fix a failure in signing test" am: 936e704999 am: 5c8fc606d4
Original change: https://android-review.googlesource.com/c/platform/build/+/1879016

Change-Id: Ib6ebc05f52f126bf19918588646fb3d2b9feb5de
2021-11-04 07:55:30 +00:00
Treehugger Robot
5c8fc606d4 Merge "Fix a failure in signing test" am: 936e704999
Original change: https://android-review.googlesource.com/c/platform/build/+/1879016

Change-Id: Id96d5c221485f13064c5b0b13febfed2007a944f
2021-11-04 07:32:53 +00:00
Treehugger Robot
936e704999 Merge "Fix a failure in signing test" 2021-11-04 07:04:42 +00:00
Treehugger Robot
cd3ca41f20 Merge "Add a compressor types option" am: 1e392720c2 am: a0c34f2c21 am: 44c33933c0 am: 99a9435e6c
Original change: https://android-review.googlesource.com/c/platform/build/+/1873795

Change-Id: I81a57ebce0ced1429bcee549fa2e5c6c3e3d0e5b
2021-11-04 05:29:31 +00:00
Treehugger Robot
99a9435e6c Merge "Add a compressor types option" am: 1e392720c2 am: a0c34f2c21 am: 44c33933c0
Original change: https://android-review.googlesource.com/c/platform/build/+/1873795

Change-Id: I434d5c172afe59b6d3c1fda2a2f73f90e2906788
2021-11-04 05:12:24 +00:00
Treehugger Robot
44c33933c0 Merge "Add a compressor types option" am: 1e392720c2 am: a0c34f2c21
Original change: https://android-review.googlesource.com/c/platform/build/+/1873795

Change-Id: Ie987c00d4b8490090cbe78d084958a04c715601c
2021-11-04 04:55:22 +00:00
Kelvin Zhang
2639048c21 Fix a failure in signing test
Pixel moved away from sparse images, so validate_target_files is failing
because it expects sparse images.

Test: th
Change-Id: I322ff10c2afbacfb4d78991be60c11aac92a6d4c
2021-11-03 21:43:22 -07:00
Treehugger Robot
a0c34f2c21 Merge "Add a compressor types option" am: 1e392720c2
Original change: https://android-review.googlesource.com/c/platform/build/+/1873795

Change-Id: I26cb3e7cd554c16c3d9710c6eb59863c0a1cb995
2021-11-04 04:31:56 +00:00
Treehugger Robot
1e392720c2 Merge "Add a compressor types option" 2021-11-04 04:13:13 +00:00
Treehugger Robot
d1a921ec8b Merge changes from topic "tproto" am: cd128891ed am: 0f0e4d23e5 am: 40bd79e8b7 am: aa3348dd1b
Original change: https://android-review.googlesource.com/c/platform/build/+/1865920

Change-Id: Ia163cbaab749ed1a051ab28701e1c33656b67e48
2021-11-03 19:49:41 +00:00
Bob Badour
d57a36fadc Add macros for non-module license metadata and deps am: 879cfa867d am: 1efd13a2a1 am: c1d98c6310 am: e6d1b1d160
Original change: https://android-review.googlesource.com/c/platform/build/+/1741493

Change-Id: I28768283798ca4b3fb037c1e909f00f5eb625bfc
2021-11-03 19:49:39 +00:00
Treehugger Robot
aa3348dd1b Merge changes from topic "tproto" am: cd128891ed am: 0f0e4d23e5 am: 40bd79e8b7
Original change: https://android-review.googlesource.com/c/platform/build/+/1865920

Change-Id: I9d61f48ec35fc98d25ed76f7d9bdd1b67927c199
2021-11-03 19:32:39 +00:00
Bob Badour
e6d1b1d160 Add macros for non-module license metadata and deps am: 879cfa867d am: 1efd13a2a1 am: c1d98c6310
Original change: https://android-review.googlesource.com/c/platform/build/+/1741493

Change-Id: Ib209475f54d957ac3b8979c3fba53008e3f09d48
2021-11-03 19:32:38 +00:00
Treehugger Robot
40bd79e8b7 Merge changes from topic "tproto" am: cd128891ed am: 0f0e4d23e5
Original change: https://android-review.googlesource.com/c/platform/build/+/1865920

Change-Id: Ic84a675143f1aa3cd68251ff0ef1d58cca7fcf4f
2021-11-03 19:13:50 +00:00
Bob Badour
c1d98c6310 Add macros for non-module license metadata and deps am: 879cfa867d am: 1efd13a2a1
Original change: https://android-review.googlesource.com/c/platform/build/+/1741493

Change-Id: I9bf667d790b1e525fe27780bb0654542423a7da1
2021-11-03 19:13:49 +00:00
Bill Yi
029d18d637 [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: fcdbafa7fe -s ours am: f446921571 -s ours am: 78f0b3766f -s ours am: d16a5425f5 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/1879281

Change-Id: I4a6b3119d58941840dd14ef8293bd695caf55f33
2021-11-03 19:06:44 +00:00
Treehugger Robot
0f0e4d23e5 Merge changes from topic "tproto" am: cd128891ed
Original change: https://android-review.googlesource.com/c/platform/build/+/1865920

Change-Id: Ia2503ffa60537ee418ea5ba323c4313b068763a1
2021-11-03 18:47:11 +00:00
Bob Badour
1efd13a2a1 Add macros for non-module license metadata and deps am: 879cfa867d
Original change: https://android-review.googlesource.com/c/platform/build/+/1741493

Change-Id: I7a268d6542ef1be0dd1cd5182a1d7e0b5ac3d32e
2021-11-03 18:47:10 +00:00
Bill Yi
d16a5425f5 [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: fcdbafa7fe -s ours am: f446921571 -s ours am: 78f0b3766f -s ours
am skip reason: Merged-In I68a7e42b3bd2b27e0c9ff8480f71af7aaf9dcb46 with SHA-1 943fd2fa7f is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1879281

Change-Id: I2b7b32bf11b4cd37efe517798645731eecf035e7
2021-11-03 18:46:15 +00:00
Treehugger Robot
cd128891ed Merge changes from topic "tproto"
* changes:
  Convert .meta_lic files to textproto
  Add macros for non-module license metadata and deps
2021-11-03 18:31:02 +00:00
Bill Yi
78f0b3766f [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: fcdbafa7fe -s ours am: f446921571 -s ours
am skip reason: Merged-In I68a7e42b3bd2b27e0c9ff8480f71af7aaf9dcb46 with SHA-1 943fd2fa7f is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1879281

Change-Id: I57aa6bb0a9e6fa5a2d77df69e9f2202e7442a4ef
2021-11-03 18:25:46 +00:00
Kelvin Zhang
9b6d4ec01b Add a compressor types option
Test: th
Change-Id: I1ff1bccf179bfd87ce9e08def0e5e38921d7d158
2021-11-03 11:17:04 -07:00
Bill Yi
f446921571 [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: fcdbafa7fe -s ours
am skip reason: Merged-In I68a7e42b3bd2b27e0c9ff8480f71af7aaf9dcb46 with SHA-1 943fd2fa7f is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1879281

Change-Id: I8d9e9d20441701a6ffa7e5a76931590723e5cdc4
2021-11-03 18:08:26 +00:00
Bill Yi
fcdbafa7fe Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" 2021-11-03 17:50:39 +00:00
Colin Cross
1ee26cae73 Convert .meta_lic files to textproto
Make it easier to write tools against .meta_lic files and store complex
data by writing them in textproto.

Test: builds
Change-Id: Ibbb6cfbb1bdddd3d938a86d563673a049d826d66
2021-11-03 15:44:00 +00:00
Bill Yi
468572bad8 Merge SP1A.211105.004 to aosp-master - DO NOT MERGE
Merged-In: I68a7e42b3bd2b27e0c9ff8480f71af7aaf9dcb46
Merged-In: Ia18162968822dfbee5299c2692aef1e3c75ba843
Change-Id: I2b422d3dffe04be00304663294b48052a9a29aca
2021-11-03 12:17:35 +00:00
Bob Badour
879cfa867d Add macros for non-module license metadata and deps
Gets rid of .meta_module files and instead defers emitting rules until
after all the non-module targets have been processed. Allows direct
dependency on .meta_lic files, which in turn depend on license text
files.

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense
Test: m reportmissinglicenses

Change-Id: I2c467feac6e13a9366ff66f924889f1dbd48c3f1
2021-11-03 00:52:25 +00:00
The Android Open Source Project
256446eeef [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: b75d7e6f40 -s ours am: 643d0dff4f -s ours am: 5f183bddcc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16177197

Change-Id: Ifa8bf46ebea3c6dc9e25f62de42b6354a4dd8f3e
2021-11-03 00:30:57 +00:00
The Android Open Source Project
5f183bddcc [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: b75d7e6f40 -s ours am: 643d0dff4f -s ours
am skip reason: Merged-In Ia18162968822dfbee5299c2692aef1e3c75ba843 with SHA-1 90c0ddac24 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16177197

Change-Id: I8db9f051af34230fc5b09d9cb0ae56787e09d5b7
2021-11-03 00:12:30 +00:00
The Android Open Source Project
643d0dff4f [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: b75d7e6f40 -s ours
am skip reason: Merged-In Ia18162968822dfbee5299c2692aef1e3c75ba843 with SHA-1 90c0ddac24 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16177197

Change-Id: I0ecea8d1ce65ddfa6eb15117425f54c1a83a89e7
2021-11-02 23:55:41 +00:00
The Android Open Source Project
b75d7e6f40 Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE
Merged-In: Ia18162968822dfbee5299c2692aef1e3c75ba843
Change-Id: I8542ab4e0b080efd7552ab7db0dde4c7cef10d5b
2021-11-02 14:23:03 -07:00
Treehugger Robot
2ee5168b84 Merge "Add share_libs and system_share_libs to module-info" am: dcb0e44c46 am: 943fd2fa7f am: 90c0ddac24 am: cc893addc5
Original change: https://android-review.googlesource.com/c/platform/build/+/1855994

Change-Id: If70ace8f20009b06a8edf7f93855b222096e50f6
2021-11-02 03:02:00 +00:00
Treehugger Robot
cc893addc5 Merge "Add share_libs and system_share_libs to module-info" am: dcb0e44c46 am: 943fd2fa7f am: 90c0ddac24
Original change: https://android-review.googlesource.com/c/platform/build/+/1855994

Change-Id: Id7901f4dedaf9e04cfed2820aa7cf18a360c1649
2021-11-02 02:44:10 +00:00
Treehugger Robot
90c0ddac24 Merge "Add share_libs and system_share_libs to module-info" am: dcb0e44c46 am: 943fd2fa7f
Original change: https://android-review.googlesource.com/c/platform/build/+/1855994

Change-Id: Ia18162968822dfbee5299c2692aef1e3c75ba843
2021-11-02 02:28:36 +00:00
Treehugger Robot
943fd2fa7f Merge "Add share_libs and system_share_libs to module-info" am: dcb0e44c46
Original change: https://android-review.googlesource.com/c/platform/build/+/1855994

Change-Id: I68a7e42b3bd2b27e0c9ff8480f71af7aaf9dcb46
2021-11-02 02:11:58 +00:00
Treehugger Robot
dcb0e44c46 Merge "Add share_libs and system_share_libs to module-info" 2021-11-02 01:52:17 +00:00
Cheonho Park
6e10fa5871 Use findstring to check MODULE_BUILD_FROM_SOURCE am: 51fb042cc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16148239

Change-Id: I42fdff2817b0a62c80a45c6498effdd2bd3b1d69
2021-11-01 23:04:18 +00:00
Colin Cross
772ef767d7 Merge "Support generating install rules in Soong" am: 3a79e5b459 am: a7676b29ef am: 6c59dc79fe am: 0d73915f33
Original change: https://android-review.googlesource.com/c/platform/build/+/1869445

Change-Id: I4a6b88a7d3a45236622ba6a07263ca2542b73a63
2021-11-01 22:46:11 +00:00
Colin Cross
0d73915f33 Merge "Support generating install rules in Soong" am: 3a79e5b459 am: a7676b29ef am: 6c59dc79fe
Original change: https://android-review.googlesource.com/c/platform/build/+/1869445

Change-Id: I05a3202edcfdafcb7f089faf0530c052ea9935d7
2021-11-01 22:23:07 +00:00
Colin Cross
6c59dc79fe Merge "Support generating install rules in Soong" am: 3a79e5b459 am: a7676b29ef
Original change: https://android-review.googlesource.com/c/platform/build/+/1869445

Change-Id: I3685f15891449a2af5a24168f4b7b967e1da1782
2021-11-01 22:05:02 +00:00
Colin Cross
a7676b29ef Merge "Support generating install rules in Soong" am: 3a79e5b459
Original change: https://android-review.googlesource.com/c/platform/build/+/1869445

Change-Id: If7d263782d7986346c0b7f59b01960646deef723
2021-11-01 21:47:57 +00:00
Colin Cross
3a79e5b459 Merge "Support generating install rules in Soong" 2021-11-01 21:31:56 +00:00
Ulyana Trafimovich
cfc3cc9ea0 Merge "Deprecate system server jars defined in Android.mk." am: 75342c1932 am: b563ae2537 am: e735b841e1 am: dfb7c60023
Original change: https://android-review.googlesource.com/c/platform/build/+/1869193

Change-Id: Ia0cfda0783f102dede29427d2443f44e18dd73ba
2021-11-01 10:54:12 +00:00
Ulyana Trafimovich
dfb7c60023 Merge "Deprecate system server jars defined in Android.mk." am: 75342c1932 am: b563ae2537 am: e735b841e1
Original change: https://android-review.googlesource.com/c/platform/build/+/1869193

Change-Id: I02651b5a113a109347512305b1da15aafcea1022
2021-11-01 10:43:11 +00:00
Ulyana Trafimovich
e735b841e1 Merge "Deprecate system server jars defined in Android.mk." am: 75342c1932 am: b563ae2537
Original change: https://android-review.googlesource.com/c/platform/build/+/1869193

Change-Id: Idab69065e3128bc13e518adbdb5a9d78ebf79854
2021-11-01 10:31:31 +00:00
Ulyana Trafimovich
b563ae2537 Merge "Deprecate system server jars defined in Android.mk." am: 75342c1932
Original change: https://android-review.googlesource.com/c/platform/build/+/1869193

Change-Id: Ib90833cd758380bdc7c9357c2ac061efda4ea525
2021-11-01 10:13:51 +00:00
Ulyana Trafimovich
75342c1932 Merge "Deprecate system server jars defined in Android.mk." 2021-11-01 10:01:10 +00:00
yangbill
5f5e2362fa Add share_libs and system_share_libs to module-info
Bug: 202922558
Bug: 204269866
Test: m out/target/product/vsoc_x86_64/module-info.json

Change-Id: Idb4e66216cac4835968454f83196107f6bec4c1c
2021-11-01 06:38:43 +00:00