Commit Graph

34111 Commits

Author SHA1 Message Date
Victor Chang 9448e8fd56 Add first_perfer32 option to compile_multilib
NDK has 4 ABIs, i.e. x86, x86_64, armv7-a, armv8-a, but cintltst
can only compiled into single ABI, or otherwise, the java_test_host
CtsIcu4cTestCases can't include cintltst in the "data" property
because the "data" property can only include dependecies with
a single variant/ABI.

CtsIcu4cTestCases needs to use "data" property instead of
"host_required" dependency because "host_required" relationship
does not work for streaming the "general_tests" in the post-submit
infra-strucuture. See https://r.android.com/1175350 for the details.

Bug: 168445204
Bug: 160350521
Test: OUT_DIR=ndk_out build/soong/scripts/build-ndk-prebuilts.sh
Change-Id: I81429cc261ec4e25aefe363abb099048ff026505
2021-02-17 23:48:59 +00:00
Jeff Vander Stoep dc79fe85e7 Update Rust toolchain to 1.50.0
Bug: 180268112
Test: mm crosvm
Change-Id: Ib36f252a99e06059b413326b8f9d1733534facbc
2021-02-17 23:53:18 +01:00
Dan Albert bfe770d03f Merge "[arm64] Build NDK with PAuth and BTI" am: a175126009
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1558552

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b3650dbc2832cce84e82de85835359861bab3f5
2021-02-17 22:04:48 +00:00
Dan Albert a175126009 Merge "[arm64] Build NDK with PAuth and BTI" 2021-02-17 21:37:41 +00:00
Chih-hung Hsieh 030f75fa56 Merge "Change default DEFAULT_TIDY_HEADER_DIRS to empty" am: 6e304f5a88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1584224

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I386fa4383d16de9455a5c0ed8335afb14976cf3a
2021-02-17 18:47:29 +00:00
Bob Badour c9d0e8bd69 Add license to hiddenapi am: 1bf6765def
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1588835

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56c9dc6040900d57956e2937cd668ce557df4a63
2021-02-17 18:46:44 +00:00
Chih-hung Hsieh 6e304f5a88 Merge "Change default DEFAULT_TIDY_HEADER_DIRS to empty" 2021-02-17 18:34:48 +00:00
Bob Badour 1bf6765def Add license to hiddenapi
Test: m all
Change-Id: Ic61a74d94bea0e4de2a47be7e15fcf874fb397c3
2021-02-17 09:46:26 -08:00
Anton Hansson c79d412b8a Use genrule instead of filegroup for api files
filegroups have the unfortunate limitation that they don't create phony
targets for building them in a convenient way. Also, having a single
output file fits better with the genrule concept.

Test: m framework-sdkextensions.api.public.latest
Change-Id: I229410658b04403ff1ff6abd4116a65aaa02b83b
2021-02-17 17:16:43 +00:00
Victor Chang 00c144f930 Non-installable module should not be installed into a fuzzer .zip package
libicu_* fuzzer depends on installable cc modules and non-installable
cc modules with the same name, because the non-installable modules are
stubs used in the compile-time, and shouldn't be used in runtime.

