Commit graph

59292 commits

Author SHA1 Message Date
Kelvin Zhang
bd6f4bf24b Merge "Fix some wording to comply with respectful-code" am: b1cb5b82a6
Original change: https://android-review.googlesource.com/c/platform/build/+/1371556

Change-Id: I3f0ce9cf8771264d70099167d02b217cd3da13a2
2020-07-28 18:20:33 +00:00
Kelvin Zhang
b1cb5b82a6 Merge "Fix some wording to comply with respectful-code" 2020-07-28 17:58:35 +00:00
Yo Chiang
1237c1f577 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Test: TH
Change-Id: I2a93e520120fa52a190a445b4d4c417c299b9727
2020-07-29 01:20:01 +08:00
Joseph Murphy
ba35404e2d Fixes a few things with the robolectric autoconfig
There are a few extra flags and a few changes to flags that have
happened over the course of getting Robolectric to run under Tradefed
that need adding to the autogenerated config.

Bug: b/157635117
Test: manual
Change-Id: Ifdf90bb512a6e92ed39e671aeff65e0ddf2d0c4f
2020-07-28 07:00:06 +00:00
Kiyoung Kim
775559ad79 Merge "Deprecate VNDK-Lite" am: c8343a3f0e
Original change: https://android-review.googlesource.com/c/platform/build/+/1351286

Change-Id: I7b66829c410acabcbf403c14d91ab8b8faa30794
2020-07-28 00:49:52 +00:00
Kiyoung Kim
c8343a3f0e Merge "Deprecate VNDK-Lite" 2020-07-28 00:36:10 +00:00
Treehugger Robot
4e4699afeb Merge "add android-mainline kernels to aosp_arm64 build" am: a5fb54f6eb
Original change: https://android-review.googlesource.com/c/platform/build/+/1371560

Change-Id: I1688e68564e6eb4971177c272f62d578ebebd2c1
2020-07-24 22:31:52 +00:00
Treehugger Robot
a5fb54f6eb Merge "add android-mainline kernels to aosp_arm64 build" 2020-07-24 22:23:10 +00:00
Dan Albert
57600a4735 Delete unused subdirectory.
Directory was flagged for not being compliant with inclusive language
guidance, and there are no references to this directory anywhere that
I can find, so just delete it.

Test: None
Bug: 161896447
Change-Id: I28892cfd32b54987380d472d032d741eb78f4156
2020-07-24 14:07:35 -07:00
Bill Peckham
6820c719d4 Merge "Export TARGET_ENABLE_MEDIADRM_64 to Soong." am: 2dc367549a
Original change: https://android-review.googlesource.com/c/platform/build/+/1371618

Change-Id: I707fc693cad6d6e77e2c984936ebe5101f1ca4c3
2020-07-24 15:49:04 +00:00
Bill Peckham
2dc367549a Merge "Export TARGET_ENABLE_MEDIADRM_64 to Soong." 2020-07-24 15:34:49 +00:00
Steve Muckle
5cbd88ab6c add android-mainline kernels to aosp_arm64 build
To enable testing with android-mainline kernels, and them to the
aosp_arm64 build so android-mainline-based GKI boot images are produced.

Bug: 162020942
Change-Id: Ib1f957608a720a763a14324e4ca25ee170154fbb
Merged-In: Ib1f957608a720a763a14324e4ca25ee170154fbb
2020-07-24 08:09:15 -07:00
Dan Willemsen
6235a19058 Merge "Revert "Move some prebuilt build tool configs to Soong"" am: 0132fb7fae
Original change: https://android-review.googlesource.com/c/platform/build/+/1372260

Change-Id: I1d9fbefae2ae4185e68c32c9070e7596443adfc6
2020-07-23 21:51:24 +00:00
Dan Willemsen
0132fb7fae Merge "Revert "Move some prebuilt build tool configs to Soong"" 2020-07-23 21:43:04 +00:00
Dan Willemsen
51c49e590d Revert "Move some prebuilt build tool configs to Soong"
This reverts commit 3e1c9115d1.

Reason for revert: broke builds where makefiles were using M4 without depending upon it

Change-Id: Ib2deef08255656b91cb8ec42f1cb7e9555364f23
2020-07-23 21:38:00 +00:00
Dan Willemsen
9b6377949b Merge "Move some prebuilt build tool configs to Soong" am: 925d63690c
Original change: https://android-review.googlesource.com/c/platform/build/+/1366356

Change-Id: Ib296dd4dbd92085977e357a22365543b9a2e3bed
2020-07-23 21:25:10 +00:00
Dan Willemsen
925d63690c Merge "Move some prebuilt build tool configs to Soong" 2020-07-23 21:10:04 +00:00
Bill Peckham
48ae71a6f0 Export TARGET_ENABLE_MEDIADRM_64 to Soong.
The change enables conversion of
hardware/interfaces/drm/1.0/default from make to Soong
by exporting a variable used in a conditional check by
the modules in that directory.

