Commit Graph

43203 Commits

Author SHA1 Message Date
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
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
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
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
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
Jooyung Han
5fe0e322e0 Merge "Interpret CRT object's min_sdk_version with ApiLevel" am: 7f6e057f23 am: e6ef49cb51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1730110

Change-Id: If582cb975947096d85dd93c2062b050ca2565af5
2021-06-09 00:51:30 +00:00
Treehugger Robot
f218e3d0c2 Merge "Handle no_libcrt in bp2build." 2021-06-09 00:48:06 +00:00
Jooyung Han
e6ef49cb51 Merge "Interpret CRT object's min_sdk_version with ApiLevel" am: 7f6e057f23
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1730110

Change-Id: I1e2f8d02978775d5997b6b569538491257873223
2021-06-09 00:30:26 +00:00
Jooyung Han
7f6e057f23 Merge "Interpret CRT object's min_sdk_version with ApiLevel" 2021-06-09 00:07:29 +00:00
Spandan Das
820930537e Merge "Port module_partition logic for RRO from Make to Soong" am: 05f1a0a795 am: 88e79319fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1726898

Change-Id: Icd1d7e6a5401f42bb4ff357b7fa1cf1e2d7a2a8c
2021-06-08 21:21:27 +00:00
Liz Kammer
d366c909ca Handle no_libcrt in bp2build.
Test: ci/bp2build.sh
Bug: 187928307
Change-Id: Ib80c4318169652b322e5d878c8784679e42f87dd
2021-06-08 17:18:22 -04:00
Spandan Das
88e79319fd Merge "Port module_partition logic for RRO from Make to Soong" am: 05f1a0a795
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1726898

Change-Id: Id93d970cb76efb3625dc0a4f1bede88f5cb4dc68
2021-06-08 21:00:38 +00:00
Liz Kammer
ef6dfea679 Only store what's used in SharedLibraryInfo
There was a reference to the static library provider, but only the
transitive static deps were used, so only store that part. Other members
were stored but unused anywhere.

Test: go test soong tests
Test: m nothing
Change-Id: I12a6b94806c052c3f0df3cab0a10f17042af1c38
2021-06-08 16:44:23 -04:00
Spandan Das
05f1a0a795 Merge "Port module_partition logic for RRO from Make to Soong" 2021-06-08 20:41:45 +00:00
TreeHugger Robot
09a62329da [automerger skipped] Merge changes I162b0f68,I1689b670,Id6d997ee,I9aae2a16 into sc-dev am: 07b438127a -s ours
am skip reason: Merged-In I162b0f68eec596274f8d98dca9d3f0500ab13f5d with SHA-1 67c17aede8 is already in history

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

Change-Id: If112b30d87a5e22ea2d175d58a8e558e335f1ecf
2021-06-08 19:49:34 +00:00
TreeHugger Robot
07b438127a Merge changes I162b0f68,I1689b670,Id6d997ee,I9aae2a16 into sc-dev
* changes:
  Don't use unsafe_ignore_missing_latest_api in TestJavaSdkLibraryDist
  Remove core_lib property from java_sdk_library
  Ignore owner property when computing java_sdk_library dist subdirectory
  Make the default java_sdk_library dist_group "unknown"
2021-06-08 19:28:20 +00:00
TreeHugger Robot
89f1646bd3 Merge "Use broader permissions when archiving files." into sc-dev am: 0d099d6e79
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14881867

Change-Id: If986f71f98d7d0108cc437d992a49d36052d12eb
2021-06-08 19:03:44 +00:00
TreeHugger Robot
0d099d6e79 Merge "Use broader permissions when archiving files." into sc-dev 2021-06-08 18:43:04 +00:00
Spandan Das
5d1b929f21 Port module_partition logic for RRO from Make to Soong
The default partition for RRO is "product/" in Make, but it was
"system/" in Soong. This CL ports the logic from Make to Soong

To implement this, a new function PathForModuleInPartitionInstall is
created that enables callers to provide the relevant partition

