Commit Graph

25714 Commits

Author SHA1 Message Date
Yo Chiang
cbdfc3a5ed Merge "Error if $(LOCAL_PATH) is empty" 2020-08-11 07:58:57 +00:00
Yo Chiang
60052f3a9f Error if $(LOCAL_PATH) is empty
Bug: 162918277
Test: m com.android.art
Test: m MODULES-IN-art
Change-Id: I7c35dba22385e89313ea7210e9b1db15c7f6af86
2020-08-11 11:23:08 +08:00
Yo Chiang
150a1ca0c2 Don't call $(my_path_comp) if $(dir $(LOCAL_PATH)) is TOP
So we don't accidentally create phony rules like
`MODULES-IN-: MODULES-IN-` and `MODULES-IN-.: MODULES-IN-*`

Bug: 162918277
Test: m com.android.art
Test: ninja -t browse
Change-Id: Id0656d1b08bc933df57914df162853934352593b
2020-08-11 11:22:36 +08:00
Dan Willemsen
a3f6632de9 Remove obsolete PDK build functionality
This hasn't worked for a couple years, and continues to bitrot. Just
remove it.

Test: treehugger
Change-Id: Iea6caf3c08252a560155e095135c5ddaad712991
Merged-In: Iea6caf3c08252a560155e095135c5ddaad712991
2020-08-11 01:12:01 +00:00
Dan Willemsen
110a51cbde Remove obsolete PDK build functionality
This hasn't worked for a couple years, and continues to bitrot. Just
remove it.

Test: treehugger
Change-Id: Iea6caf3c08252a560155e095135c5ddaad712991
2020-08-10 18:08:54 -07:00
Felix
3769a205b6 tasks: find-sharedui-violation: Partition location
Allow for relocated partition directories in out, mainly for
devices which do not possess e.g. /product but must
distribute it in /system/product.

Use argparse to cope with increased argument count.

Test: Device without physical /product partition
      m out/target/product/<device>/shareduid_violation_modules.json
      -> Observe addition of violating apks from product
      partition in shareduid_violation_modules.json

Signed-off-by: Felix <google@ix5.org>
Change-Id: I2d7826b41fb5b924f15ae21a73178fa4eec6a879
2020-08-11 02:21:36 +02:00
android-build-team Robot
4a1c5e3a30 Make change and version bump to RQ1A.200811.001
Change-Id: Ifcbe3d7ae6539a908d3a58ff47e580802318e206
2020-08-10 23:17:05 +00:00
Bill Peckham
138b2d0db5 Merge "Fix broken my_image_variant" am: 4f353b78a7 am: b7fa8e4574
Original change: https://android-review.googlesource.com/c/platform/build/+/1393818

Change-Id: I1c821aa21eb0cb331caf64fa035a65eac55ce067
2020-08-10 20:07:10 +00:00
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
Jeongik Cha
dd87cdea27 Merge changes from topic "b/160390776" am: 66853bb381 am: 37cd475e59
Original change: https://android-review.googlesource.com/c/platform/build/+/1358106

Change-Id: I923d490c3fb0539445cc91dadaf23686abbeca39
2020-08-10 01:25:06 +00: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
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
android-build-team Robot
50a72b4c37 Make change and version bump to RQ1A.200810.001
Change-Id: I5bc9b2f17f671dafc605762980d98625d9174213
2020-08-09 21:15:30 +00:00
android-build-team Robot
184d00ce83 Make change and version bump to RQ1A.200809.001
Change-Id: I415a953da6ceb1b4cc7a840e356538664c6cefcb
2020-08-08 21:15:41 +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
74607b7d14 Merge "Define ro.sanitize.<name> properties in SANITIZE_TARGET builds." am: 48e914e991 am: 96af2a7adc
Original change: https://android-review.googlesource.com/c/platform/build/+/1367662

Change-Id: I6bac23706577bf68363fd312c8164985bf358f1a
2020-08-07 23:26:33 +00:00
android-build-team Robot
02576f019f Make change and version bump to RQ1A.200808.001
Change-Id: Ia0bc46e99f839f5342a424b84c842e29f7b7b00d
2020-08-07 23:16:46 +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
4144c2c107 Merge "Add BOARD_KERNEL_MODULE_INTERFACE_VERSIONS." am: 7c556f30be am: 3f4f3ce038
Original change: https://android-review.googlesource.com/c/platform/build/+/1392540

Change-Id: I5b9948f2d8e8a416fcca0da3010f7ebc795c544f
2020-08-07 18:50:42 +00:00
Treehugger Robot
7c556f30be Merge "Add BOARD_KERNEL_MODULE_INTERFACE_VERSIONS." 2020-08-07 18:37:36 +00:00
android-build-team Robot
1849ad5c5f Version bump to RP1A.200720.011 [core/build_id.mk]
Change-Id: I81f79ea602702338ade3e4a1225c64dfd6bac6c4
2020-08-07 17:57:45 +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
android-build-team Robot
ee59e03dfe Make change and version bump to RQ1A.200807.001
Change-Id: Ic1bf083b1008ea331b70fe91c7760de88da7d13d
2020-08-06 23:17:40 +00:00
Treehugger Robot
1efa1df920 Merge "Don't use the remote pool when using clang-tidy" am: 5610430667 am: 708da6d89b
Original change: https://android-review.googlesource.com/c/platform/build/+/1392545

Change-Id: Ibda2dc87574998a6ec77fe01ebc11884425ae4d6
2020-08-06 20:04:48 +00:00
Treehugger Robot
5610430667 Merge "Don't use the remote pool when using clang-tidy" 2020-08-06 19:27:17 +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
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
Yifan Hong
b87120633e Merge "Add BOARD_KERNEL_BINARIES to board_config.mk" am: bdf548bdc0 am: 50416b788c
Original change: https://android-review.googlesource.com/c/platform/build/+/1392539

Change-Id: I3f28a8c7f1055968c1c86af0823a77881cdcc6cc
2020-08-06 16:04:45 +00:00
Treehugger Robot
a20c07d97a Merge "Separate lists of soong sanitize modules" am: 66b322cf6c am: c60a3fcf5d
Original change: https://android-review.googlesource.com/c/platform/build/+/1385289

Change-Id: Ic57f1f15bc0e3e28ad62c64bdad43fb89f7127d0
2020-08-06 16:03:06 +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
Dan Willemsen
0aecdac89e 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
2020-08-05 20:23:24 -07: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
android-build-team Robot
a42e04c017 Make change and version bump to RQ1A.200806.001
Change-Id: I91b7e596c9ee335405d1dcd8a2feaee178240a33
2020-08-05 23:20:19 +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
android-build-team Robot
bd4e00da12 Make change and version bump to RQ1A.200805.001
Change-Id: Iaddfff302e89468f015feca96fe9eff96805ba6f
2020-08-04 23:23:55 +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