Bug: 161571531
Bug: 123557988
Test: Build with TARGET_ENABLE_MEDIADRM_64 :=
Test: Build with TARGET_ENABLE_MEDIADRM_64 := true
Test: Insepction of out/soong/soong.variables for each
Test: Inspection of target files package for each
Test: Verify inclusion of modules in vendor snapshot
Change-Id: I5737d9d4687e182595a213be000b2e56c7536b8a
2020-07-23 20:57:22 +00:00
satayev
b871cb533d Merge "Revert "Add a check for apex/allowed_deps.txt to droidcore."" am: b7f74b89db
Original change: https://android-review.googlesource.com/c/platform/build/+/1371942

Change-Id: I8b07109c76963b2d06fc62a8085990544e9ebe5a
2020-07-23 15:42:29 +00:00
satayev
b7f74b89db Merge "Revert "Add a check for apex/allowed_deps.txt to droidcore."" 2020-07-23 15:20:18 +00:00
satayev
c42d9bfc27 Revert "Add a check for apex/allowed_deps.txt to droidcore."
Revert "Track allowed transitive deps in any updatable module."

Revert submission 1312796-apex-allowed-deps

Reason for revert: b/161974327
Reverted Changes:
I52a4be72e:Add a check for apex/allowed_deps.txt to droidcore...
I56771ba3f:Track allowed transitive deps in any updatable mod...

Change-Id: I20ad7bf2001e76b5e3ca4aaf3baa5318e270f3dc
2020-07-23 15:15:54 +00:00
Kelvin Zhang
c693d95f86 Fix some wording to comply with respectful-code
https: //source.android.com/setup/contribute/respectful-code
Test: Run unit tests
Bug: 161896447
Change-Id: I9a3676b6f7bb6be43756fdf18b1d8b9ec41fb4cf
2020-07-23 10:04:12 -04:00
satayev
696c85820b Merge "Add a check for apex/allowed_deps.txt to droidcore." am: 38b739a640
Original change: https://android-review.googlesource.com/c/platform/build/+/1319763

Change-Id: Iabf23022b46f2e09339fba2b3435ff85b93c5d26
2020-07-23 12:55:48 +00:00
satayev
38b739a640 Merge "Add a check for apex/allowed_deps.txt to droidcore." 2020-07-23 12:41:11 +00:00
Artur Satayev
12e2d0f7a2 Add a check for apex/allowed_deps.txt to droidcore.
The check ensures that build graph for updatable modules contains only
allowed dependencies at build time.

Bug: 149622332
Test: m
Change-Id: I52a4be72efaa523d53827dd11822a7802543dd10
Merged-In: I5695dd1003386191dbbe0ea511ef5b615d0d5e4e
Exempt-From-Owner-Approval: cp
2020-07-23 12:40:49 +00:00
Bob Badour
02d3b73221 Merge "Add support for combining the notices from 2 roots." am: 2f3b200397
Original change: https://android-review.googlesource.com/c/platform/build/+/1366416

Change-Id: I06d16b209d7ebe563657987a77bbcc288fff9e07
2020-07-21 17:12:00 +00:00
Bob Badour
2f3b200397 Merge "Add support for combining the notices from 2 roots." 2020-07-21 16:56:12 +00:00
Yo Chiang
4239ebfed1 Merge "Auto-generate dexpreopt boot image module" am: 8bb1285f65
Original change: https://android-review.googlesource.com/c/platform/build/+/1353440

Change-Id: Ic72d56b7370ff156924a9aa9cc4081c17f5f055f
2020-07-21 03:58:36 +00:00
Yo Chiang
8bb1285f65 Merge "Auto-generate dexpreopt boot image module" 2020-07-21 03:37:23 +00:00
Jaegeuk Kim
8ba4bab89f support make_f2fs with casefolding
Bug: 159672232
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I4ac22a989010c747502d97e76faabf6cfdd9bf04
2020-07-20 17:52:41 -07:00
Devin Moore
79fe86f42e Merge "Add android.hardware.common and android.hardware.graphics.common" am: e5f33227a8
Original change: https://android-review.googlesource.com/c/platform/build/+/1363438

Change-Id: I7a8e6a83baa348c8568ea1ddf2782fc4c662ea86
2020-07-20 23:32:14 +00:00
Devin Moore
e5f33227a8 Merge "Add android.hardware.common and android.hardware.graphics.common" 2020-07-20 23:25:26 +00:00
Jing Ji
ac0a178166 Merge "Remove LMK properties from GSI image" am: 228e6b2494
Original change: https://android-review.googlesource.com/c/platform/build/+/1366417

Change-Id: Ic368e35e42df3f15035636378dc005c0fc458585
2020-07-20 22:17:35 +00:00
Jing Ji
228e6b2494 Merge "Remove LMK properties from GSI image" 2020-07-20 21:57:46 +00:00
Jing Ji
cc5d2cca25 Remove LMK properties from GSI image
These two properties shouldn't be set in GSI image from R on,
otherwise they'll force lmkd to use the legacy strategy.

