Automerger Merge Worker
7871309395
Merge "Add a missing ',' in the VNDK variant identicalness check" am: c99128cdbf
am: cca79e581f
am: 4954e2cfc4
...
Change-Id: I493c05c65537121859770f563ed42815918d99b7
2020-01-28 23:08:11 +00:00
Automerger Merge Worker
5b910ad128
Merge "Mark (BUILD_|LOCAL_)COPY_HEADERS as [more] deprecated" am: 5daf724d15
am: e0f634f426
am: 56a67a5fdc
...
Change-Id: Ie9fa06dfdb99af935af2a211eb14d13f066aac9a
2020-01-28 23:08:01 +00:00
Automerger Merge Worker
49f0e0283c
Merge "Fix building docs as part of checkbuild" am: 35e12a7020
am: a8008259f9
am: 0550ae99a4
...
Change-Id: I1844b23cc9e31c8ea4f5d521cb621e824afc3c53
2020-01-28 23:07:48 +00:00
Automerger Merge Worker
4954e2cfc4
Merge "Add a missing ',' in the VNDK variant identicalness check" am: c99128cdbf
am: cca79e581f
...
Change-Id: I834acd8e3f4075e43269934e042f12ed4dbc2706
2020-01-28 22:57:49 +00:00
Automerger Merge Worker
56a67a5fdc
Merge "Mark (BUILD_|LOCAL_)COPY_HEADERS as [more] deprecated" am: 5daf724d15
am: e0f634f426
...
Change-Id: I1b86bf620e81771f1d0402f809943d8137a6c1e0
2020-01-28 22:57:41 +00:00
Automerger Merge Worker
0550ae99a4
Merge "Fix building docs as part of checkbuild" am: 35e12a7020
am: a8008259f9
...
Change-Id: Ib7fbc6ee15d98e7f7f6b85c1a2cecebec5c79bc7
2020-01-28 22:57:34 +00:00
Steven Laver
cca79e581f
Merge "Add a missing ',' in the VNDK variant identicalness check"
...
am: c99128cdbf
Change-Id: I6b7fa1f1211b9a49bce5e312e77f376efc7f1bb1
2020-01-28 14:52:05 -08:00
Dan Willemsen
e0f634f426
Merge "Mark (BUILD_|LOCAL_)COPY_HEADERS as [more] deprecated"
...
am: 5daf724d15
Change-Id: I01ad1a7e81b5079b99def9642afc1cc0350831b8
2020-01-28 14:47:31 -08:00
Colin Cross
a8008259f9
Merge "Fix building docs as part of checkbuild"
...
am: 35e12a7020
Change-Id: I6d3e445979e8d390841d24c01cbf37f8d6a20445
2020-01-28 14:46:48 -08:00
Steven Laver
c99128cdbf
Merge "Add a missing ',' in the VNDK variant identicalness check"
2020-01-28 22:38:56 +00:00
Dan Willemsen
5daf724d15
Merge "Mark (BUILD_|LOCAL_)COPY_HEADERS as [more] deprecated"
2020-01-28 22:38:43 +00:00
Colin Cross
35e12a7020
Merge "Fix building docs as part of checkbuild"
2020-01-28 22:24:00 +00:00
Automerger Merge Worker
88774ba93b
Merge "Add RBE support for Javac, R8, and D8 if respective env vars are set." am: 2899e4871d
am: 1f58479935
am: 518e810142
...
Change-Id: I23034f8a0e419d599b55473f6f4c5dc0bc474b5d
2020-01-28 20:31:13 +00:00
Automerger Merge Worker
518e810142
Merge "Add RBE support for Javac, R8, and D8 if respective env vars are set." am: 2899e4871d
am: 1f58479935
...
Change-Id: I39d3391ea235e594344889269ba00350da78a570
2020-01-28 20:16:38 +00:00
Automerger Merge Worker
1f58479935
Merge "Add RBE support for Javac, R8, and D8 if respective env vars are set." am: 2899e4871d
...
Change-Id: I8fa09e31be17050b69f54ed0f102ab0a8f3d1252
2020-01-28 20:07:56 +00:00
Ramy Medhat
2899e4871d
Merge "Add RBE support for Javac, R8, and D8 if respective env vars are set."
2020-01-28 19:49:05 +00:00
Steven Laver
6a9ff71894
Add a missing ',' in the VNDK variant identicalness check
...
The invocation of verify-vndk-libs-identical is missing a ',' between
the second and third parameters, in commit
4873e65c8d
.
Change-Id: I88d230db4e6fed5939b1fe9d636d440a00773a41
2020-01-28 11:31:33 -08:00
David Su
16fd35c69a
Merge "Move cacerts_wfa from system to Wifi APEX"
2020-01-28 18:54:28 +00:00
Hangyu Kuang
f4ce00c694
Merge "MediaTranscoding: Disable the transcoding service for Android R."
2020-01-28 18:07:33 +00:00
Ramy Medhat
a9cc25d785
Add RBE support for Javac, R8, and D8 if respective env vars are set.
...
Test: aosp_crosshatch build with and without the new variables.
Change-Id: I252ff5dd8e372edf8c86e25348c8a2bfab41d70d
2020-01-28 10:25:25 -05:00
Automerger Merge Worker
c09ea3b4e2
Merge "Resign apks contained in apex" am: 62f97c7fb4
am: d8df6fcc9e
am: 454bccf2cb
...
Change-Id: I2d7b8b5f6c469d4428d3dccc77790a783a925cba
2020-01-28 05:45:42 +00:00
Automerger Merge Worker
454bccf2cb
Merge "Resign apks contained in apex" am: 62f97c7fb4
am: d8df6fcc9e
...
Change-Id: I22714cac185a795df6348afd3d92182409768914
2020-01-28 05:31:29 +00:00
Tianjie Xu
d8df6fcc9e
Merge "Resign apks contained in apex"
...
am: 62f97c7fb4
Change-Id: Ifa5abda286d760ef13c3fcee696f444093a0d9c5
2020-01-27 21:16:44 -08:00
Tianjie Xu
62f97c7fb4
Merge "Resign apks contained in apex"
2020-01-28 05:08:23 +00:00
Dan Willemsen
66d21d4a30
Mark (BUILD_|LOCAL_)COPY_HEADERS as [more] deprecated
...
We've considered these deprecated for a while, and have reduced where
they may be used, but let's actually throw warnings and call them out
specifically now.
Bug: 130719878
Test: lunch aosp_arm; m nothing [see no warnings]
Test: lunch aosp_crosshatch; m nothing [see LOCAL_COPY_HEADERS warnings]
Test: lunch aosp_taimen; m nothing [see BUILD_COPY_HEADERS warnings]
Change-Id: I8c12012366d84667de0d223bbde38d8b90419e36
2020-01-27 19:45:04 -08:00
Automerger Merge Worker
bd4b5fa229
Merge "Give strip depfile a unique name, properly include it" am: 15e0680af1
am: 57aa92a4e5
am: 94e182d955
...
Change-Id: Iefec891a6d7d8a90f64e13c9fdd07d7eaae752d4
2020-01-28 00:28:59 +00:00
Automerger Merge Worker
94e182d955
Merge "Give strip depfile a unique name, properly include it" am: 15e0680af1
am: 57aa92a4e5
...
Change-Id: I8bbbc576d2be5ca0021165543de2872a0e86724d
2020-01-28 00:17:11 +00:00
Colin Cross
57aa92a4e5
Merge "Give strip depfile a unique name, properly include it"
...
am: 15e0680af1
Change-Id: Ie7a6d822a08f04e3ca321f66ce5614003c2e5362
2020-01-27 16:04:48 -08:00
Automerger Merge Worker
7ae125459f
Merge "Add apexer and dependencies to otatools" am: 19dbfceafd
am: f10be1e153
am: 254a5a76b1
...
Change-Id: Ifb6909b4308c9e671bbfd4bcf59eb77ce9a2556c
2020-01-27 23:52:10 +00:00
Automerger Merge Worker
254a5a76b1
Merge "Add apexer and dependencies to otatools" am: 19dbfceafd
am: f10be1e153
...
Change-Id: I5d7d1472a0132f26ce593d83c893e7615e977940
2020-01-27 23:43:10 +00:00
Treehugger Robot
15e0680af1
Merge "Give strip depfile a unique name, properly include it"
2020-01-27 23:38:00 +00:00
Tianjie Xu
f10be1e153
Merge "Add apexer and dependencies to otatools"
...
am: 19dbfceafd
Change-Id: Id9140f3e340ff8aae5f1061a562953bc5717c9e0
2020-01-27 15:30:14 -08:00
Tianjie Xu
19dbfceafd
Merge "Add apexer and dependencies to otatools"
2020-01-27 23:21:52 +00:00
Colin Cross
3e87e83557
Give strip depfile a unique name, properly include it
...
$(LOCAL_BUILT_MODULE).d may conflict with the .d file for a .o file,
use $(LOCAL_BUILT_MODULE).strip.d. Also pass the required second
arg to include-depfile.
Bug: 148387048
Test: m checkbuild
Change-Id: I1f5f4c38010294a12d6777439b0f66c0102c1c96
2020-01-27 22:06:21 +00:00
hkuang
cde5b32221
MediaTranscoding: Disable the transcoding service for Android R.
...
Bug: 145233472
Bug: 148116480
Test: Build and flash the phone. dumpsys show the service is not up.
Change-Id: I501c0860f07c42efaa30f237b4f9b2db720cb6b6
2020-01-27 21:19:19 +00:00
Tianjie Xu
88a759d651
Resign apks contained in apex
...
Some apex payload images contain apk files. And these apks need to be
signed during the signing processed when sign_target_files_apks is
called. To support the signing, we can extract the payload and repack
the apex file with the (de)apexer tool. Add the signing support in the
apex_util.
Bug: 146508800
Test: unit tests pass, run sign_apex, sign_target_files_apks
Change-Id: If6d58975248709a144b07dbabf47c27916e5695e
2020-01-27 19:48:39 +00:00
Colin Cross
43e74295e0
Fix building docs as part of checkbuild
...
s/module_to_check/modules_to_check/
Bug: 118815658
Test: m checkbuild
Change-Id: I53e10747ed404509fd11adb72e641c702e27655b
2020-01-27 11:36:07 -08:00
Tianjie Xu
eb8a0a0036
Add apexer and dependencies to otatools
...
We need them to extract and repack the apex file when signing
the apex.
Bug: 146508800
Test: build
Change-Id: Ib38055eac24f28ac59610d03275de05b77d3eeb0
2020-01-27 11:05:54 -08:00
Automerger Merge Worker
3f282ca5d8
[automerger skipped] Merge "Remove keymaster libraries from VNDK" am: f78c9f6e3c
am: 2516500005
am: 85d7ada563
-s ours
...
am skip reason: Change-Id I9286b36d26f09e26763df17758f9bec9e2b60ec8 with SHA-1 01d91b7b65
is in history
Change-Id: I43f760f2fbf6a98099c7b8df46335337f5314d95
2020-01-27 18:40:00 +00:00
Automerger Merge Worker
85d7ada563
Merge "Remove keymaster libraries from VNDK" am: f78c9f6e3c
am: 2516500005
...
Change-Id: Ie0510f36e4d542d6bfe04eb8d9a593f62c2848a7
2020-01-27 18:20:59 +00:00
Janis Danisevskis
2516500005
Merge "Remove keymaster libraries from VNDK"
...
am: f78c9f6e3c
Change-Id: If6720951f01b916fa8d3cd687ff43e1aef9e81fd
2020-01-27 10:05:50 -08:00
Treehugger Robot
f78c9f6e3c
Merge "Remove keymaster libraries from VNDK"
2020-01-27 17:30:35 +00:00
Sasha Kuznetsov
e6e1483802
Merge "Update current.txt with measurement_corrections 1.1"
2020-01-25 23:31:41 +00:00
Automerger Merge Worker
f87e360b62
Merge "Deprecate BUILD_HOST_SHARED_LIBRARY" am: 9fe2479849
am: e2b3e1a84d
am: 437ecb1802
...
Change-Id: I9a65c99730f8ca609ec8cc858333b00815465154
2020-01-25 01:16:50 +00:00
Automerger Merge Worker
bee66d083e
Merge "Add BOARD_USES_RECOVERY_AS_BOOT to readonly list." am: 715c6a8794
am: 7bf299b6db
am: 18201fab6f
...
Change-Id: I299178abc7b52f451b7a3485507db43420dfa9fd
2020-01-25 01:16:14 +00:00
Automerger Merge Worker
861dce8ccd
Merge changes from topics "board_use_recovery_as_root_soong", "ramdisk" am: cb0e97750a
am: 46d591b9c5
am: b5e16eecb0
...
Change-Id: I8f6c9d5d2be75b603e6d8bc78dc30bb6d0c38e72
2020-01-25 01:14:16 +00:00
Automerger Merge Worker
3671b6dc0e
Export BOARD_USES_RECOVERY_AS_BOOT to soong. am: 9a190e25d0
am: 40ff694e13
am: 5b051123da
...
Change-Id: I12fc61b6e020ffe158572f329d4eb27e68606d20
2020-01-25 01:14:09 +00:00
Automerger Merge Worker
437ecb1802
Merge "Deprecate BUILD_HOST_SHARED_LIBRARY" am: 9fe2479849
am: e2b3e1a84d
...
Change-Id: Iafa86c91dc916fee8f1ecae680b40d6fc9a9d87e
2020-01-25 01:01:21 +00:00
Automerger Merge Worker
18201fab6f
Merge "Add BOARD_USES_RECOVERY_AS_BOOT to readonly list." am: 715c6a8794
am: 7bf299b6db
...
Change-Id: Id2bb2b97b93358df905b4fc1245d6ea7a5236921
2020-01-25 01:00:26 +00:00
Automerger Merge Worker
b5e16eecb0
Merge changes from topics "board_use_recovery_as_root_soong", "ramdisk" am: cb0e97750a
am: 46d591b9c5
...
Change-Id: I7c5b69fe6bfd1b83ad6e12e6b23851ae339d2943
2020-01-25 00:59:25 +00:00