Commit Graph

59256 Commits

Author SHA1 Message Date
Automerger Merge Worker 4fc1d0899c Merge "Enforce LOCAL_CERTIFICATE is set in soong_app_prebuilt.mk" am: 5c3725510a am: 30c91a72ed am: a3e44a240f
Change-Id: I8c9e73d32d53a5f8d2c7b045e09d39ff34886002
2020-01-29 18:22:29 +00:00
Automerger Merge Worker a3e44a240f Merge "Enforce LOCAL_CERTIFICATE is set in soong_app_prebuilt.mk" am: 5c3725510a am: 30c91a72ed
Change-Id: Ib0720906ec616ad65234d70b0cc5630f16e2746b
2020-01-29 18:11:45 +00:00
Colin Cross 30c91a72ed Merge "Enforce LOCAL_CERTIFICATE is set in soong_app_prebuilt.mk"
am: 5c3725510a

Change-Id: Ic55c310a7abcc98b995e774aaf591d69605eed78
2020-01-29 09:59:01 -08:00
Treehugger Robot 5c3725510a Merge "Enforce LOCAL_CERTIFICATE is set in soong_app_prebuilt.mk" 2020-01-29 17:42:51 +00:00
Nikita Ioffe 0f38beca94 Don't inherit userspace_reboot.mk from mainline_system.mk
Test: Checked that userspace_reboot.mk is included in device makefiles
Test: build
Bug: 135984674
Change-Id: If910e2a6baf8acaafc8bafdf8193ba7237f66f1a
2020-01-29 17:27:30 +00:00
Automerger Merge Worker 2f7d750a4e Merge "Remove unused no_vendor_variant_vndk_check target" am: 526551f013 am: 64d0b72f81 am: ad916eda39
Change-Id: Icbe22459d1cf5cbf45eae7d2e4561e5a55b52faa
2020-01-29 07:31:15 +00:00
Automerger Merge Worker ad916eda39 Merge "Remove unused no_vendor_variant_vndk_check target" am: 526551f013 am: 64d0b72f81
Change-Id: I64cefc642339d0b270c0d83a36972ed7b42cf9a8
2020-01-29 07:19:21 +00:00
Vic Yang 64d0b72f81 Merge "Remove unused no_vendor_variant_vndk_check target"
am: 526551f013

Change-Id: Id13c047df6da98ce0ab23b625c1578c2db2d3571
2020-01-28 23:04:41 -08:00
Treehugger Robot 526551f013 Merge "Remove unused no_vendor_variant_vndk_check target" 2020-01-29 06:54:01 +00:00
Automerger Merge Worker b43aafbee2 Merge "Add explicitly merge_zips to otatools package" am: 0434412bcd am: 7d88e726cc am: 4b60a5399d
Change-Id: I5646e52d8c6c2900c8366f9be24d5d866c997402
2020-01-29 06:46:40 +00:00
Automerger Merge Worker 4b60a5399d Merge "Add explicitly merge_zips to otatools package" am: 0434412bcd am: 7d88e726cc
Change-Id: I727b914259949c5b6019f95564419d494daa1614
2020-01-29 06:32:16 +00:00
Baligh Uddin 7d88e726cc Merge "Add explicitly merge_zips to otatools package"
am: 0434412bcd

Change-Id: I2b536927f621f7d7cc6fcd0fdc246433bcea4db4
2020-01-28 22:24:38 -08:00
Baligh Uddin 0434412bcd Merge "Add explicitly merge_zips to otatools package" 2020-01-29 06:16:16 +00:00
Vic Yang 3ec918d342 Remove unused no_vendor_variant_vndk_check target
This was missed when we moved from a single target for checking all
VNDK libraries to using timestamp files for checking individual VNDK
libraries.

Test: Build success.
Change-Id: I3be19f6755b24fff2446449a9dbc84db9a20ea41
2020-01-28 21:01:38 -08:00
Automerger Merge Worker da8d330980 Merge "Make the error more instructive on missing android_jar_path" am: 8fff584906 am: 10ef03e4fc am: 858ad8b026
Change-Id: I1707f017f30dafeba0822d813a7fee160d631859
2020-01-29 03:52:03 +00:00
Automerger Merge Worker 858ad8b026 Merge "Make the error more instructive on missing android_jar_path" am: 8fff584906 am: 10ef03e4fc
Change-Id: I4bf10bbfae54424f8b968290bd662a44ee9abf71
2020-01-29 03:40:43 +00:00
Tianjie Xu 10ef03e4fc Merge "Make the error more instructive on missing android_jar_path"
am: 8fff584906

Change-Id: Iba00bd3511671d8b45f1e225e09aca25b6816f47
2020-01-28 19:29:11 -08:00
Tianjie Xu 8fff584906 Merge "Make the error more instructive on missing android_jar_path" 2020-01-29 03:19:23 +00:00
Tianjie Xu a25d76f2c8 Add explicitly merge_zips to otatools package
Since it's under soong/out/host, we need to explicitly copy it into the
otatools.zip

Bug: 146508800
Test: build and check otatools.zip
Change-Id: I83e201601cf03b6eb01ead912a78f22f750aa4be
2020-01-28 19:17:35 -08:00
Automerger Merge Worker 83e55789b7 Merge "Add build properties to enable casefold and prj_quota" am: dac25a96df am: 0675f9d743 am: f13695b1e5
Change-Id: I712a5eb078bd3471baef1326647c4202027b4250
2020-01-29 00:34:02 +00:00
Automerger Merge Worker f13695b1e5 Merge "Add build properties to enable casefold and prj_quota" am: dac25a96df am: 0675f9d743
Change-Id: I01a9dfd7dc9718113d43dd0a8d8a33a01c320dca
2020-01-29 00:21:11 +00:00
Daniel Rosenberg 0675f9d743 Merge "Add build properties to enable casefold and prj_quota"
am: dac25a96df

Change-Id: I0ce364177d52a683a156cca012e18019a47d4c46
2020-01-28 16:04:41 -08:00
Daniel Rosenberg dac25a96df Merge "Add build properties to enable casefold and prj_quota" 2020-01-28 23:53:25 +00:00
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
Colin Cross 24c77395be Enforce LOCAL_CERTIFICATE is set in soong_app_prebuilt.mk
Missing LOCAL_CERTIFICATE produces an apkcerts.txt file that
has no key for the APK, which confuses the signing tools.
Enforce that it is set.

Bug: 147765187
Test: m apkcerts-list
Change-Id: I1299505d193deba5956954e5d9b6e4c727456b9c
2020-01-28 14:13:52 -08: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
Tianjie Xu 61a792f323 Make the error more instructive on missing android_jar_path
So when $ANDROID_BUILD_TOP is missing, the error message print out the
path of the missing file; instead of a type error.

Bug: 148452817
Test: check result with missing ANDROID_BUILD_TOP
Change-Id: I5f841f6626eb3843364f20e78b278d3244505396
2020-01-28 10:58:14 -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