Commit Graph

66876 Commits

Author SHA1 Message Date
Anton Hansson
81c965bca8 Merge "Use 64 bit binder in module builds" am: 75232ce489 am: b27d9c665e
Original change: https://android-review.googlesource.com/c/platform/build/+/1549377

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I953c783ed7b633932bd38f97e53ee3033de7f9f8
2021-01-13 19:02:18 +00:00
Anton Hansson
b27d9c665e Merge "Use 64 bit binder in module builds" am: 75232ce489
Original change: https://android-review.googlesource.com/c/platform/build/+/1549377

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4b5ceb330178884a128c0e331bbd4b290653694
2021-01-13 18:42:52 +00:00
Anton Hansson
75232ce489 Merge "Use 64 bit binder in module builds" 2021-01-13 18:21:04 +00:00
Nikita Ioffe
122a6dc06c Merge "Refactor apex signing logic in preparation for compressed apexes" am: 015b689271 am: d2052b6598
Original change: https://android-review.googlesource.com/c/platform/build/+/1545992

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I57510bd7387242d6e2cfa3b56b4e7bfcb1f7f4f5
2021-01-13 15:46:18 +00:00
Nikita Ioffe
d2052b6598 Merge "Refactor apex signing logic in preparation for compressed apexes" am: 015b689271
Original change: https://android-review.googlesource.com/c/platform/build/+/1545992

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c89435f2f7916a01e1ac0df35f0fabf60f2c8c7
2021-01-13 15:18:00 +00:00
Nikita Ioffe
015b689271 Merge "Refactor apex signing logic in preparation for compressed apexes" 2021-01-13 14:54:49 +00:00
Anton Hansson
0bafe32068 Use 64 bit binder in module builds
Add a new BoardConfigModuleCommon for settings of this sort.

Bug: 176840868
Test: forrest module coverage build
Merged-In: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
Change-Id: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
(cherry picked from commit c0423c8dae)
2021-01-13 11:05:20 +00:00
Orion Hodson
da5d5a7121 Merge "Remove implicit include path for jni.h" am: f79835fca2 am: f3eaf5348c
Original change: https://android-review.googlesource.com/c/platform/build/+/1354602

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6cad1792430939fbae3d365a5f78577301892765
2021-01-13 07:25:14 +00:00
Orion Hodson
f3eaf5348c Merge "Remove implicit include path for jni.h" am: f79835fca2
Original change: https://android-review.googlesource.com/c/platform/build/+/1354602

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iedc312485683f76b6f80d44e49d5a9efc23d37c8
2021-01-13 06:58:51 +00:00
Orion Hodson
f79835fca2 Merge "Remove implicit include path for jni.h" 2021-01-13 06:11:03 +00:00
Treehugger Robot
a35770769e Merge "Add dependencies on java resources when packaging APK without classes" am: 9d2219c2da am: 6109d42ec6
Original change: https://android-review.googlesource.com/c/platform/build/+/1549235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica26b7ba2641e53e653076746ab7c69a4ca71294
2021-01-13 02:00:19 +00:00
Treehugger Robot
6109d42ec6 Merge "Add dependencies on java resources when packaging APK without classes" am: 9d2219c2da
Original change: https://android-review.googlesource.com/c/platform/build/+/1549235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d1ffeb3230e0871704bc17af6999ce5d8f7b57f
2021-01-13 01:35:18 +00:00
Treehugger Robot
9d2219c2da Merge "Add dependencies on java resources when packaging APK without classes" 2021-01-13 00:57:08 +00:00
Tianjie Xu
4f44df13bd Merge "Fix errors from validate_target_files" am: 2de3459680 am: 07fed70dd5
Original change: https://android-review.googlesource.com/c/platform/build/+/1548857

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5519acbab51d42c30422bf46d1022487ae05ba93
2021-01-13 00:49:44 +00:00
Treehugger Robot
488dd277ef Merge "Add missing dependencies to releasetools_common and binary defaults." am: eebe61d354 am: d348008137
Original change: https://android-review.googlesource.com/c/platform/build/+/1548834

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4993f678b4d06dfcc1c62c446c9e31fd774c29c5
2021-01-13 00:49:19 +00:00
Tianjie Xu
07fed70dd5 Merge "Fix errors from validate_target_files" am: 2de3459680
Original change: https://android-review.googlesource.com/c/platform/build/+/1548857

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibdfc05f9ba7baf43cbbffc4c95aa0176669ba1b2
2021-01-13 00:40:10 +00:00
Paul Scovanner
a0db87bcd4 [automerger skipped] Update Security String to 2021-03-01 am: 0e3ba7d2f7 am: e1380bb1df am: f87e56ff8a am: 785b0ae02e -s ours am: 6baf089ea3 -s ours am: 1be58c9063 -s ours
am skip reason: Change-Id I6d6542306c51ac1682f02cbce6701688d2bdbea2 with SHA-1 9c4665257c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c5b982eb071511e0e72648b84ed2fba44871e6c
2021-01-13 00:33:18 +00:00
Treehugger Robot
d348008137 Merge "Add missing dependencies to releasetools_common and binary defaults." am: eebe61d354
Original change: https://android-review.googlesource.com/c/platform/build/+/1548834

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8208536e1d919834dff9aff68cde1fbdddc494f2
2021-01-13 00:33:05 +00:00
Paul Scovanner
1be58c9063 [automerger skipped] Update Security String to 2021-03-01 am: 0e3ba7d2f7 am: e1380bb1df am: f87e56ff8a am: 785b0ae02e -s ours am: 6baf089ea3 -s ours
am skip reason: Change-Id I6d6542306c51ac1682f02cbce6701688d2bdbea2 with SHA-1 9c4665257c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80c75ec2fa12865714f8551c2e4dece9acf30432
2021-01-13 00:15:05 +00:00
Tianjie Xu
2de3459680 Merge "Fix errors from validate_target_files" 2021-01-13 00:02:36 +00:00
Treehugger Robot
eebe61d354 Merge "Add missing dependencies to releasetools_common and binary defaults." 2021-01-12 23:58:58 +00:00
Paul Scovanner
6baf089ea3 [automerger skipped] Update Security String to 2021-03-01 am: 0e3ba7d2f7 am: e1380bb1df am: f87e56ff8a am: 785b0ae02e -s ours
am skip reason: Change-Id I6d6542306c51ac1682f02cbce6701688d2bdbea2 with SHA-1 9c4665257c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2fb64f180da87c5fb758b19deedd1fde68631dbd
2021-01-12 23:57:49 +00:00
Colin Cross
9644ec811f Add dependencies on java resources when packaging APK without classes
When an APK is packaged without any classes.dex files the resources
are packaged directly, and so the packaging rule must depend on the
resources.