Bug: 136212765
Test: run cts-on-gsi -m CtsFileSystemTestCases
Test: run cts-on-gsi -m CtsAppExitTestCases
Change-Id: Id0001f8c4187a280cffe6c72d7a39be29065ca4e
2020-07-20 18:52:40 +00:00
Colin Cross
1e921c7389 Merge "Provide a robolectric isolated test template" am: a903a5ec19
Original change: https://android-review.googlesource.com/c/platform/build/+/1235429

Change-Id: Idc496055687dbe883064c6c0092e45832dbb7386
2020-07-20 18:45:56 +00:00
Colin Cross
a903a5ec19 Merge "Provide a robolectric isolated test template" 2020-07-20 18:27:17 +00:00
Bob Badour
5e9e1fbe83 Add support for combining the notices from 2 roots.
Apparently needed for cts tests due to apks putting intermediate files under
TARGET_OUT even when going to HOST_OUT.

Test: m with and without change verified no differences in notice files

Change-Id: Iea50b6bd9af9452a2600c97e2f7cb89218b9be7f
2020-07-20 17:32:14 +00:00
Christopher Parsons
f8a316ad96 Merge "Add optional relative path to LOCAL_TEST_DATA processing" am: 86eabf86e2
Original change: https://android-review.googlesource.com/c/platform/build/+/1365263

Change-Id: I15a65e48ef476e4c8e98f25a6ad91b2391fc657f
2020-07-20 16:02:08 +00:00
Christopher Parsons
86eabf86e2 Merge "Add optional relative path to LOCAL_TEST_DATA processing" 2020-07-20 15:46:38 +00:00
Kiyoung Kim
7ae3ce79aa Deprecate VNDK-Lite
Android S would not support upgrade from O-MR1 devices, so VNDK Lite
configuration is no more valid. This change removes all VNDK-Lite
related steps and makr BOARD_VNDK_RUNTIME_DISABLE as deprecated
variable.

Bug: 158719241
Test: m -j passed
Change-Id: Ifb355da936933843862426e7ddfce9c7f69cea61
Merged-In: Ifb355da936933843862426e7ddfce9c7f69cea61
2020-07-20 05:39:29 +00:00
Dan Willemsen
3e1c9115d1 Move some prebuilt build tool configs to Soong
Now that they're defined with prebuilt_build_tool, we don't need to set
them here.

In future changes we can replace more of these definitions with
prebuilt_build_tool, as it can centralize the selection of
build-from-source or prebuilt for Make, Soong, and user-defined
genrules.

Test: treehugger
Change-Id: I4bb526492ebc6270b6030913c1f5b3f49dc61284
2020-07-17 20:01:04 -07:00
Yifan Hong
a3145919f0 Merge changes from topic "odm_dlkm" am: 997d227648
Original change: https://android-review.googlesource.com/c/platform/build/+/1363863

Change-Id: I62b4a01ce8f1884bac7dab9d2381ae5a42d3a3d8
2020-07-17 22:27:25 +00:00
Yifan Hong
05bcc74c3f Add odm_dlkm/etc/build.prop am: 81a092ff88
Original change: https://android-review.googlesource.com/c/platform/build/+/1363862

Change-Id: I61d24340aa6549105b771f710634dc80e3e4d3ca
2020-07-17 22:27:24 +00:00
Yifan Hong
1ce4a837be Install ODM dlkm to appropriate place and symlink am: 3d5e2c210a
Original change: https://android-review.googlesource.com/c/platform/build/+/1363861

Change-Id: Ibfad2e508fba2dbfa4bf6da0bd3e7392178cf59d
2020-07-17 22:27:21 +00:00
Yifan Hong
2c3f849f65 Add notice files for odm_dlkm am: c83f9e922b
Original change: https://android-review.googlesource.com/c/platform/build/+/1363860

Change-Id: I2e28658d235829c55e80edc93c3a4ec8ca0b9434
2020-07-17 22:27:18 +00:00
Yifan Hong
4f2ea25d5f Add odm_dlkm partition. am: f496f1b94f
Original change: https://android-review.googlesource.com/c/platform/build/+/1363859

Change-Id: I8c7af808f72de5611cb52f34c0138bc97ceb6254
2020-07-17 22:27:15 +00:00
Yifan Hong
997d227648 Merge changes from topic "odm_dlkm"
* changes:
  Create $OUT/{vendor,odm}/lib before symlink modules
  Add odm_dlkm/etc/build.prop
  Install ODM dlkm to appropriate place and symlink
  Add notice files for odm_dlkm
  Add odm_dlkm partition.
2020-07-17 22:05:26 +00:00
Chris Parsons
1abe7ef455 Add optional relative path to LOCAL_TEST_DATA processing
Test: Verified in conjunction with changes to soong (aosp/1359742)
Test: Treehugger to verify backwards compatibility
Change-Id: I39d2669ff74b4387606b6416e8afefc1f6507348
2020-07-17 17:09:21 -04:00
Treehugger Robot
f80a0ad1a9 Merge "Adding vbmeta_system.img and vbmeta_vendor.img to droidcore" am: 9aa278a124
Original change: https://android-review.googlesource.com/c/platform/build/+/1364522

Change-Id: I493ef6e9dc3d7406257ef62b0a04ccb00944c551
2020-07-17 10:23:38 +00:00