Commit graph

25154 commits

Author SHA1 Message Date
Joe Onorato
f09dce28d3 Merge "Refactor OWNERS files in platform/build/make." 2020-10-09 03:59:38 +00:00
Dan Shi
a98b188e50 Merge "Add missing target-native-copy-pairs util" 2020-10-09 03:31:30 +00:00
Joe Onorato
ba048cb758 Refactor OWNERS files in platform/build/make.
Pulls out all of the per-file rules into their relevant directories
and includes platform/build/soong:/OWNERS as the authoritative
list of approvers.

Test: treehugger
Bug: 170407947
Change-Id: Icb885fc25a638f2f5134f6223df656ef4438bb67
2020-10-08 16:14:44 -07:00
Yifan Hong
fa1349600e Merge "Revert "Add timestamp to ramdisk."" 2020-10-08 22:28:43 +00:00
Yifan Hong
0bbbc93c31 Revert "Add timestamp to ramdisk."
This reverts commit 7a532ab1e9.

Reason for revert: conflicts with device-specific sepolicy

Bug: 170364317
Bug: 170411692
Change-Id: I9e7094e5f7be6f2c53ed27c658530370d794a5e2
2020-10-08 22:14:44 +00:00
Dan Shi
ab42cd0eb9 Add missing target-native-copy-pairs util
The function was in test/framework/build/utils/vtslab_package_utils.mk
It was removed as part of the cleanup of vts10.
Function target-native-copy-pairs is still used to package kernel native
tests.

Bug: 170339160
Test: m vts
Change-Id: I0097022f05fc9adc47a664c63a8341040b4af106
2020-10-08 10:13:40 -07:00
Treehugger Robot
396b0a2074 Merge "Add timestamp to ramdisk." 2020-10-08 03:50:37 +00:00
Jesse Hall
a16690c38c Skip unneeded notice files for DATA modules.
Non-installable generated intermediate data modules can have
notice files attached when they're defined in the same LOCAL_PATH
as the installable module that depends on them. This makes uninstallable
DATA modules silently ignore the fact that the build doesn't know where
to install the notice file.

Bug: 160248517
Test: build
Change-Id: I09a8a253dda52c2d78a1ebc0c33cd96e3505e2e3
Merged-In: I09a8a253dda52c2d78a1ebc0c33cd96e3505e2e3
2020-10-07 14:01:12 -07:00
Yifan Hong
7a532ab1e9 Add timestamp to ramdisk.
Add a build.prop file for ramdisk. Properties uses the
name ro.[product.]bootimage*.

These ro.[product.]bootimage.* properties are also included in recovery
properties.

The file is installed to boot/etc/build.prop under ramdisk.

On devices with dedicated recovery partition, the file is
installed to ramdisk/, which is installed to the ramdisk in the boot
image. The file is NOT installed to recovery/root to prevent
collision.

On devices with recovery_as_boot, in addition to ramdisk/, it is also
installed to recovery/root, which is installed to the ramdisk in the
boot image.

Test: m bootimage and inspect output
Bug: 169169031
Bug: 162623577

Change-Id: I94b993ce3214356036d038b6db57c4e1b755c111
2020-10-06 16:10:38 -07:00
The Android Open Source Project
a4c45b8d52 DO NOT MERGE - Merge RP1A.201005.006
Bug: 168212094
Merged-In: Id3cbd4d6528f827eba6ac410ba2eb92d91d40901
Change-Id: Ic9c7b4d7339ab624418c1fbc95e66674cffdef71
2020-10-06 16:48:22 +00:00
Treehugger Robot
70b4738324 Merge "Remove build tasks for vts10" 2020-10-06 03:30:31 +00:00
Jooyung Han
a00c0f1f23 Merge "Use file_contexts for flattened apexes" 2020-10-06 03:26:14 +00:00
Treehugger Robot
b1fbb747b8 Merge "tasks: find-sharedui-violation: Partition location" 2020-10-06 02:14:47 +00:00
Dan Shi
82c4cb74c6 Remove build tasks for vts10
Bug: 169581727
Test: build
Change-Id: I865553ae07bc6eac3b90f87a494537102c398280
2020-10-05 10:17:21 -07:00
Yifan Hong
871e3c6032 Merge "Fix boot-* to kernel-* dependency" 2020-10-02 18:43:12 +00:00
Yifan Hong
3e0b5d0355 Fix boot-* to kernel-* dependency
For example, if BOARD_KERNEL_BINARIES contains kernel-5.4, make sure
boot-5.4.img depends on kernel-5.4.

