Commit Graph

43234 Commits

Author SHA1 Message Date
Paul Duffin
40d0145d29 Merge "Move TestPlatformBootclasspath_Fragments to apex package" am: 2eddb50fd5 am: 0d2a3ad17d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1731416

Change-Id: I3299f527aa8cc365784db1ecc15e83bc6889b3b3
2021-06-11 05:07:04 +00:00
Paul Duffin
3ee5a03b25 Merge "Export hidden api related types and fields" am: 5e1073b7cd am: a6752bb7ed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1731415

Change-Id: Ie5cebc487b4954c8b5d0edc6b389d47006799227
2021-06-11 05:06:54 +00:00
Paul Duffin
0d2a3ad17d Merge "Move TestPlatformBootclasspath_Fragments to apex package" am: 2eddb50fd5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1731416

Change-Id: Ia1f9004d5f214aff94012f95dcaaa840a4babac9
2021-06-11 04:50:29 +00:00
Paul Duffin
a6752bb7ed Merge "Export hidden api related types and fields" am: 5e1073b7cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1731415

Change-Id: I3a24d55d95460bbebb7378411d8b5d449ffce628
2021-06-11 04:49:38 +00:00
Paul Duffin
2eddb50fd5 Merge "Move TestPlatformBootclasspath_Fragments to apex package" 2021-06-11 04:40:04 +00:00
Paul Duffin
5e1073b7cd Merge "Export hidden api related types and fields" 2021-06-11 04:39:05 +00:00
Colin Cross
9b5a7bb334 Merge "Always propagate some environment variables to RBE" am: 7b4bda29fc am: 20a0efc544
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1732493

Change-Id: I4c086ba58dafd2caadb1b02035a0b3d83222a4bc
2021-06-10 16:29:04 +00:00
Yuntao Xu
55ec347068 Merge "Support LOCAL_CERTIFICATE_LINEAGE for androidmk" am: 7a93bffd76 am: bdafba2af6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1729631

Change-Id: I54627510a591dededf935246b1eb17c16cf110b1
2021-06-10 16:28:06 +00:00
Nikita Ioffe
0f02adec5e Merge "Rename test_only_no_hashtree to generate_hashtree" into sc-dev am: dce0713739
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14920581

Change-Id: If41297bae4bff155224fe9c13d704c615fec3ac0
2021-06-10 16:27:25 +00:00
Colin Cross
20a0efc544 Merge "Always propagate some environment variables to RBE" am: 7b4bda29fc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1732493

Change-Id: I378f28c316327166becefd16ca7d3c10a2438f0c
2021-06-10 16:15:39 +00:00
Yuntao Xu
bdafba2af6 Merge "Support LOCAL_CERTIFICATE_LINEAGE for androidmk" am: 7a93bffd76
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1729631

Change-Id: I1f678ccdb63ebb02bfb8acff8ef43d404f4e61d5
2021-06-10 16:13:57 +00:00
Nikita Ioffe
dce0713739 Merge "Rename test_only_no_hashtree to generate_hashtree" into sc-dev 2021-06-10 16:11:38 +00:00
Colin Cross
7b4bda29fc Merge "Always propagate some environment variables to RBE" 2021-06-10 15:57:22 +00:00
Yuntao Xu
7a93bffd76 Merge "Support LOCAL_CERTIFICATE_LINEAGE for androidmk" 2021-06-10 15:57:17 +00:00
Jingwen Chen
5f59dffa94 Merge "bp2build: support strip properties." am: 62d8b1ed43 am: a0bc3f955e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1730118

Change-Id: I7848e7863282f6a86b3433e814aa147202f42c95
2021-06-10 14:11:45 +00:00
Liz Kammer
31c01261b0 Merge "Handle simple symlinks in mixed builds" am: 6ae5658387 am: 7bd07b7193
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1729716

