Commit Graph

25116 Commits

Author SHA1 Message Date
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
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
GeQi
6e44e3d1e4 fix a typo for single PRODUCT_PRODUCT_VNDK_VERSION
Bug: 144534640
Test: build

Signed-off-by: GeQi <geqi@xiaomi.com>
Change-Id: I5bf47abd70e84e89930846c25b2592dac1100082
2020-09-04 14:08:57 +08:00
Colin Cross
b7c32f9021 Merge changes I3aa24904,I1f942dc0,If51d0f53,Ie27bdbd2 am: b9d0a2d4d5
Original change: https://android-review.googlesource.com/c/platform/build/+/1414178

Change-Id: I2b847ec608567e0125586ccf02cc1b16d9ebe645
2020-09-03 17:11:02 +00:00
Colin Cross
b9d0a2d4d5 Merge changes I3aa24904,I1f942dc0,If51d0f53,Ie27bdbd2
* changes:
  Remove target-files-package from PARSE_TIME_MAKE_GOALS
  Make dist zip files depend on files instead of images
  Make dependencies of target-files.zip conditional
  Remove INSTALLED_VBMETAIMAGE_TARGET dependency from target-files.zip
2020-09-03 16:56:39 +00:00
Treehugger Robot
9202357764 Merge "AutoGen: Support NativeTest with vendor namespace." am: 89d7b8aef7
Original change: https://android-review.googlesource.com/c/platform/build/+/1398277

Change-Id: I4da6ea04364c251fcb849a9b7d8b5c113ce38e15
2020-09-03 03:07:05 +00:00
kellyhung
0ba6ec6f49 Add test_mainline_modules option support in mk
Bug: 165425972
Test: Apply aosp/1418212
      atest -b hello_world_test
      Check module-info.json for hello_world_test HelloWorldTests and
HelloWorldHostTest

Change-Id: Ie30a09a54b0ae927ca4d8d1aaba2ac0cdb15233a
2020-09-03 02:37:44 +00:00
Treehugger Robot
89d7b8aef7 Merge "AutoGen: Support NativeTest with vendor namespace." 2020-09-03 02:26:10 +00:00
Colin Cross
4cca7b1e20 Merge "Use rules to create partition compatibility symlinks" am: 801e69696e
Original change: https://android-review.googlesource.com/c/platform/build/+/1412822

Change-Id: Ic6613b9da1c1174ac63e1b6f1ea440b2c242fa99
2020-09-02 23:35:07 +00:00
Colin Cross
e0dbbd4e9e Remove target-files-package from PARSE_TIME_MAKE_GOALS
It isn't doing anything useful that would be necessary to reparse the
Makefiles for.

Test: m target-files-package
Change-Id: I3aa2490480de8dbe0e57fe36221088c3f18017cb
2020-09-02 23:16:28 +00:00
Colin Cross
cda30c73c9 Make dist zip files depend on files instead of images
Depend on the files instead of images so that the dist zip files
can run in parallel with the image generation rules.

Test: treehugger
Change-Id: I1f942dc0ce0a2cbc5288c1f0633ea1019e77f91c
2020-09-02 23:16:20 +00:00
Colin Cross
43f2eb286a Make dependencies of target-files.zip conditional
Depend on the files going into the images instead of the images
themselves when the images are not prebuilts.  This will allow
paralellizing image generation with target-files.zip.

Test: treehugger
Test: m installclean && m target-files-package has same files before and after
Change-Id: If51d0f53602c08bd946ec34a2edae6f9d95f7bf8
2020-09-02 23:16:12 +00:00
Colin Cross
8d900929c7 Remove INSTALLED_VBMETAIMAGE_TARGET dependency from target-files.zip
Remove the INSTALLED_VBMETAIMAGE_TARGET, which depends on all the
other images, it is no longer necessary after
If1eff317621882994e7dcbf37cd35f5bfa16b69a.  This will allow the
next change to parallelize target-files.zip with the image generation
rules.

Test: treehugger
Change-Id: Ie27bdbd2d414e9b475823639a1b3944fe0756d2a
2020-09-02 23:16:04 +00:00
Colin Cross
801e69696e Merge "Use rules to create partition compatibility symlinks" 2020-09-02 23:15:50 +00:00
Xin Li
63e74fdff1 Revert BUILD_ID to previous value.
Bug: 167588565
Merged-In: I18496607c8a94b818cb83a63694fd384a18d48a3
Change-Id: Ia302b3004a2d6e1c2bd9d77beac09e8199ffdf78
2020-09-02 11:58:35 -07:00
Xin Li
37a9f38115 Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master 2020-09-01 20:03:45 +00:00
Martin Stjernholm
a24c0fe655 Merge "Preserve symlinks in the Soong prebuilt install steps for host binaries and shared libs." 2020-09-01 10:32:49 +00:00
yangbill
85146e5e82 AutoGen: Support NativeTest with vendor namespace.
Set the TEST_ROOT to /data/local/tmp/tests/vendor if LOCAL_VENDOR_MODULE or
LOCAL_USE_VNDK be set, if not, set to /data/local/tmp.

Bug: 138450837
Test: atest binderVendorDoubleLoadTest
Change-Id: I66437816227458a4f5672146b0c9e465c843aa50
2020-09-01 10:33:47 +08:00
Colin Cross
6af7cbe855 Fix BOARD_PREBUILT_(VENDOR|ODM)_DLKMIMAGE support in target-files.zip
BOARD_PREBUILT_ODM_DLKMIMAGE support seems to have been forgotten
in target-files.zip, and BOARD_PREBUILT_ODM_DLKMIMAGE support had
a typeo.

