Commit graph

59487 commits

Author SHA1 Message Date
Inseob Kim
ce83956fa9 Fix broken my_image_variant
It should happen after adjusting vendor and product variables.

Bug: 162476652
Test: see image variant with LOCAL_PROPRIETARY_MODULE := true
Change-Id: I071434916c9ad18572c559a26e3ef6abb8c47303
2020-08-10 13:04:23 +09:00
Steve Muckle
04b6f05f31 add support to non-A/B for multiple kernels, boot images
Bug: 162777091
Change-Id: I03bb00b0a02a3dc048b7a83eff08f790d2f4d17e
2020-08-09 18:42:40 -07:00
Steve Muckle
a49b0c8613 add BOARD_GKI_NONAB_COMPAT for non-A/B compatability with GKI
The directory structure of several ramdisks are different depending on
whether the target is A/B or non-A/B. When the target needs to be
compatible with the GKI however, which is always built as A/B, it is
necessary to build these ramdisks using the A/B file hierarchy. Provide
a flag to enable this override when necessary.

Bug: 161579556
Change-Id: I1cf9a0ef5a338b0b5152113533b62804f3088c83
2020-08-09 18:11:56 -07:00
Jeongik Cha
37cd475e59 Merge changes from topic "b/160390776" am: 66853bb381
Original change: https://android-review.googlesource.com/c/platform/build/+/1358106

Change-Id: Iefe2a233927e9a1a4886abdca82086ac5da34d75
2020-08-10 01:08:34 +00:00
Jeongik Cha
66853bb381 Merge changes from topic "b/160390776"
* changes:
  Unset ENABLE_PREOPT when DISABLE_PREOPT is set
  Introduce TARGET_BUILD_UNBUNDLED_IMAGE
2020-08-10 00:51:56 +00:00
Steve Muckle
a21b44a736 fix recoveryimage-nodeps
Change-Id: I1c1b7d25cd7e6254c9edf12dd1bf5c9f7b56e26d
2020-08-09 15:30:25 -07:00
Yongqin Liu
2c8b8eca5e extract_kernel.py: add support to output compiler information
Test: tested with android-mainline gki kernel from
    https://android.googlesource.com/kernel/prebuilts/mainline/arm64/

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: Ibf3eeb3679b233cd0d54501d385f442e0c0c34ec
2020-08-08 17:15:19 +08:00
Colin Cross
d99f49d009 Merge changes I4c84d194,I696b424e am: c4e9bf20ce
Original change: https://android-review.googlesource.com/c/platform/build/+/1392950

Change-Id: I19a8cadc0cc4382bc5a71fc99e43cf16b4c57233
2020-08-08 03:42:54 +00:00
wangzhou
0fba6bee06 Build NOTICE txt file into TestSuite zip package. am: e7f1725938
Original change: https://android-review.googlesource.com/c/platform/build/+/1392949

Change-Id: If475cb2e17b237a85131d010e4d7bdee7b2bce9f
2020-08-08 03:42:53 +00:00
Colin Cross
c4e9bf20ce Merge changes I4c84d194,I696b424e
* changes:
  Combine HOST/TARGET in Test Suite NOTICE.
  Build NOTICE txt file into TestSuite zip package.
2020-08-08 03:29:01 +00:00
Evgenii Stepanov
96af2a7adc Merge "Define ro.sanitize.<name> properties in SANITIZE_TARGET builds." am: 48e914e991
Original change: https://android-review.googlesource.com/c/platform/build/+/1367662

Change-Id: Ia4561715fbe5a8e6289e107ba33063029d9dc164
2020-08-07 22:58:55 +00:00
Evgenii Stepanov
48e914e991 Merge "Define ro.sanitize.<name> properties in SANITIZE_TARGET builds." 2020-08-07 22:44:18 +00:00
Dan Willemsen
fd72f7f3ac Reland "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: I5821bbad1b655d561919245320d7c184a6eac737
2020-08-07 13:40:10 -07:00
Treehugger Robot
3f4f3ce038 Merge "Add BOARD_KERNEL_MODULE_INTERFACE_VERSIONS." am: 7c556f30be
Original change: https://android-review.googlesource.com/c/platform/build/+/1392540