Change-Id: I6ab03b47886a331aef16baa8eec1157cafbb0815
2021-06-10 14:11:33 +00:00
Jingwen Chen
a0bc3f955e Merge "bp2build: support strip properties." am: 62d8b1ed43
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1730118

Change-Id: I78615ca55f489feaeb648557e684904c808aaa88
2021-06-10 13:50:22 +00:00
Liz Kammer
7bd07b7193 Merge "Handle simple symlinks in mixed builds" am: 6ae5658387
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1729716

Change-Id: I362915f928012498f9d215590a54c2f2cca5021e
2021-06-10 13:49:22 +00:00
Jingwen Chen
62d8b1ed43 Merge "bp2build: support strip properties." 2021-06-10 13:36:13 +00:00
Liz Kammer
6ae5658387 Merge "Handle simple symlinks in mixed builds" 2021-06-10 13:35:13 +00:00
Anton Hansson
0e328ece5a [automerger skipped] Merge changes from topic "met-html" into sc-dev am: e7db515506 -s ours
am skip reason: Merged-In I80ec219cb9ef8922094336a5d45652c8e59aa113 with SHA-1 556e8149cb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14919073

Change-Id: If67cac552aa8931da88835e93153f7a99236ba67
2021-06-10 12:36:49 +00:00
Anton Hansson
e7db515506 Merge changes from topic "met-html" into sc-dev
* changes:
  Remove sourcepath argument from metalava invocations
  Stop filtering html files from droidstubs input
2021-06-10 12:22:17 +00:00
Paul Duffin
e89bca33be Maintain header order in merge_csv am: 84c1cdf31f am: 95d8ad47f0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1731412

Change-Id: Ib52bb2a863cc4ee5718a3a3abc6c97f524510fd3
2021-06-10 12:07:26 +00:00
Paul Duffin
95d8ad47f0 Maintain header order in merge_csv am: 84c1cdf31f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1731412

Change-Id: I593e0e23c166a1752c5419637579718b6a894232
2021-06-10 11:51:33 +00:00
Paul Duffin
ffa8375f07 Move TestPlatformBootclasspath_Fragments to apex package
This test checks that fragments which are referenced from a
platform_bootclasspath module contribute their hidden API flags to those
used by platform_bootclasspath module. Previously, it was unrealistic
because the bootclasspath_fragment does not belong in an APEX.

This change moves the test from the java package to the apex package to
allow it to be modified to make the bootclasspath_fragment part of an
apex.

Bug: 179354495
Test: m nothing
Change-Id: Icb57f2e1eaea4b14aab5f47f3af7d05ea0555816
2021-06-10 12:36:43 +01:00
Paul Duffin
524c82c01a Export hidden api related types and fields
This will export some hidden api related types and fields so they can
be used from outside the java package. This is needed to allow a follow
up change to move the TestPlatformBootclasspath_Fragments from the java
to the apex package.

Bug: 179354495
Test: m nothing
Change-Id: Ib69eea9d79cc83b8e3fc29919a29f071e1ec17b5
2021-06-10 12:36:43 +01:00
TreeHugger Robot
9414cb6417 [automerger skipped] Merge "Add exemption for framework-sdkextensions-classpaths boot jar." into sc-dev am: f524f1f957 -s ours
am skip reason: Merged-In I552f93289c27b3713e75dcda1faed909b0bfcef2 with SHA-1 1b75a3ce62 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14881548

Change-Id: Ia9e77b1078dd3a47f09199ee35db23d73126060c
2021-06-10 10:57:10 +00:00
TreeHugger Robot
f524f1f957 Merge "Add exemption for framework-sdkextensions-classpaths boot jar." into sc-dev 2021-06-10 10:40:52 +00:00
Jingwen Chen
3d383bbeb9 bp2build: support strip properties.
This CL adds support to bp2build for generating all strip-related
properties into a strip dictionary as a parameter in the cc_library
macro.

With the dictionary, it's easy to organize related attributes and
directly expand into a stripped_shared_library's attributes.