Test: treehugger
Change-Id: I9663220b43f0df4f39a7ef432ad4cfec39803a20
2020-09-01 01:26:50 +00:00
Colin Cross
a6de2ada15 Fix incorrect conditional comment in target-files.zip rule
Test: none
Change-Id: I15ced0acc9cf6f56c5094bb8e5aaa3957a9648cb
2020-09-01 01:26:33 +00:00
Martin Stjernholm
49a4e9b52e Preserve symlinks in the Soong prebuilt install steps for host binaries
and shared libs.

If a prebuilt module file is a symlink in the .intermediates tree it is
preserved when copied to the final install location. This preserves
symlinks to prebuilt binaries, so that they are run from their prebuilt
source location and can find libraries in relative paths from there.

Symlinks are converted to absolute, to not fail if they are relative in
the source tree.

Test: m clean && m droid dist checkbuild
  with and without the change, then compare the lists of symlinks in
  the out/ trees
Test: build/soong/soong_ui.bash --make-mode \
    TARGET_PRODUCT=crosshatch_hwasan TARGET_BUILD_VARIANT=userdebug \
    droid SANITIZE_TARGET=hwaddress \
    continuous_instrumentation_tests_api_coverage \
    continuous_native_tests device-tests platform_tests
  check that libclang_rt.hwasan_static-aarch64-android.a isn't a
  symlink in out/target/product/crosshatch/obj
Bug: 145934348
Change-Id: I7600e5b0754f8ea6cd0ffc8e1ba6d39153f182aa
2020-09-01 00:24:54 +01:00
Ram Muthiah
9fe40ca37b Add bootloader to droidcore if built
Non-dist builds don't copy out the bootloader.
This change fixes that.

Bug: 167160541
Bug: 164917252
Test: local build
Change-Id: I9bab9ba3455e8abee9e7a38bff431a142e7d5a57
2020-08-31 19:31:50 +00:00
Colin Cross
8b21e4e7d4 Merge "Delay platform availability error for ALLOW_MISSING_DEPENDENCIES=true" 2020-08-31 04:20:18 +00:00
Xin Li
c2fd58fe67 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ie00dbea32e074838466eeed00f316250c2b4f3c2
Change-Id: I9ee3441fd4d063b9dd489cb1b01d3dbc11332457
2020-08-29 01:19:44 -07:00
Colin Cross
b0f3a4d04c Delay platform availability error for ALLOW_MISSING_DEPENDENCIES=true
The platform availability check was erroring incorrectly for the
libstatssocket module in master-art-host builds.  Nothing being
built depended on libstatssocket, but the check would still
error because libstatspull_test was defined in the branch but
unused in the build.

When ALLOW_MISSING_DEPENDENCIES=true is set and a module fails
the check add an additional dependency on a rule that prints
the error message.  This will show the error and fail the build
if an unavailable module is requested to be installed, while
allowing the build to proceed if there are no unavailable
modules in the dependency graph.

Fixes: 154888298
Test: m build-art-host TARGET_BUILD_UNBUNDLED=true ALLOW_MISSING_DEPENDENCIES=true libstatspull_test -k
Test: m build-art-host TARGET_BUILD_UNBUNDLED=true ALLOW_MISSING_DEPENDENCIES=true
Change-Id: I1d57afe60a75d65128e59f794243a0414cbc82f6
2020-08-28 13:32:20 -07:00
Treehugger Robot
947cb0fd87 Merge "Introduce BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES" 2020-08-28 04:26:49 +00:00
Ram Muthiah
2ad69ab090 Merge "Revert "Revert "Add prebuilt bootloader var and add bootloader t..."" 2020-08-28 04:04:24 +00:00
Treehugger Robot
bcb644ee3f Merge "Fix HOST_CROSS_OUT" 2020-08-27 23:50:55 +00:00
Colin Cross
bd3821451a Use rules to create partition compatibility symlinks
Creating the symlinks between partitions (e.g /system/vendor to /vendor)
inside the packaging rules requires duplicating the creation in the
system.img rule as well as in the the target-files.zip rule, which can
cause the target-files.zip rule to fail in soong_zip when the symlink
is removed and recreated by the system.img rule.

Now that our Ninja fork supports symlinks in the build graph, move
the symlink creating to their own rules and add them to the list
of files that the image creation and packaging rules depend on.

Fixes: 161280160
Test: m nothing
Test: treehugger
Change-Id: I0f4d16b57b3052efb12a1f086506f1298c22ec84
2020-08-27 15:06:23 -07:00
Ram Muthiah
0c4a352409 Revert "Revert "Add prebuilt bootloader var and add bootloader t..."
Revert submission 1411608-revert-1402265-cf-x86-bootloader-XGKLNEQAPF

Reason for revert: Breakage originally caused by change was fixed. Refer to tracking bug for details.
Reverted Changes:
I89e95d4a6:Revert "Add prebuilt bootloader var and add bootlo...
I8fe199351:Revert "Added bootloader binary to cf x86 based ta...

Bug: 166380489
Bug: 164917252
Test: local build and Treehugger build
Change-Id: Ia895aedd77f2ec825aefecaf74c6dfc1ce631c93
2020-08-27 13:18:24 -07:00