Change-Id: I69f550073e4bc1d294970e45e77ef6bf05d06bda
2020-08-07 18:41:51 +00:00
Treehugger Robot
7c556f30be Merge "Add BOARD_KERNEL_MODULE_INTERFACE_VERSIONS." 2020-08-07 18:37:36 +00:00
Evgenii Stepanov
830eddbe27 Define ro.sanitize.<name> properties in SANITIZE_TARGET builds.
This will let us quickly check the system image build type,
and modify *.rc behavior based on that.

Bug: 142430632
Test: adb shell getprop ro.sanitize.hwaddress in hwasan build
Change-Id: Id1738ebc94a7c29ea9902a063f5d8dd6deb48f1b
2020-08-06 23:29:53 +00:00
Treehugger Robot
d90ae6979a Merge "Add more details to divergent vndk lib error." am: e9bceb662b
Original change: https://android-review.googlesource.com/c/platform/build/+/1392870

Change-Id: I9d95b7307d990b960fd0a3299be031fea8d45f13
2020-08-06 21:34:09 +00:00
Treehugger Robot
9fa3b271f2 Merge "Remove vbmeta_system from GSI targets" am: 3041178a7d
Original change: https://android-review.googlesource.com/c/platform/build/+/1366537

Change-Id: Ie87221a6fed1025444ccb6331ee17fabc563ca1a
2020-08-06 21:33:54 +00:00
Treehugger Robot
e9bceb662b Merge "Add more details to divergent vndk lib error." 2020-08-06 21:27:09 +00:00
Treehugger Robot
3041178a7d Merge "Remove vbmeta_system from GSI targets" 2020-08-06 21:12:15 +00:00
Treehugger Robot
708da6d89b Merge "Don't use the remote pool when using clang-tidy" am: 5610430667
Original change: https://android-review.googlesource.com/c/platform/build/+/1392545

Change-Id: I9f940d1c519903c639b2f082f10aa6e986d7893d
2020-08-06 19:44:56 +00:00
Treehugger Robot
5610430667 Merge "Don't use the remote pool when using clang-tidy" 2020-08-06 19:27:17 +00:00
Treehugger Robot
1e220966a7 Merge "Deprecate VNDK-lite support from Legacy GSI" am: c45c04e38e
Original change: https://android-review.googlesource.com/c/platform/build/+/1382483

Change-Id: I72c5bb499a30a6101c1876c7f8606ec21998182b
2020-08-06 19:13:27 +00:00
wangzhou
23acb0b896 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
Merged-In: I4c84d194ff5982fc57b6a8097602d4a9df68d61c
(cherry picked from commit e73186d2ac)
2020-08-06 12:07:40 -07:00
wangzhou
e7f1725938 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
Merged-In: I696b424e5f2b09d28d53ccbd9198e1f4f301ec01
(cherry picked from commit 93d2fbbcad)
2020-08-06 12:07:40 -07:00
Treehugger Robot
c45c04e38e Merge "Deprecate VNDK-lite support from Legacy GSI" 2020-08-06 18:53:55 +00:00
Dan Willemsen
ceba3cb656 Don't use the remote pool when using clang-tidy
In Make, clang-tidy and clang run in the same action, but only clang can
be remoted via RBE/GOMA. So to prevent running up to 500 clang-tidy
instances at the same time and overloading the machine, use the local
pool when using clang-tidy. This does limit the parallelism of the clang
actions attached to clang-tidy, but hopefully that's not that much of a
problem. Clang-tidy isn't enabled by default (opt-in per-build /
per-module), and Soong does not run into this problem.

Bug: 162615762
Test: m WITH_TIDY=1 nothing; build-aosp_flame.ninja is identical before/after
Test: use_rbe m WITH_TIDY=1; inspect build-aosp_flame.ninja, see local_pool
Change-Id: I7dd196fcf4183d175b9608d3d48cdcdf81b514ce
Merged-In: I7dd196fcf4183d175b9608d3d48cdcdf81b514ce
2020-08-06 18:44:25 +00:00
Steven Moreland
9d27901e4a Add more details to divergent vndk lib error.
Bash better broadcast better build-backstop baggage because baffled
beings' bewilderement begets badness.

Fixes: 162379658
Test: view error by removing "libbinder" from
  VndkMustUseVendorVariantList.
Change-Id: Ib425e30bc7b5388b78af4bfab84dd24072d550a6
2020-08-06 18:02:31 +00:00
Insaf Latypov
36d1a0f3e6 Merge "Revert "releasetools: Disable host module on darwin"" am: b5490e4a9d
Original change: https://android-review.googlesource.com/c/platform/build/+/1393100