Test: remove kernel-5.4 from out directory then build boot image
Fixes: 169725104
Change-Id: I85624f3595c1a698bc27d19c73349138bb6e9e8c
2020-09-30 11:54:04 -07:00
Po-Chien Hsueh
e3b44f551c Filter out host paths on platform-availability-check errors
If a module, which is installed to both the host and the platform,
fails the platform-availability-check, the build system might use
the host install path to report errors. Filter out the host install
path so that the platform install path is used.

Bug: 169393514
Test: make
Change-Id: Ib39715ffc45cc32e3bd7ce5f2a3725d243f3237f
2020-09-30 08:18:03 +00:00
Yifeng Zeng
d17bffd01f Copy generated $(SOONG_OUT_DIR)/module_bp_java_deps.json file to dist when SOONG_COLLECT_JAVA_DEPS flag is set.
Test: build/soong/soong_ui.bash --make-mode SKIP_ABI_CHECKS=true SOONG_COLLECT_JAVA_DEPS=true TARGET_PRODUCT=aosp_cf_x86_phone TARGET_BUILD_VARIANT=userdebug droid dist DIST_DIR=/usr/local/google/home/yifengzeng/temp EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true CLANG_COVERAGE=true NATIVE_COVERAGE_PATHS="*" NATIVE_COVERAGE_EXCLUDE_PATHS="art bionic/libc device" tests

Bug: 168755196
Change-Id: Id13d3a4579734bc70bc0ce3463a05ee9a052f1dc
2020-09-28 23:16:51 +00:00
Martin Stjernholm
0de50208a3 Merge "Do not chmod the symlink target when a prebuilt binary is symlinked." 2020-09-28 13:02:33 +00:00
Yo Chiang
d311799206 Merge changes from topic "exclude-system-shared-libs-from-elfcheck-suggestions"
* changes:
  Pass the value of system_shared_libs from Android.bp to check_elf_file.py
  Exclude system shared libs from fix suggestion
2020-09-28 03:54:27 +00:00
Dan Shi
dc0359c0a7 Merge "Create a new package for hostside art tests" 2020-09-25 20:26:40 +00:00
Martin Stjernholm
2cfce9380e Do not chmod the symlink target when a prebuilt binary is symlinked.
It may be in a source tree that isn't writable. Instead check that
the target is executable.

Test: m
Test: chmod a-x system/sepolicy/tools/insertkeys.py && \
  rm -rf out/host out/soong/host && \
  m insertkeys.py
  Check that it fails with the expected error message.
Fixes: 169375644
Change-Id: I402d029dba45783127586ad9749c90012afe891d
2020-09-25 17:17:50 +01:00
Dan Shi
f740f616bd Create a new package for hostside art tests
Bug: 169111770
Test: m -j art-host-tests
Change-Id: If54c218339080f031423f66c2925e4d3ca983d4b
2020-09-24 15:23:08 -07:00
Yo Chiang
bdd9ec461e Pass the value of system_shared_libs from Android.bp to check_elf_file.py
Bug: 141925662
Test: Write a bad cc_prebuilt_library module and check fix suggestions
Change-Id: Iede63db4e92da68e2bf0eccdf124b3187ee3b87d
2020-09-24 13:17:07 +08:00
Jooyung Han
b27c2e8af9 Use file_contexts for flattened apexes
Because flattened apexes are installed in /<partition>/apex, associated
file_contexts file should be modified to accommodate path changes and
also merged into target-wide file_contexts.bin file.

Soong now emits modified file_contexts via LOCAL_FILE_CONTEXTS, and
these files are collected into a temporary file_contexts.modules.tmp
file, which is used as an additional input of file_contexts.bin.

Bug: 166518492
Test: m file_contexts.bin
      check the contents of file_contexts.concat.tmp file