Fixes: 177295654
Test: prebuilts/build-tools/linux-x86/bin/ninja -f out/combined-aosp_cf_x86_64_phone.ninja -t query out/target/product/vsoc_x86_64/obj/APPS/CtsSplitApp_x86_64_intermediates/package.apk
Change-Id: I786e71439f11e7bd5e20e010b66fbf529eb57a5a
2021-01-12 15:08:08 -08:00
Paul Scovanner
785b0ae02e Update Security String to 2021-03-01 am: 0e3ba7d2f7 am: e1380bb1df am: f87e56ff8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13318721

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied29b2cc0e2a5e1abc31336b03874019ef814451
2021-01-12 23:03:45 +00:00
Paul Scovanner
f87e56ff8a Update Security String to 2021-03-01 am: 0e3ba7d2f7 am: e1380bb1df
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13318721

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b3187f2211c7f7f5dd6a766b2d27224dea986ac
2021-01-12 22:46:20 +00:00
Nikita Ioffe
6068e8dd52 Refactor apex signing logic in preparation for compressed apexes
Logic for signing compressed apex will be added in the follow-up cl.

Test: python -m unittest test_sign_apex
Bug: 172912232
Change-Id: I8dc1d334c17e11f9eed8fe0a575b6dfcf337ab5d
2021-01-12 22:29:58 +00:00
Paul Scovanner
e1380bb1df Update Security String to 2021-03-01 am: 0e3ba7d2f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13318721

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I409580bb0eeb98a17ca9791d42d8076e8721eb2d
2021-01-12 22:23:58 +00:00
Evgenii Stepanov
bb1611fe75 Merge "Include/exclude paths for memtag sanitizer." am: de32b6d59c am: d04cbb243f
Original change: https://android-review.googlesource.com/c/platform/build/+/1540746

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a8a56e12b676dee8ed5ace77298ae19575f694d
2021-01-12 22:08:38 +00:00
Tianjie
2e0b835d28 Fix errors from validate_target_files
We should skip lines that don't contain '=', e.g. empty lines.
Also, pop a warning instead of an error if a prop is defined
multiple times with the same value

Bug: 177240467
Test: unittest, run validate_target_files
Change-Id: Ifc9eadb91e5dda7170a19d875016e5a47e8fc592
2021-01-12 14:04:58 -08:00
Yifan Hong
14a8712c4d Add missing dependencies to releasetools_common and binary defaults.
When GetBootImageBuildProp is moved to common, its dependencies
(toybox, lz4 and unpack_bootimg) aren't moved accordingly.
Copy the dependencies over.

