Commit Graph

62860 Commits

Author SHA1 Message Date
android-build-team Robot
8df5e45b5e Version bump to RP1A.200720.007 [core/build_id.mk]
Change-Id: If0ad6d279e844a3cc11eb1e292437338ca2f8e16
2020-07-29 04:07:09 +00:00
Liz Kammer
9dd20038b2 Update language to comply with inclusive guidance
Update android_app_set make files to use INSTALL rather than MASTER for
android_app_sets, this better matches the wording used for apex_set.

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Test: m nothing
Change-Id: I7f37a72914f4b18a839942cc3db98b1c57db921e
2020-07-28 15:59:38 -07:00
Ivan Lozano
b021b2aeb3 Update language to comply with Android’s inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

 #inclusivefixit

Bug: 161896447
Test: N/A
Change-Id: I9fd970726d739da658f6419a1ccd3e4952b17c78
2020-07-28 15:43:15 -04:00
Joseph Murphy
6801ea4ce7 Merge "Fixes a few things with the robolectric autoconfig" am: fed798fabd
Original change: https://android-review.googlesource.com/c/platform/build/+/1367718

Change-Id: I017ff2772168de194b705d9f1b6cd770dc708f99
2020-07-28 19:05:17 +00:00
Joseph Murphy
fed798fabd Merge "Fixes a few things with the robolectric autoconfig" 2020-07-28 18:47:13 +00:00
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
android-build-team Robot
f949014226 Version bump to RP1A.200720.006 [core/build_id.mk]
Change-Id: I871c0e47f39b95b3d9cf3b04f6b65c5791b865ce
2020-07-26 20:57:30 +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
android-build-team Robot
e0ad3b127b Make change and version bump to RP1A.200720.005
Change-Id: I6c85f1dedf51353ccf375d899e93acb445b81eba
2020-07-23 23:04:53 +00:00
wangzhou
f75077b5fd Combine HOST/TARGET in Test Suite NOTICE.
This improved NOTICE bundling now includes TARGET_OUT deps that Android
Test Suites packages need, especially those for .apk files.

Bug: b/141258651
Test: $ make cts && \
        unzip -p out/host/linux-x86/cts/android-cts.zip \
        android-cts/NOTICE.txt \
        | less -N
Change-Id: I4c84d194ff5982fc57b6a8097602d4a9df68d61c
(cherry picked from commit e73186d2ac)
2020-07-23 23:03:36 +00:00
Bob Badour
53755cfbc9 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
Bug: 141258651

Change-Id: Iea50b6bd9af9452a2600c97e2f7cb89218b9be7f
(cherry picked from commit 5e9e1fbe83)
Merged-In: Iea50b6bd9af9452a2600c97e2f7cb89218b9be7f
(cherry picked from commit 74a6a0a32a)
2020-07-23 23:03:30 +00:00
wangzhou
931962dbbd Build NOTICE txt file into TestSuite zip package.
- the NOTICE file is only taken from out/host.
- currently only enabled from cts by setting flag "test_suite_notice"

Test: $ make cts && unzip -l \
        out/host/linux-x86/cts/android-cts.zip \
        | grep NOTICE
      $ make pts && \ unzip -l \
        out/host/linux-x86/cts/android-cts.zip \
        | grep NOTICE
Bug: b/141258651
Change-Id: I696b424e5f2b09d28d53ccbd9198e1f4f301ec01
(cherry picked from commit 93d2fbbcad)
2020-07-23 23:03:24 +00: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
android-build-team Robot
fd90e527aa Version bump to RP1A.200720.004 [core/build_id.mk]
Change-Id: I974cce7fbc867668d619361cbe2c046773fd6f36
2020-07-22 22:13:05 +00:00
android-build-team Robot
d156fc0f96 Make change and version bump to RP1A.200720.003
Change-Id: Icc2e1a91d6d4d5cd637c509a4e3784344f000962
2020-07-22 00:22:25 +00:00
Jing Ji
934a8cb879 Remove a couple of 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
Merged-In: Id0001f8c4187a280cffe6c72d7a39be29065ca4e
(cherry picked from commit 5f97d6d24f)
2020-07-22 00:21:31 +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
android-build-team Robot
259b9f1c0d Version bump to RP1A.200720.002 [core/build_id.mk]
Change-Id: Id092a987d968d4d0b2ed53820d791c2e9b27c6f6
2020-07-20 23:03:34 +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