Bug: 158407753
Test: from build/soong, ran go test ./java
Change-Id: I05b02eae7fe57189aaad5109c26cccc5823518ef
2021-06-08 17:53:31 +00:00
Martin Stjernholm
4f5ab7add6 [automerger skipped] Remove use of fake soong.variables. am: 7e148881d0 -s ours
am skip reason: Merged-In I86327b082b61c292f18c0a6b315d9add08002832 with SHA-1 040e0443c3 is already in history

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

Change-Id: Ibd4059fb5092a88f86ded4be812b512ac732e95c
2021-06-08 17:45:51 +00:00
Colin Cross
b7b2801d19 Merge changes I162b0f68,I1689b670,Id6d997ee,I9aae2a16 am: 9eb611a3cc am: 17614fe3d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1725711

Change-Id: I1555e8d9d85065dfe36f862894e862eeecd70b05
2021-06-08 17:38:56 +00:00
Colin Cross
17614fe3d4 Merge changes I162b0f68,I1689b670,Id6d997ee,I9aae2a16 am: 9eb611a3cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1725711

Change-Id: I722329949ffa46687998f27ba8f8aad5a444f9ad
2021-06-08 17:18:08 +00:00
Colin Cross
7104aae119 Don't use unsafe_ignore_missing_latest_api in TestJavaSdkLibraryDist
Use FixtureWithLastReleaseApis to create the necessary files instead
of disabling the check with unsafe_ignore_missing_latest_api.

Bug: 186723288
Test: TestJavaSdkLibraryDist
Change-Id: I162b0f68eec596274f8d98dca9d3f0500ab13f5d
Merged-In: I162b0f68eec596274f8d98dca9d3f0500ab13f5d
(cherry picked from commit 67c17aede8)
2021-06-08 10:17:58 -07:00
Colin Cross
ea0e69897e Remove core_lib property from java_sdk_library
Its not used, remove it.

Bug: 186723288
Test: TestJavaSdkLibraryDist
Change-Id: I1689b670a8ae6a614e5e4ec5e79cb5e283b2e277
Merged-In: I1689b670a8ae6a614e5e4ec5e79cb5e283b2e277
(cherry picked from commit f0eace9eed)
2021-06-08 10:17:58 -07:00
Colin Cross
1072a71089 Ignore owner property when computing java_sdk_library dist subdirectory
The owner property is no longer used, the dist subdirectory is determined
by the dist_group property.

Bug: 186723288
Test: TestJavaSdkLibraryDist
Change-Id: Id6d997eef05f6511070677974219674f248cb754
Merged-In: Id6d997eef05f6511070677974219674f248cb754
(cherry picked from commit 59b92bfdb3)
2021-06-08 10:17:58 -07:00
Colin Cross
0f9eeb753d Make the default java_sdk_library dist_group "unknown"
Change the default dist_group from "android" to "unknown" to prevent
accidentally including java_sdk_library stubs that do not set
dist_group or owner in the public SDK.

Bug: 186723288
Test: TestJavaSdkLibraryDist
Change-Id: I9aae2a16254ac1a8d444acfa63bc571d1ef4b045
Merged-In: I9aae2a16254ac1a8d444acfa63bc571d1ef4b045
(cherry picked from commit 3dd662509d)
2021-06-08 10:17:58 -07:00
Colin Cross
9eb611a3cc Merge changes I162b0f68,I1689b670,Id6d997ee,I9aae2a16
* changes:
  Don't use unsafe_ignore_missing_latest_api in TestJavaSdkLibraryDist
  Remove core_lib property from java_sdk_library
  Ignore owner property when computing java_sdk_library dist subdirectory
  Make the default java_sdk_library dist_group "unknown"
2021-06-08 17:02:59 +00:00
Martin Stjernholm
7e148881d0 Remove use of fake soong.variables.
Use the --soong-only flag instead to create it the proper way with the
config make step. This fixes build problems arising from the incomplete
soong.variables settings.

This partially relands https://r.android.com/1535202 so that we'll use
TARGET_PRODUCT=mainline_sdk in module SDK builds everywhere.
build-aml-prebuilts.sh isn't removed completely because we still need
the special case to create build_number.txt.