Test: pass
Change-Id: Iaa8f41ae0109e8eb1c058ecd7dd854bb7de9391a
2021-01-12 14:04:19 -08:00
Evgenii Stepanov
d04cbb243f Merge "Include/exclude paths for memtag sanitizer." am: de32b6d59c
Original change: https://android-review.googlesource.com/c/platform/build/+/1540746

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91eabd5e784142777b0bcf9b95fe4dd11ad024c3
2021-01-12 21:02:24 +00:00
Evgenii Stepanov
de32b6d59c Merge "Include/exclude paths for memtag sanitizer." 2021-01-12 19:33:02 +00:00
Ulyana Trafimovich
5175e89563 Merge "Initialize DEX_PREOPT_DEFAULT based on global dexpreopt settings." am: c275c68dfd am: e348e0de40
Original change: https://android-review.googlesource.com/c/platform/build/+/1546334

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4290f88283328a6a83b63ef5a31906f67381ac5
2021-01-12 11:18:20 +00:00
Ulyana Trafimovich
e348e0de40 Merge "Initialize DEX_PREOPT_DEFAULT based on global dexpreopt settings." am: c275c68dfd
Original change: https://android-review.googlesource.com/c/platform/build/+/1546334

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3b74cd0fc8610aeb48fc716b37dae79c0a5fba6
2021-01-12 11:03:26 +00:00
Ulyana Trafimovich
c275c68dfd Merge "Initialize DEX_PREOPT_DEFAULT based on global dexpreopt settings." 2021-01-12 10:12:14 +00:00
Chengyou Ho
b87347a9d5 Merge "Add AuthSecret HAL to VNDK-core list" am: fe1d9d4336 am: c3a5f43f65
Original change: https://android-review.googlesource.com/c/platform/build/+/1540866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8750b87a1843aa82643704ede6410388a23648b6
2021-01-12 09:00:41 +00:00
Chengyou Ho
c3a5f43f65 Merge "Add AuthSecret HAL to VNDK-core list" am: fe1d9d4336
Original change: https://android-review.googlesource.com/c/platform/build/+/1540866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87a311778c18a0bac74276c009ce87911c00989e
2021-01-12 08:22:52 +00:00
Chengyou Ho
fe1d9d4336 Merge "Add AuthSecret HAL to VNDK-core list" 2021-01-12 07:51:37 +00:00
ChengYou Ho
c2adfd8efe Add AuthSecret HAL to VNDK-core list
Bug: 176107318
Change-Id: I13dfb105e8aed296028118ec5cc806c220797ff8
2021-01-12 06:01:07 +00:00
Evgenii Stepanov
10b4d0ad5d Include/exclude paths for memtag sanitizer.
Bug: b/135772972
Test: none
Change-Id: Ib198c359b92b82573cb66fd6d993aece0e9ff7d9
2021-01-11 21:15:21 -08:00
Treehugger Robot
d5ed0ff6f3 Merge "Add unit_test option to module-info.json" am: 7c6370772f am: 793d8e20d8
Original change: https://android-review.googlesource.com/c/platform/build/+/1542714

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie72ec35614d628ac2b48dd75ff9e7fb104623a74
2021-01-12 03:52:42 +00:00
Treehugger Robot
793d8e20d8 Merge "Add unit_test option to module-info.json" am: 7c6370772f
Original change: https://android-review.googlesource.com/c/platform/build/+/1542714

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2ea3f051c13ae5decd59cd7c6e1a991495c7ec3
2021-01-12 03:35:47 +00:00
Treehugger Robot
7c6370772f Merge "Add unit_test option to module-info.json" 2021-01-12 02:37:47 +00:00
Nikita Ioffe
e42001bcc4 Merge "Fix test_sign_apex" am: 8f8522a83b am: 9de9e07e47
Original change: https://android-review.googlesource.com/c/platform/build/+/1545991

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e13e30eaa272e4e951aceeb3f995e6f099aa391
2021-01-12 02:31:43 +00:00
SzuWei Lin
0ec848cd07 Merge "Skip generate-common-build-props for older devices without /product" am: 7240eca439 am: be17aa488e
Original change: https://android-review.googlesource.com/c/platform/build/+/1530331

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03a352070789beebf4753e65498473b4ca89f30d
2021-01-12 02:31:07 +00:00
Nikita Ioffe
9de9e07e47 Merge "Fix test_sign_apex" am: 8f8522a83b
Original change: https://android-review.googlesource.com/c/platform/build/+/1545991

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d5295950b71339aa3114c25f37cb28d049d3768
2021-01-12 02:15:55 +00:00
SzuWei Lin
be17aa488e Merge "Skip generate-common-build-props for older devices without /product" am: 7240eca439
Original change: https://android-review.googlesource.com/c/platform/build/+/1530331

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa9efa529f581e86c140a7750a3093bcbfb3e1db
2021-01-12 02:15:17 +00:00
Nikita Ioffe
8f8522a83b Merge "Fix test_sign_apex" 2021-01-12 01:51:48 +00:00
SzuWei Lin
7240eca439 Merge "Skip generate-common-build-props for older devices without /product" 2021-01-12 01:28:36 +00:00
Nikita Ioffe
c3fdfed11b Fix test_sign_apex
Test: python -m unittest test_sign_apex
Change-Id: I2a27a394b3de32fa29e487bea0b7721502a8bd98
2021-01-11 23:50:31 +00:00