Bug: 175583039
Test: make haiku dist
Test: Run 2 arbitrary binaries from out/dist/fuzz-target-x86_64.zip on device
Test: Run 2 arbitrary binaries from out/dist/fuzz-host-x86_64.zip on host
Change-Id: I0ecf24bb83e3985da3b8f393adab8c87ab7400c6
2021-02-17 16:40:25 +00:00
Martin Stjernholm 0a9dae6e9a Move the logic to add jacocoagent in instrumentation builds to make.
Test: m nothing
Test: m nothing EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true
Bug: 180325915
Change-Id: Ieec8c8a122ff930e14cef4b5a0a2f9fc9e3b70ad
2021-02-17 14:41:07 +00:00
Rupert Shuttleworth 9632827e78 Merge "Add cc_library_headers support to bp2build." am: a0516f76ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1589371

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08efd5dc593aed401ccafc37b7beaa71f427a5de
2021-02-17 09:42:03 +00:00
Rupert Shuttleworth a0516f76ab Merge "Add cc_library_headers support to bp2build." 2021-02-17 08:57:19 +00:00
Treehugger Robot b7d326779b Merge changes from topic "vendor_property_enforce" am: cc84c8846d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1571882

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0857ffa129aebbe6d3f5d79945c9dd3291b28ed5
2021-02-17 07:47:15 +00:00
Treehugger Robot cc84c8846d Merge changes from topic "vendor_property_enforce"
* changes:
  Add BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE to BoardConfig
  Add PRODUCT_SHIPPING_API_LEVEL to device config
2021-02-17 07:12:30 +00:00
Inseob Kim 14199b07f7 Add dirs and symlinks property to filesystem
Dirs and symlinks will be created under the root of the filesystem.
Basic essential directories like "dev", "proc", "sys" and symlinks like
"bin -> /system/bin", "init -> /system/bin/init" can be created with
these properties.

Bug: 179652970
Test: boot with aosp_cf_x86_64_only_phone, see adb works
Change-Id: Ie06dc5a93635ea8b1e18be517ed8615b6c82fee6
2021-02-17 14:05:12 +09:00
Treehugger Robot 99d401ce42 Merge "boot_image modules inside APEX have correct names" am: 608b691299
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1588298

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e5eff2194c88ea38ea973238472a698383048f5
2021-02-17 04:12:31 +00:00
Inseob Kim 2ce1b5dc3a Add base_dir property to filesystem
Deps have been installed to "system/" because of hard-coded mount point
"system". Now they are installed to base_dir, and mount point is set to
root.

Bug: 179652970
Test: see contents of microdroid.img
Change-Id: Ie03b539a1688db7002bb178823b39017a83ce840
2021-02-17 13:07:18 +09:00
Treehugger Robot 608b691299 Merge "boot_image modules inside APEX have correct names" 2021-02-17 03:56:30 +00:00
Treehugger Robot f9f5435930 Merge "filesystems property can be specific to arch" am: 0cfa585f04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1588297

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I337b71a4399a9b1420c331fc6d8936734b05f1d1
2021-02-17 03:51:51 +00:00
Treehugger Robot 0cfa585f04 Merge "filesystems property can be specific to arch" 2021-02-17 03:22:06 +00:00
Treehugger Robot ec70aec881 Merge "Clarify ExistentPathForSource docs" am: 5e3fa0a9a5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1584434

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6ef1f8ce3654258caa2858f2bcfabd432a26bc0
2021-02-17 02:20:15 +00:00
Treehugger Robot 5e3fa0a9a5 Merge "Clarify ExistentPathForSource docs" 2021-02-17 02:02:30 +00:00
Jiyong Park 1f55dbd0d6 boot_image modules inside APEX have correct names
This change fixed the problem that boot_image modules when installed to
an APEX get incorrect names like signed.img. The filename now is
"<modulename>.img" and can be overridden via the new `stem` property.

Bug: 178978059
Test: m
Change-Id: I1b25db04a4a2d888371b174c42f91a0cea87b877
2021-02-17 09:45:03 +09:00
Chih-hung Hsieh 691531855f Merge "Switch to clang-r412851 (build 7141649)" am: 296b7b8440
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12efa2211606a4acbce635b23c235a802a444860
2021-02-17 00:41:38 +00:00
Chih-hung Hsieh 296b7b8440 Merge "Switch to clang-r412851 (build 7141649)" 2021-02-17 00:17:14 +00:00
Treehugger Robot 7ffa99bdd9 Merge changes from topic "mkboot" am: b913011777
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1588301

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I191f49a781bafd63d68d579a0b50cfe222b41e1e
2021-02-16 23:55:04 +00:00
Jiyong Park 4362e740af Revert "`data` dependency of java_test_host can be arch-specific" am: 2b0e4908c2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1588300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae42079a404a59730f2eb622fa39d462610f0c50
2021-02-16 23:54:29 +00:00
Treehugger Robot b913011777 Merge changes from topic "mkboot"
* changes:
  prebuilt_etc is OutputFileProducer
  Revert "`data` dependency of java_test_host can be arch-specific"
