Commit Graph

25241 Commits

Author SHA1 Message Date
Yo Chiang
64faf88940 Require required modules to exist
Error if a required module doesn't exist unless
ALLOW_MISSING_DEPENDENCIES or BUILD_BROKEN_MISSING_REQUIRED_MODULES
is true.

Bug: 7456955
Test: TH build_test
Change-Id: I5cdc56c7433b7ce15da155993b7100af9af604fa
Merged-In: I5cdc56c7433b7ce15da155993b7100af9af604fa
(cherry picked from commit c6159372b7)
2020-08-06 06:41:09 +00:00
Yifan Hong
bdf548bdc0 Merge "Add BOARD_KERNEL_BINARIES to board_config.mk" 2020-08-06 01:44:40 +00:00
Treehugger Robot
66b322cf6c Merge "Separate lists of soong sanitize modules" 2020-08-06 00:48:16 +00:00
Yifan Hong
3c1041fb22 Add BOARD_KERNEL_MODULE_INTERFACE_VERSIONS.
This is a list of KMI versions used to filter gki_apex modules. Only
gki_apex modules with kmi_version field that are in the list are created.

Test: build GKI APEXes
Bug: 162888350
Change-Id: I0f582f6ea200d52482fd4065c8f4f8b32efc4dee
2020-08-05 15:45:23 -07:00
Yifan Hong
6040cad5c1 Add BOARD_KERNEL_BINARIES to board_config.mk
Test: pass
Change-Id: Ic670a1c60d6ab2beca593da5941f56d4f3b76c3c
2020-08-05 15:45:23 -07:00
Xin Li
6ad6d563c0 Merge "Merge QQ3A.200805.001" 2020-08-05 21:05:34 +00:00
Xin Li
622e8fb529 Merge QQ3A.200805.001
Bug: 162879794
Merged-In: I5f0b271fb5302e8c72024b49fb1a2ae5120821e0
Change-Id: I47416909bc0c43e8c2fbf14087153802a1aa3b29
2020-08-05 17:38:39 +00:00
Tianjie Xu
23678b2df2 Merge "Add ro.product.ab_ota_partitions as a build prop" am: 3443517fcb am: 6609c710ce
Original change: https://android-review.googlesource.com/c/platform/build/+/1373759

Change-Id: Ib9aa38b823237acbd16f99a61d803dfb894da4d2
2020-08-04 22:11:17 +00:00
Tianjie Xu
3443517fcb Merge "Add ro.product.ab_ota_partitions as a build prop" 2020-08-04 21:36:08 +00:00
Inseob Kim
8b0ccdafbb Separate lists of soong sanitize modules
Dependencies of makefile modules are being redirected according to
SOONG_CFI_STATIC_LIBRARIES and SOONG_HWASAN_STATIC_LIBRARIES. But the
variables are shared among all variants (e.g. core, vendor, product,
arch), which can cause build error.

This splits the Makefile variables into several lists, one list per each
arch and each image variant, to correctly make the redirection.

Bug: 162476652
Test: build and inspect ninja
Change-Id: I8a46804d4b7c1c485e59e10710cc514a89333fa4
2020-08-04 17:18:01 +09:00
Jaegeuk Kim
51577bdd2e Merge "support make_f2fs with casefolding" am: d9d2dff22d am: a42baf3b9d
Original change: https://android-review.googlesource.com/c/platform/build/+/1367723

Change-Id: I6fe69a8868123e106e796e3609d4465a22e6fe0f
2020-08-04 05:10:19 +00:00
Jaegeuk Kim
d9d2dff22d Merge "support make_f2fs with casefolding" 2020-08-04 04:18:07 +00:00
Jeongik Cha
f26015449f Unset ENABLE_PREOPT when DISABLE_PREOPT is set
Instead of TARGET_BUILD_APPS, introduce DISABLE_PREOPT,
which is true when TARGET_BUILD_UNBUNDLED_IMAGE or TARGET_BUILD_APPS is set.

Test: TARGET_BUILD_UNBUNDLED_IMAGE=true m vendorimage and then
      check if there is no preopt
Bug: 160390776

Change-Id: Id27030e602a29ebd438678270db13744dd145143
2020-08-04 10:39:57 +09:00
Jeongik Cha
d05b57a362 Introduce TARGET_BUILD_UNBUNDLED_IMAGE
- TARGET_BUILD_UNBUNDLED_IMAGE is similar to TARGET_BUILD_APPS, but
its targets are the unbundled partitions instead of apps.
- Rename TARGET_BUILD_APPS_USE_PREBUILT_SDK to TARGET_BUILD_USE_PREBUILT_SDKS
because it is used even without TARGET_BUILD_APPS.
-Instead of TARGET_BUILD_APPS, use TARGET_BUILD_USE_PREBUILT_SDKS
to build java modules with prebuilt sdks, and propagate to Soong.

Bug: 160390776
Test: TARGET_BUILD_UNBUNDLED_IMAGE=true m vendorimage
Change-Id: Ie096212ccbcca0018baae55e106af693b002c9e5
2020-08-03 15:47:09 +09:00
Treehugger Robot
a15525a01f Merge "Update language to comply with inclusive guidance" am: bf0c1b7b77 am: d844b36ccd
Original change: https://android-review.googlesource.com/c/platform/build/+/1375361

Change-Id: I4d168401b661393aeb2101a2fb733547f2336d05
2020-07-31 23:35:03 +00:00
Treehugger Robot
bf0c1b7b77 Merge "Update language to comply with inclusive guidance" 2020-07-31 22:50:49 +00:00
Tianjie
9f581237e3 Add ro.product.ab_ota_partitions as a build prop
The prop list the name of the a/b partitions that are supposed to
update via an OTA. The list varies by product, and update engine
needs to know these partitions to install the GKI update correctly.