Change-Id: I002a2294af9e06baeaf54bc5a9a5380d23b8a3da
2020-09-23 15:43:58 +00:00
Logan Chien
751a987bcc Exclude system shared libs from fix suggestion
This commit removes system shared libs (e.g. libc, libdl, or libm) from
the prebuilt ELF check fix suggestion.

Bug: 141925662
Test: Write a bad Android.mk module and check fix suggestions
Change-Id: I4a827d07b24a976c1910b814126790abbeccc793
2020-09-22 18:55:11 +08:00
Kris Alder
d78384a42d remove unusued line_coverage.mk and build target
These are no longer used in favor of clang-coverage-based solutions.

Bug: 162767128
Test: n/a
Change-Id: I8014b6b5ec5d46789e19dc399c1aa8ebd79a3012
2020-09-21 23:19:53 +00:00
Ivan Lozano
b8f47c50a6 Merge "rust: Don't install static libraries." 2020-09-21 19:38:28 +00:00
Roland Levillain
9f5b7aa9b2 Merge "Add new armv8-2a-dotprod arch variant support." 2020-09-21 17:54:04 +00:00
Ivan Lozano
3e3d0913a5 rust: Don't install static libraries.
Bug: 168729404
Test: Make no longer attempts to install static libraries.
Change-Id: Ifdfd486dfbb0d64e2aeb9738f88c4d4efcb0337a
2020-09-18 14:30:28 -04:00
Bill Yi
cf9e7f1929 Merge mainline-release 6664920 to master - DO NOT MERGE
Merged-In: I4bbc4aca7e21839ac5afd59cc3a13bf102138dd0
Change-Id: If6a82875aafd5d9d92763042e96b6f186efce004
2020-09-17 21:56:55 -07:00
Dan Shi
978a57a443 Merge "Force extra config file to be .config" 2020-09-17 03:23:30 +00:00
Dan Shi
22bc099c02 Force extra config file to be .config
TradeFed only supports .config file as test config.

Bug: 163344047
Test: m HelloWorldTests

Change-Id: Ib963d04fc308b9c319d5b59f50f9ca9b5b575b72
2020-09-16 15:52:13 -07:00
Yifan Hong
4e501b58b8 Merge "Revert "Add modules partition."" 2020-09-16 22:45:54 +00:00
Raphael Gault
b817bb161d Add new armv8-2a-dotprod arch variant support.
This patch introduces the .mk file required to support build for the new
armv8-2a-dotprod Arm64 arch variant. The file just needs to be present
but does not require to contain anything.

Test: test-art-target on Pixel 4.

Change-Id: I4b6a1e306f9819cf31cd556351bd3e8cf08e2537
2020-09-16 14:53:06 +00:00
Yifan Hong
c08cbf0f4a Revert "Add modules partition."
Revert submission 1413808-modules_partition

Reason for revert: modules partition no longer needed
Reverted Changes:
Iceafebd85:Add modules partition
I2fa96199a:rootdir: Add modules directory
Ie397b9ec6:Add modules partition.
I4200d0cf5:fastboot: add modules partition

Bug: 163543381

Change-Id: Iec1d9421bbfeb114fb705f85d910c6def1f211b6
2020-09-15 19:09:26 +00:00
Kousik Kumar
edb723a3f8 Rename wlist to allowlist
The new release of re-client renames env_var_wlist to env_var_allowlist.
We need to make this change as part of the topic so that with the new
release we are able to deprecate this variable.

Bug: b/167677318
Change-Id: I988381f4f72061f7c6eb99d58593f92cfd618b1b
2020-09-14 11:10:20 +00:00
Treehugger Robot
53a80be100 Merge "HOST_CROSS_OS/ARCH can be configured to linux_bionic/arm64" 2020-09-14 03:41:47 +00:00
android-build-team Robot
f3a4604ae7 Version bump to RP1A.201005.006 [core/build_id.mk]
Change-Id: I18acc8afe854f5b4f38e8e479d3c893f9aace419
2020-09-11 19:01:21 +00:00
Joe Onorato
55c090ebe0 Merge changes I4a43604b,I7200f5f9,If3402a0a
* changes:
  Add CSV output of remaining makefiles for bp converstion
  Refactor the mongo main() into a class in mk2bp_catalog.py
  Add per-partition summaries and "easy" transitions to mk2bp_catalog