2021-02-16 23:27:32 +00:00
Sasha Smundak b0addafd93 Limit the number of the Java source files in a single compilation unit
KYTHE_JAVA_SOURCE_BATCH_SIZE environment variable controls this setting.
The limit is 1000 if this variable is not set.

Fixes: 179932118
Test: run prebuilts/build-tools/build-prebuilts.sh, use it to build kzips, check
Change-Id: I9ad57dfd1d2c2dce5cff755b1bd61cf933420bd3
2021-02-16 15:14:52 -08:00
Liz Kammer a6487c3e9d Merge "Omit bazel.LabelList attrs if no path is specified" am: 2f2b0d4c05
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590692

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3640ad908e581f112366b43fb778a35df1195a40
2021-02-16 23:14:04 +00:00
Rupert Shuttleworth 54e7841b90 Add cc_library_headers support to bp2build.
Test: Added cc_conversion_test.go.
Change-Id: Id4459d2c2fa02687a374cd9fb25d687e9678218c
2021-02-16 23:07:01 +00:00
Liz Kammer 2f2b0d4c05 Merge "Omit bazel.LabelList attrs if no path is specified" 2021-02-16 22:42:24 +00:00
Elliott Hughes 9be8ed2681 Merge "Rename __ANDROID_UNGUARDED_AVAILABILITY__ -> __ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__." am: 9f53de289e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1584291

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87a7ff19f25be71581906abc77774b6cd2387995
2021-02-16 22:06:26 +00:00
Elliott Hughes 9f53de289e Merge "Rename __ANDROID_UNGUARDED_AVAILABILITY__ -> __ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__." 2021-02-16 21:26:12 +00:00
Liz Kammer ebfcf672ef Omit bazel.LabelList attrs if no path is specified
Test: go test build_conversion_test.go
Change-Id: Ibcd81049788e99422569fe74e5f3834df4a05122
2021-02-16 15:00:05 -05:00
Paul Duffin bf069dad5a Allow explicitly specified additional annotations for hiddenapi am: 031d8693b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1587494

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia19ec47e1a39d365658c0e583b97f2c63d246c31
2021-02-16 18:25:38 +00:00
Paul Duffin 2c36f24082 Sort hiddenapi monolithic files by signature
Adds a new --key_field option to merge_csv.py which specifies the name
of the field that should be used to sort the input. If specified it
causes that field to be the first in each row and performs the merge
operation of a merge sort on the input files. That assumes that each
input file is already sorted into the same order.

Modifies the rules that use merge_csv.py to pass in:
    --key_field signature
to sort the rows by signature.

Bug: 180387396
Test: Verified that hiddenapi files (both aggregated ones and for the
      individual modules) are not affected by this change other than
      changing the order.
Change-Id: Idcd5f0fea373b520b604889e1c280f21ed495660
2021-02-16 17:38:08 +00:00
Paul Duffin 82b3fcf123 Remove duplicates in monolithic hidden API files
Previously, multiple APEX variants of some boot jars were being
processed by hiddenapi to extract information which resulted in
duplicate entries in the monolithic hidden API files.

This change applies the same filter that was previously used to ensure
that the hiddenapi-flags.csv file did not include any duplicates to all
sources of hidden API information.

Bug: 180102243
Test: m droid
      Verified that hiddenapi files (both aggregated ones and for the
      individual modules) are not affected by this change other than
      removing some duplicates entries.