Test: build and check the property
Change-Id: I5258955a5c3303bdc61b97fc92f5dfa1905f7c37
2020-07-31 13:21:45 -07:00
Yifan Hong
486b560ed0 Merge "Add BOARD_KERNEL_BINARIES." am: 1ba1092e0a am: d1d00b0eca
Original change: https://android-review.googlesource.com/c/platform/build/+/1377903

Change-Id: I7cd1a66a055fe5495c5f4fd43e2cba1bb3c596e9
2020-07-31 19:45:42 +00:00
Yifan Hong
1ba1092e0a Merge "Add BOARD_KERNEL_BINARIES." 2020-07-31 19:13:38 +00:00
Treehugger Robot
bae426a0f5 Merge "Update language to meet Android's inclusive language guidance" am: c21f30ca8a am: 7b10fc6719
Original change: https://android-review.googlesource.com/c/platform/build/+/1379681

Change-Id: I0a435a5f62aac0434ef7a65e0a50ecd1bca36caf
2020-07-31 15:24:41 +00:00
Treehugger Robot
c21f30ca8a Merge "Update language to meet Android's inclusive language guidance" 2020-07-31 14:49:05 +00:00
Treehugger Robot
43455d8f45 Merge "[config_sanitizers] Support LOCAL_SANITIZE_BLOCKLIST" am: 96abdc1b3a am: 9e3142d32e
Original change: https://android-review.googlesource.com/c/platform/build/+/1380903

Change-Id: I7b5c916c650199a22ef612d8f380caba2497d3f1
2020-07-31 00:51:32 +00:00
Treehugger Robot
96abdc1b3a Merge "[config_sanitizers] Support LOCAL_SANITIZE_BLOCKLIST" 2020-07-31 00:22:15 +00:00
Kevin Lau Fang
2d85583c77 Merge "Update binary.mk language to comply with Android's inclusive language guidance" am: 664359e05a am: 83cd57881d
Original change: https://android-review.googlesource.com/c/platform/build/+/1378375

Change-Id: Iae6366ca216e8004eec36b3c50abab22a4678f41
2020-07-30 23:34:26 +00:00
Pirama Arumuga Nainar
565583382d [config_sanitizers] Support LOCAL_SANITIZE_BLOCKLIST
It'll replace LOCAL_SANITIZE_BLACKLIST.

Update language to comply with Android’s inclusive language guidance

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

Bug: 161896447
Bug: 162245450

Test: n/a  (no users in AOSP for this property).
Change-Id: Ie31c35af722d05011a528e1170b0c026b50fbf88
2020-07-30 15:31:22 -07:00
Joel Galenson
154ac1d870 Update language to meet Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference.

Bug: 161896447
Test: Build
Change-Id: I8d33207c84f424e89f367b1c917661347402ae77
2020-07-30 15:05:55 -07:00
android-build-team Robot
8f5fa67881 Version bump to RP1A.200720.010 [core/build_id.mk]
Change-Id: I4c1d4ce3ef22522e4a0f7c1f76b5f0c2067a80d3
2020-07-30 17:47:39 +00:00
android-build-team Robot
9d2242d67e Version bump to RP1A.200720.009 [core/build_id.mk]
Change-Id: I0c564f400617924dc8b24ee00768f40f0e1fe6c6
2020-07-29 22:47:58 +00:00
Kevin Lau Fang
c45b82c23b Update binary.mk language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 162241205
2020-07-29 22:16:49 +00:00
Yifan Hong
e4aca26aef Add BOARD_KERNEL_BINARIES.
Test: use it
Bug: 161563386
Change-Id: Id07dffe7d8ef5122c7cf337b29fecba128fc7640
2020-07-29 14:51:00 -07:00
android-build-team Robot
f11d850948 Version bump to RP1A.200720.008 [core/build_id.mk]
Change-Id: I1216916b090769604a603d9bc8ffc7b909eb235a
2020-07-29 16:01:37 +00:00
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
Joseph Murphy
47ee0bf450 Merge "Fixes a few things with the robolectric autoconfig" am: fed798fabd am: 6801ea4ce7
Original change: https://android-review.googlesource.com/c/platform/build/+/1367718

Change-Id: I671e22139c4a02ae489cb68534940a18493181b6
2020-07-28 19:33:35 +00: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
f14f7aebe9 Merge "Deprecate VNDK-Lite" am: c8343a3f0e am: 775559ad79
Original change: https://android-review.googlesource.com/c/platform/build/+/1351286

Change-Id: I0c137d33fd43aeaa845cb8f64708670bf48b173c
2020-07-28 00:59:00 +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
Bill Peckham
8abcd5ddc3 Merge "Export TARGET_ENABLE_MEDIADRM_64 to Soong." am: 2dc367549a am: 6820c719d4
Original change: https://android-review.googlesource.com/c/platform/build/+/1371618

Change-Id: Ib91e0c7f4bbfb3fc981ffef61ce1118661afb2b7
2020-07-24 16:04:14 +00: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
41e1e5cfae Merge "Revert "Move some prebuilt build tool configs to Soong"" am: 0132fb7fae am: 6235a19058
Original change: https://android-review.googlesource.com/c/platform/build/+/1372260

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

Change-Id: Iddcf690bda8f47c5609e053a38529c2fcc4ca28d
2020-07-23 22:39:34 +00:00
satayev
72aed8b6bb Merge "Revert "Add a check for apex/allowed_deps.txt to droidcore."" am: b7f74b89db am: b871cb533d
Original change: https://android-review.googlesource.com/c/platform/build/+/1371942

Change-Id: If17bad127bdbf523a9379eb7d5834589a5deb14f
2020-07-23 22:39:13 +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
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