Test: //build/bazel/tests/bionic:compare_libc_stripping
Test: TH
Fixes: b/187928597
Change-Id: Ifea68d48fe295e71a43b12876cb168c475a62187
2021-06-10 05:22:50 +00:00
Colin Cross
95fad7a56e Always propagate some environment variables to RBE
Always propagate LANG, LC_MESSAGES and PYTHONDONTWRITEBYTECODE
to RBE to get more consistent behavior between local actions and
RBE.

Bug: 182415460
Bug: 190593001
Test: treehugger
Change-Id: I726e6f02fd3ef77e158baf6fde77ffb7247a1375
2021-06-09 15:05:40 -07:00
Nikita Ioffe
da6dc31389 Rename test_only_no_hashtree to generate_hashtree
In order not to introduce any changes in the system image default value
of generate_hashtree is currently set to false. Once all the APEXes that
shouldn't have hashtree enable (i.e. non-updatable ones) explicitly set
`generate_hashtree: false` default value will be switched to true.

Test: checked that are no diffs between ${OUT}/system/apex without this
  change and with this change.
Test: m
Bug: 190621617
Change-Id: I5a3144f8f6ea7dee25678af43e2b07a8c85daa9e
2021-06-09 19:43:46 +01:00
Liz Kammer
c49e682f37 Handle simple symlinks in mixed builds
Bug: 180945121
Test: build/bazel/ci/mixed_libc.sh
Change-Id: I49fba569a41dcb8cd4c2e58560817443697f58f1
2021-06-09 10:40:32 -04:00
Paul Duffin
84c1cdf31f Maintain header order in merge_csv
Previously, if the --header property was not specified then merge_csv
would use a header constructed by sorting all the fields in the input
files. That required that any use of merge_csv which did not already
have headers in the required order would have to explicitly specify the
headers. That made it harder to use merge_csv as a generic tool as each
invocation needed to be aware of what headers were exported in the
output.

This change causes merge_csv to simply use the headers in the order in
which they are encountered in the input files. That removes the need to
specify the --header option when generating the index files.

Bug: 179354495
Test: m out/soong/hiddenapi/hiddenapi-index.csv out/soong/hiddenapi/hiddenapi-unsupported.csv
      - make sure that they are not changed by this change.
Change-Id: I420b7d07aea85af6372cd7580a8be5e2cc82a513
2021-06-09 14:02:03 +01:00
Anton Hansson
363aae4343 Remove sourcepath argument from metalava invocations
This is no longer required to find package.html files, so remove it.

Bug: 153703940
Test: m checkapi
Merged-In: I80ec219cb9ef8922094336a5d45652c8e59aa113
Change-Id: I80ec219cb9ef8922094336a5d45652c8e59aa113
(cherry picked from commit 556e8149cb)
2021-06-09 13:55:13 +01:00
Anton Hansson
701857903a Stop filtering html files from droidstubs input
Metalava now expects html files to be specified explicitly. This
filtering was originally added because jdiff could not cope with html
inputs, but jdiff support has been removed in r.android.com/1455335.

Bug: 153703940
Test: m checkapi
Merged-In: I34164b633bab2892e3a1c0fd0257fcf98d537655
Change-Id: I34164b633bab2892e3a1c0fd0257fcf98d537655
(cherry picked from commit edd61643be)
2021-06-09 13:54:38 +01:00
Jooyung Han
664c8c3d8c [automerger skipped] Merge "Interpret CRT object's min_sdk_version with ApiLevel" into sc-dev am: f8b55cd51e -s ours
am skip reason: Merged-In Ia45f5c7aeb4efcd8daef1deaf54f333dcdd1379d with SHA-1 94a76ee868 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14909711