Change-Id: I9ffc8586d5d6efea4e3440be2dfd5424790665c8
2021-02-16 13:28:26 +00:00
Paul Duffin f8f4af8f1a Remove implicit dependency from <x> -> <x>-hiddenapi
It can be removed as all implicit dependencies have been replaced with
explicit ones so it is no longer needed.

Test: m droid
      Verified that hiddenapi files (both aggregated ones and for the
      individual modules) are not affected by this change.
Change-Id: I3da5fcb3b244a295502f2cacc94a504250d4d616
2021-02-16 13:28:26 +00:00
Paul Duffin 031d8693b3 Allow explicitly specified additional annotations for hiddenapi
Adds the hiddenapi_additional_annotations to allow a library to list
the libraries that provided additional hiddenapi related annotations
for a library.

Modifies merge_csv.py so it can process multiple zip files at the same
time and uses that to merge the embedded .uau files from a module and
those it depends upon.

Bug: 180102243
Test: m droid
      Verified that hiddenapi files (both aggregated ones and for the
      individual modules) are not affected by this change.
Change-Id: I796520021c7357398a9e2a09f1029e4a578b05b3
2021-02-16 13:28:26 +00:00
Inseob Kim 0cac7b4a5b Add BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE to BoardConfig
Bug: 175526482
Test: m vendor_property_contexts after making violations
Change-Id: I489312f07e068c3c0e0b7bd6e6c49698707aa9a8
2021-02-16 20:35:17 +09:00
Inseob Kim 60c32f0102 Add PRODUCT_SHIPPING_API_LEVEL to device config
Bug: 175526482
Test: m selinux_policy
Change-Id: I040897f4bdb918aa4b1acb3539a7253640e670a3
2021-02-16 20:35:15 +09:00
Treehugger Robot 6e292d8ea7 Merge "Move sh_binary tests for bp2build into their own file." am: 7ad17bdad5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1584603

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f3eecb283c4d0dc4df68ffd41ad2da13fdb46b8
2021-02-16 10:48:36 +00:00
Jooyung Han cc60da80fb clean up hard-coded min_sdk_version (statsd)
These modules set min_sdk_version explicitly.

Bug: 158059172
Test: m nothing
Change-Id: I0dc6e22b76eb433118e3ab509440d2a16812726e
2021-02-16 19:23:42 +09:00
Treehugger Robot 7ad17bdad5 Merge "Move sh_binary tests for bp2build into their own file." 2021-02-16 09:08:30 +00:00
Jiyong Park 0671146fd0 filesystems property can be specific to arch
Some filesystems (like boot_image type) are arch-specific. This change
allows us to have filesystems property inside the arch.<arch> struct.

Bug: 178978059
Test: m
Change-Id: I09faa6186b4a3fa35f348fc0805d894b4dc27ffd
2021-02-16 06:58:57 +09:00
Jiyong Park 76a42f5c25 prebuilt_etc is OutputFileProducer
This allows us to add prebuilt_etc modules to the properties like
java_test_host.data

Bug: N/A
Test: atest VirtualizationHostTestCases
Change-Id: Id4f691ff324daa86b25f32599b62edfaebed1a7d
2021-02-16 06:58:57 +09:00
Jiyong Park 2b0e4908c2 Revert "`data` dependency of java_test_host can be arch-specific"
This reverts commit cdd9b8392d.

Reason: this doesn't work. java_test_host is a multi target module.
Therefore, `arch.<arhc>.data` is not collapsed to `data` by the arch
mutator.

Bug: N/A
Test: N/A
Change-Id: I755b06718bacfe1513f6ad1e734e5a0d0ac57cd8
2021-02-16 06:58:53 +09:00
Anton Hansson c0777462c5 Merge "Fix api_fingerprint.txt generation" am: 404adeefdc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1581731

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied96fa5c9dcb848d1c9087a888907b263a4afbf7
2021-02-15 12:04:41 +00:00