2020-09-11 05:46:48 +00:00
Yifan Hong
b1e66600c0 Merge "Add modules partition." 2020-09-11 00:25:24 +00:00
Joe Onorato
3198607cfd Add CSV output of remaining makefiles for bp converstion
Test: m out/target/product/$(get_build_var TARGET_DEVICE)/mk2bp_remaining.html out/target/product/$(get_build_var TARGET_DEVICE)/mk2bp_remaining.csv
Change-Id: I4a43604b2d536387c787b02a4627a0ad9e2a6ff9
2020-09-10 14:09:29 -07:00
Yifan Hong
c0f187f5f9 Add modules partition.
Modules partition is a dynamic read-write partition.
- AVB is not enabled on the partition
- OTA is file-based; see follow up CL for details
- No build prop files; in particular, no build fingerprint
- No fs_config
- No notice files; notice files are included in individual APEXes

Test: build on CF
Bug: 163543381

Change-Id: Ie397b9ec61dfd1c158450d050196024604854d4d
2020-09-09 15:00:02 -07:00
Jiyong Park
e80c45f6ac HOST_CROSS_OS/ARCH can be configured to linux_bionic/arm64
Previously, HOST_CROSS_OS/ARCH were fixed to windows/x86. This change
makes the setting configuration and adds the support for new OS/ARCH
combo: linux_bionic/arm64.

linux_bionic is the Linux-based host target that uses Bionic (instead of
glibc) as libc. Previously, it supported only x86_64 and the x86_64
target was NOT configured via Make, but directly via editing
soong.variables file. Now, the support for arm64 is being added in the
Soong side and this change makes it possible to configure the target via
Make.

The new HOST_CROSS_OS/ARCH combo will be used for building the host-side
tools (adb, crosvm, etc.) for running Cuttlefish natively on Linux/ARM
hosts.

Bug: 159685774
Test: HOST_CROSS_OS=linux_bionic HOST_CROSS_ARCH=arm64 m nothing

Change-Id: I6b8ed8f7e26908749bbe778fbdcc34cfbde68179
2020-09-09 17:38:25 +09:00
Treehugger Robot
ab222e8a7f Merge "Add test_mainline_modules option support in mk" am: 897cfaee46
Original change: https://android-review.googlesource.com/c/platform/build/+/1413947

Change-Id: I1688ae7c3bb013eed0a3b5fa148811e0d7c50e04
2020-09-09 08:06:35 +00:00
Treehugger Robot
897cfaee46 Merge "Add test_mainline_modules option support in mk" 2020-09-09 07:36:11 +00:00
Treehugger Robot
dc7ff33e38 Merge "Set PRODUCT_PRODUCT_VNDK_VERSION from product_config.mk" am: 6a052b1118
Original change: https://android-review.googlesource.com/c/platform/build/+/1420908

Change-Id: I22f04a976e81f73523a42829b862c02692d55b00
2020-09-08 04:47:54 +00:00
Treehugger Robot
633cebaa33 Merge "fix a typo for single PRODUCT_PRODUCT_VNDK_VERSION" am: cd2430855d
Original change: https://android-review.googlesource.com/c/platform/build/+/1420010

Change-Id: I5e4ca4773a89f5f3ef35abab53fda7e09ae886ed
2020-09-08 04:47:40 +00:00
Treehugger Robot
6a052b1118 Merge "Set PRODUCT_PRODUCT_VNDK_VERSION from product_config.mk" 2020-09-08 04:30:04 +00:00
Justin Yun
70f7dbaf21 Set PRODUCT_PRODUCT_VNDK_VERSION from product_config.mk
As a product variable, PRODUCT_PRODUCT_VNDK_VERSION cannot be defined
in config.mk. Instead it can be defined from product_config.mk.

Bug: 144534640
Test: check if the following command returns empty value
      $ PRODUCT_USE_PRODUCT_VNDK_OVERRIDE=false \
        get_build_var PRODUCT_PRODUCT_VNDK_VERSION
Change-Id: I304fb980610aec1dd5da05864b4c137997fc9aff
2020-09-07 19:29:45 +09:00