Change-Id: I98d5a709caf9bb8921b7b9806b7d656dbbd00f4b
2020-08-06 16:21:22 +00:00
Insaf Latypov
b5490e4a9d Merge "Revert "releasetools: Disable host module on darwin"" 2020-08-06 16:02:52 +00:00
Insaf Latypov
0ac3666667 Revert "releasetools: Disable host module on darwin"
Revert "conscrypt: Disable host module on darwin"

Revert submission 1385032-mac-required-fix

Reason for revert: breaks the build on aosp-master
Reverted Changes:
I13335299c:releasetools: Disable host module on darwin
I728a4677a:conscrypt: Disable host module on darwin
I8f3435ff1🎨 Remove dependencies on platform unavailable m...
Ibb9248ef4🎨 Disable host module on darwin
I7db68a629:libcore: Disable host module on darwin

Bug: 163030797
Change-Id: I3b3991b91652c426d8f22d60c59c44d640059619
2020-08-06 15:48:12 +00:00
Jeongik Cha
1caa24f82a Document unbundle build behavior
Test: nothing
Bug: 160390776
Change-Id: I7da365a364d9dfa81a42b04615af34dd61444577
2020-08-06 18:25:51 +09:00
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
SzuWei Lin
a42efe57a3 Deprecate VNDK-lite support from Legacy GSI
The VNDK-lite is deprecated from S. Which is used to support the
devices without enabling VNDK.

The patch removes VNDK-lite from Legacy GSI. Also, reboot the
device without enabling VNDK in both non-Legacy and Legacy GSI.

Bug: 158719241
Test: boot aosp_arm64-userdebug on a Pixel 3 device
Test: boot aosp_arm64_ab-userdebug on a Pixel 2 device
Change-Id: I70a944bb5a2a0347ab753d29eca3d1bfcae54526
2020-08-06 14:04:06 +08:00
Yo Chiang
bd2ce57bc2 Merge "releasetools: Disable host module on darwin" am: 79d10eddbf
Original change: https://android-review.googlesource.com/c/platform/build/+/1384537

Change-Id: Icc2e7a734da382169ef6e085f5a15bf7cfe47dce
2020-08-06 04:21:58 +00:00
Yo Chiang
79d10eddbf Merge "releasetools: Disable host module on darwin" 2020-08-06 04:02:52 +00:00
Yifan Hong
50416b788c Merge "Add BOARD_KERNEL_BINARIES to board_config.mk" am: bdf548bdc0
Original change: https://android-review.googlesource.com/c/platform/build/+/1392539

Change-Id: Ie4717ec6f82011b3e5c4fcbcaef61e77df12c16c
2020-08-06 01:57:53 +00:00
Yifan Hong
bdf548bdc0 Merge "Add BOARD_KERNEL_BINARIES to board_config.mk" 2020-08-06 01:44:40 +00:00
Treehugger Robot
c60a3fcf5d Merge "Separate lists of soong sanitize modules" am: 66b322cf6c
Original change: https://android-review.googlesource.com/c/platform/build/+/1385289

Change-Id: Id4c8a525883346ac0394c9e26fb53ce708513867
2020-08-06 01:08:06 +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
2d4a1e472b Merge "Merge QQ3A.200805.001" am: 6ad6d563c0
Original change: https://android-review.googlesource.com/c/platform/build/+/1388670

Change-Id: Ibea811c111c4857f1d3ea1bc3ae00f53eb673a43
2020-08-05 21:19:12 +00: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
Treehugger Robot
94cbd2d807 Merge "Delete unused subdirectory." am: 090c0c9c6e
Original change: https://android-review.googlesource.com/c/platform/build/+/1373479

Change-Id: I00c5e3c936c5925042701ae6990672b485341730
2020-08-05 05:04:45 +00:00
Treehugger Robot
090c0c9c6e Merge "Delete unused subdirectory." 2020-08-05 04:50:59 +00:00
Tianjie Xu
6609c710ce Merge "Add ro.product.ab_ota_partitions as a build prop" am: 3443517fcb
Original change: https://android-review.googlesource.com/c/platform/build/+/1373759

Change-Id: I10c1e910eb4eb5581d5d053852305ebe34499202
2020-08-04 21:56:56 +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