Commit Graph

25241 Commits

Author SHA1 Message Date
Treehugger Robot
682aa6879a Merge "Package the JDK into test suite zips" 2020-08-12 17:58:44 +00:00
Dan Willemsen
94701c4fb6 Merge "Reland "Move some prebuilt build tool configs to Soong"" am: 1a9ee40547 am: b62d6bb5ee
Original change: https://android-review.googlesource.com/c/platform/build/+/1393145

Change-Id: I5d2ce98f76d5403dc9ebb908d09eaa9b40bb16af
2020-08-12 15:17:56 +00:00
Dan Willemsen
1a9ee40547 Merge "Reland "Move some prebuilt build tool configs to Soong"" 2020-08-12 14:48:08 +00:00
Kousik Kumar
151dd8fadb Remove double quotes in rbe.mk file
These result in weird command line invocations when used with RBE.

Test: Ran an RBE build locally and made sure it still worked as expected
after the change.
Bug: b/163618332

Change-Id: Ic8a8adb3fffb357754384ddbf13684d944a9767e
2020-08-12 13:38:59 +00:00
Yo Chiang
9dbe41fe3c Merge changes Ib89ef776,I5cdc56c7 am: 2dcabab1c9 am: 02e56fc624
Original change: https://android-review.googlesource.com/c/platform/build/+/1396214

Change-Id: Id8aeb4cd89b6bff6661337e610bc1e55f990fc07
2020-08-12 04:23:54 +00:00
Yo Chiang
9bb503ee78 Require required modules to exist am: 64faf88940 am: b37bb1d8c6
Original change: https://android-review.googlesource.com/c/platform/build/+/1306572

Change-Id: I4642eb5a66579fbb9b284d9eb8b289965849f1a8
2020-08-12 04:23:53 +00:00
Yo Chiang
249430d062 Merge "Don't call $(my_path_comp) if $(dir $(LOCAL_PATH)) is TOP" am: 15fbad3dfa am: d4aef1614a
Original change: https://android-review.googlesource.com/c/platform/build/+/1396208

Change-Id: I57b5bac47ae623f92ef56fd5a12e049376658e3f
2020-08-12 04:23:28 +00:00
Yo Chiang
b37bb1d8c6 Require required modules to exist am: 64faf88940
Original change: https://android-review.googlesource.com/c/platform/build/+/1306572

Change-Id: I15f728dcd0a73269ec99146982f2763f2e169ac3
2020-08-12 04:08:08 +00:00
Yo Chiang
2dcabab1c9 Merge changes Ib89ef776,I5cdc56c7
* changes:
  Disable required modules check on darwin
  Require required modules to exist
2020-08-12 03:56:10 +00:00
Yo Chiang
15fbad3dfa Merge "Don't call $(my_path_comp) if $(dir $(LOCAL_PATH)) is TOP" 2020-08-12 03:55:57 +00:00
Colin Cross
fa4f72000b Package the JDK into test suite zips
Allow hermetically running the test suites by packaging the JDK
into the output zip file.

Bug: 139202337
Test: m cts && zipinfo out/host/linux-x86/cts/android-cts.zip
Change-Id: I6a59bb97a33113c83df9c7162e9c65ca90a8c196
2020-08-11 23:35:56 +00:00
Pirama Arumuga Nainar
817e8adfff Merge "[config_sanitizers] Fail if LOCAL_SANITIZE_BLACKLIST is used." am: 6552424ff9 am: 35de4fa5e0
Original change: https://android-review.googlesource.com/c/platform/build/+/1384276

Change-Id: Ia11299ee59518d10205a644f81502056225af736
2020-08-11 21:59:03 +00:00
Pirama Arumuga Nainar
6552424ff9 Merge "[config_sanitizers] Fail if LOCAL_SANITIZE_BLACKLIST is used." 2020-08-11 21:23:56 +00:00
Paul Scovanner
da6e4c1964 Update Security String to 2020-10-01
Bug: 163542576
Change-Id: I4973247ab66704c16446c47c6fd830a21ea2504f
2020-08-11 19:35:14 +00:00
Pirama Arumuga Nainar
1ac5384aaf [config_sanitizers] Fail if LOCAL_SANITIZE_BLACKLIST is used.
All uses of this property have been migrated to
LOCAL_SANITIZE_BLOCKLIST.

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: Add the old property to an Android.mk and ensure error is thrown.
Change-Id: I797ff651f03b954b410f76f4d201a962ded717df
2020-08-11 11:00:53 -07:00
Yo Chiang
9ce76bb1c4 Disable required modules check on darwin
Bug: 162102724
Test: `make sdk` on darwin
Change-Id: Ib89ef776475c5a20574f78188a2b5cad5fdd8f00
Merged-In: Ib89ef776475c5a20574f78188a2b5cad5fdd8f00
(cherry picked from commit 4d2ea47f06)
2020-08-11 23:54:04 +08:00
Yo Chiang
334a10406f Merge "Revert "Error if $(LOCAL_PATH) is empty"" am: b5bbe4bca0 am: 17d9d8bac8
Original change: https://android-review.googlesource.com/c/platform/build/+/1396212

Change-Id: I6d48d54954f59cab7ad2867fcf029d8f8b18e3fa
2020-08-11 10:54:57 +00:00
Yo Chiang
b5bbe4bca0 Merge "Revert "Error if $(LOCAL_PATH) is empty"" 2020-08-11 10:21:24 +00:00
Yo Chiang
e01766433a Revert "Error if $(LOCAL_PATH) is empty"
This reverts commit 60052f3a9f.

Reason for revert: Breaks build_test

Bug: 163473133
Change-Id: Ib5a8030f7b49b131f912e2df8026d3e2107c87a4
2020-08-11 10:19:32 +00:00
Treehugger Robot
614b3e4d9e Merge "Remove obsolete PDK build functionality" 2020-08-11 09:28:01 +00:00
Yo Chiang
1958d49234 Merge "Error if $(LOCAL_PATH) is empty" am: cbdfc3a5ed am: 1d2de91456
Original change: https://android-review.googlesource.com/c/platform/build/+/1396207

Change-Id: Id1a2a728f64b9916805db3297c8bde0ee7db1bb3
2020-08-11 08:31:04 +00:00
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
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
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
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
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