Cherry-picked from https://r.android.com/1729335.

Test: art/build/build-art-module.sh --skip-apex && \
      packages/modules/ArtPrebuilt/update-art-module-prebuilts.py \
        --local-dist out/dist
  then check that the created prebuilt dex2oatd64 runs with the repro
  in b/190194345
Test: build/soong/scripts/build-mainline-modules.sh
  then
      prebuilts/runtime/mainline/update.py --local-dist .../out/dist
  in a master-art tree and check that art/build/build-art-module.sh
  works there
Bug: 190194345
Bug: 174315599
Change-Id: I86327b082b61c292f18c0a6b315d9add08002832
Merged-In: I86327b082b61c292f18c0a6b315d9add08002832
2021-06-08 16:33:06 +01:00
satayev
b75cd4ed7a Add exemption for framework-sdkextensions-classpaths boot jar.
As long as we have boot jars defined in make, we should try to keep
global.UpdatableBootJars as a source of truth when it comes to classpath
configuration. However, for testing purposes there is a need to add
java libraries to bootclasspath that aren't present in
PRODUCT_UPDATABLE_BOOT_JARS variable.

Ideally, we would unconditionally add all contents to the config for
test apexes, however, I don't fully understand apex merging to support
it.

Bug: 180105615
Test: atest sdkextensions_classpaths_e2e_tests
Change-Id: I552f93289c27b3713e75dcda1faed909b0bfcef2
Merged-In: I552f93289c27b3713e75dcda1faed909b0bfcef2
(cherry picked from commit 1b75a3ce62)
2021-06-08 15:29:19 +01:00
Martin Stjernholm
e0fd6e4a84 Merge "Remove use of fake soong.variables." am: 81b90d98db am: 8aa274852c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1729335

Change-Id: I888b948ff3758e6129a5b5a14d1d610de827d7de
2021-06-08 14:26:09 +00:00
satayev
78a1e09641 Merge "Add exemption for framework-sdkextensions-classpaths boot jar." am: 5831f70dab am: 145638f4ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1728118

Change-Id: I0e58b5e01b4454a9095c8b06629a5c0719fbec01
2021-06-08 14:25:58 +00:00
Martin Stjernholm
8aa274852c Merge "Remove use of fake soong.variables." am: 81b90d98db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1729335

Change-Id: I142327d7dec9a60bc5ea169029804f27369f3d6f
2021-06-08 14:06:05 +00:00
satayev
145638f4ab Merge "Add exemption for framework-sdkextensions-classpaths boot jar." am: 5831f70dab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1728118

Change-Id: I4c3bc30baf8d0ffaba71b6d2ba7a177dcd0273ff
2021-06-08 14:05:13 +00:00
Martin Stjernholm
81b90d98db Merge "Remove use of fake soong.variables." 2021-06-08 13:55:35 +00:00
satayev
5831f70dab Merge "Add exemption for framework-sdkextensions-classpaths boot jar." 2021-06-08 13:45:56 +00:00
Martin Stjernholm
040e0443c3 Remove use of fake soong.variables.
Use the --soong-only flag instead to create it the proper way with the
config make step. This fixes build problems arising from the incomplete
soong.variables settings.

This partially relands https://r.android.com/1535202 so that we'll use
TARGET_PRODUCT=mainline_sdk in module SDK builds everywhere.
build-aml-prebuilts.sh isn't removed completely because we still need
the special case to create build_number.txt.

Test: art/build/build-art-module.sh --skip-apex && \
      packages/modules/ArtPrebuilt/update-art-module-prebuilts.py \
        --local-dist out/dist
  then check that the created prebuilt dex2oatd64 runs with the repro
  in b/190194345
Test: build/soong/scripts/build-mainline-modules.sh
  then
      prebuilts/runtime/mainline/update.py --local-dist .../out/dist
  in a master-art tree and check that art/build/build-art-module.sh
  works there
Bug: 190194345
Bug: 174315599
Change-Id: I86327b082b61c292f18c0a6b315d9add08002832
2021-06-08 11:36:53 +01:00