Change-Id: I1cf59ad29cc27b005be25f4f33c72922bdefb807
2021-06-09 11:42:59 +00:00
Jooyung Han
f8b55cd51e Merge "Interpret CRT object's min_sdk_version with ApiLevel" into sc-dev 2021-06-09 11:18:11 +00:00
Yi-yo Chiang
4944095dce [automerger skipped] Merge "cc/sabi.go: Propagate ShouldCreateSourceAbiDump to reuseObjTag deps" into sc-dev am: ff9f8c535d -s ours
am skip reason: Merged-In I015328d74acbeb89ff7622397e59b68864af34a4 with SHA-1 21d1c6d637 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14890757

Change-Id: I2260aa20bd85b21c7879f17ace45cb28bbac5cbb
2021-06-09 09:14:04 +00:00
Yi-yo Chiang
ff9f8c535d Merge "cc/sabi.go: Propagate ShouldCreateSourceAbiDump to reuseObjTag deps" into sc-dev 2021-06-09 08:56:02 +00:00
Jingwen Chen
15ca5c0c2f Merge "bp2build: build libc.so." am: a4d9b86c8b am: 1d6904e37d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1726611

Change-Id: I974edfaebbb230c6b73bd1a7c25018011564e592
2021-06-09 08:33:24 +00:00
Jingwen Chen
1d6904e37d Merge "bp2build: build libc.so." am: a4d9b86c8b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1726611

Change-Id: Ibc1397d23f3b033507caf6540b4b38db817b951b
2021-06-09 08:21:14 +00:00
Jingwen Chen
a4d9b86c8b Merge "bp2build: build libc.so." 2021-06-09 08:05:20 +00:00
Treehugger Robot
5faeb84578 Merge "Only store what's used in SharedLibraryInfo" am: 75851d2fb6 am: f026cd57df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1730553

Change-Id: Idf171918e8f346c780069806343012d90c0b1106
2021-06-09 06:24:26 +00:00
Treehugger Robot
f026cd57df Merge "Only store what's used in SharedLibraryInfo" am: 75851d2fb6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1730553

Change-Id: I9ef1100bc430cffaa4d44f8a906ee7f41ec4c16b
2021-06-09 06:06:23 +00:00
Treehugger Robot
75851d2fb6 Merge "Only store what's used in SharedLibraryInfo" 2021-06-09 05:49:15 +00:00
Jingwen Chen
e8489563ff bp2build: build libc.so.
Test: TH

Bug: 183064430
Change-Id: Idfcf80b2415c23840d4b4ae9b826cf6f061dbef3
2021-06-09 05:33:40 +00:00
Yuntao Xu
8d87cb0bee Support LOCAL_CERTIFICATE_LINEAGE for androidmk
Added the support of `LOCAL_CERTIFICATE_LINEAGE` for the mk2bp
conversion tool `androidmk`.

Bug: 185169879
Test: rum 'm androidmk'
Test: TreeHugger
Change-Id: I7e89e60be4be26833cac13c911a9b38284a47301
2021-06-08 20:00:47 -07:00
Treehugger Robot
bac2e29460 Merge "Handle no_libcrt in bp2build." am: f218e3d0c2 am: b8e15e1efa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1726896

Change-Id: I1fbe8b04e803f9c70a31ac28ea4a8109a07ca8de
2021-06-09 01:27:09 +00:00
Treehugger Robot
b8e15e1efa Merge "Handle no_libcrt in bp2build." am: f218e3d0c2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1726896

Change-Id: I151f5b6cf987596515fb477419b150795f94cc22
2021-06-09 01:06:43 +00:00
Jooyung Han
37c219a1ec Interpret CRT object's min_sdk_version with ApiLevel
min_sdk_version values should be interpreted before use.

Bug: 171506470
Bug: n/a
Test: m (in REL)
Merged-In: Ia45f5c7aeb4efcd8daef1deaf54f333dcdd1379d
Change-Id: Ia45f5c7aeb4efcd8daef1deaf54f333dcdd1379d
(cherry picked from commit 94a76ee868)
2021-06-09 09:53:53 +09:00