Commit Graph

38196 Commits

Author SHA1 Message Date
Colin Cross
95f1bfaae3 Merge "Add TestArchProperties" am: 4e1d5dd083
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773051

Change-Id: If3fe0312692d4bb608d6de51076b35d1f3ff7e91
2021-07-23 00:22:27 +00:00
Colin Cross
bf2f93f8e8 Merge "Replace android.BuildOs with Config.BuildOS" am: 78fd15f7d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773108

Change-Id: I9f16a9e6fda40df8fcb54e98aa54866cec734a2c
2021-07-23 00:21:58 +00:00
Colin Cross
4e1d5dd083 Merge "Add TestArchProperties" 2021-07-23 00:07:14 +00:00
Colin Cross
78fd15f7d6 Merge "Replace android.BuildOs with Config.BuildOS" 2021-07-23 00:07:01 +00:00
Treehugger Robot
75c2ca900e Merge "Apply system_shared_libs to all variants" am: 2e4c0eb90e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1765126

Change-Id: I424b82244e59b467056ecf7c10850013d545fc1f
2021-07-22 18:28:57 +00:00
Treehugger Robot
2e4c0eb90e Merge "Apply system_shared_libs to all variants" 2021-07-22 17:44:32 +00:00
Ulyana Trafimovich
fc3bd32ec9 Merge "manifest_check.py: trim namespace part of the module, if needed." am: be67b7a7eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1772625

Change-Id: I877b1943d5ad37532c3e44797ff668e57051b591
2021-07-22 09:29:36 +00:00
Ulyana Trafimovich
be67b7a7eb Merge "manifest_check.py: trim namespace part of the module, if needed." 2021-07-22 09:12:25 +00:00
Kiyoung Kim
6a7257a450 Merge changes I3574d2a1,Ifb69fb3d am: 5d96f64d04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1771025

Change-Id: I5cc5f418e72895940c9a1f10004ab19b95d19012
2021-07-22 01:13:26 +00:00
Kiyoung Kim
5d96f64d04 Merge changes I3574d2a1,Ifb69fb3d
* changes:
  Update prebuilt_etc available for snapshot
  Separate snapshot definition
2021-07-22 00:57:39 +00:00
Treehugger Robot
fe324bea73 Merge "AOSP Music to bazel: path added to bazel.go" am: f8de870f4c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773505

Change-Id: Id30458718d4ac150dc501c7de4df3d370aa65678
2021-07-21 21:57:06 +00:00
Treehugger Robot
f8de870f4c Merge "AOSP Music to bazel: path added to bazel.go" 2021-07-21 21:42:48 +00:00
Liz Kammer
9919c2ea1a Add deps for system_shared_libs for all axes am: 561923e10d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1774005

Change-Id: I8c94c1b42c81efd43319a439a7e9042d3f125c4d
2021-07-21 17:41:17 +00:00
Liz Kammer
561923e10d Add deps for system_shared_libs for all axes
This is the same hack we have currently, but applying it to the various
axes to unblock a Soong/bionic refactoring CL.

Test: bp2build.sh
Change-Id: Ie068461201bb3c18b9f385026e96cca2c7fe6b97
2021-07-21 10:15:56 -04:00
Paul Duffin
916f3b6bb1 Merge "Remove unnecessary dedup logic" am: 719371072f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1772631

Change-Id: Idb494ba7c00500fac16a1acd562db317bb859326
2021-07-21 11:20:49 +00:00
Paul Duffin
b4186d80f1 Merge "Remove unnecessary handling of nil paths in HiddenAPIOutput" am: 38788dce43
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1772630

Change-Id: I1344ff9c9804e9c6221348171a6bf44ce679ccde
2021-07-21 11:20:44 +00:00
Paul Duffin
b008abf0c8 Merge "Remove fallback to classes jars from bootclasspath_fragment" am: 880a3971a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1772629

Change-Id: Ia42ff419111096a1467735a697a2454be5049762
2021-07-21 11:20:19 +00:00
Paul Duffin
719371072f Merge "Remove unnecessary dedup logic" 2021-07-21 11:03:09 +00:00
Paul Duffin
38788dce43 Merge "Remove unnecessary handling of nil paths in HiddenAPIOutput" 2021-07-21 11:02:55 +00:00
Paul Duffin
880a3971a6 Merge "Remove fallback to classes jars from bootclasspath_fragment" 2021-07-21 11:02:32 +00:00
Hsin-Yi Chen
28bca125df Merge "Specify working directory and OUT_DIR to ABI tools" am: 1f019f945d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1760699

Change-Id: I57044e5741223b1963c4923f6f8c6394b6080ebb
2021-07-21 07:32:55 +00:00
Hsin-Yi Chen
1f019f945d Merge "Specify working directory and OUT_DIR to ABI tools" 2021-07-21 07:19:13 +00:00
Treehugger Robot
9f354c8694 Merge "apex: pass --align-file-size to signapk" am: c30a4c3f3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1762581

Change-Id: I1d9b70cfc74d3933795d33ece9f2dd19ad0b904c
2021-07-21 00:36:26 +00:00
Treehugger Robot
c30a4c3f3c Merge "apex: pass --align-file-size to signapk" 2021-07-21 00:23:08 +00:00
Colin Cross
34c32fabea Add TestArchProperties
Add a test that verifies appropriate arch properties are squashed
into each variant.

Test: TestArchProperties
Change-Id: I4a5044f3b2b3ca0a51dc457dec7157411ebad7e3
2021-07-20 16:46:30 -07:00
Paul Duffin
6e9bc01b97 Remove unnecessary dedup logic
The CreateClasspathElements function makes sure that each standalone
library and bootclasspath_fragment on the platform bootclasspath
appear once and once only and each file extracted is unique to the
module so there is no chance that any duplicate files will be used.

Bug: 194063708
Test: m out/soong/hiddenapi/hiddenapi-flags.csv
      - check that this does not change the contents.
Change-Id: I60c02baa4d179293ee0f305375afaa3a8c98e112
2021-07-20 22:02:44 +01:00
Paul Duffin
ed12c132c3 Remove unnecessary handling of nil paths in HiddenAPIOutput
Previously, bootclasspath_fragment modules could produce
HiddenAPIOutput structs containing nil paths. That is no longer
possible as both source and prebuilt bootclasspath_fragment modules
always provide non-nil paths so this change removes the special
handling.

Bug: 194063708
Test: m out/soong/hiddenapi/hiddenapi-flags.csv
      - check that this does not change the contents.
Change-Id: I15337e146c9e694ce9da06ad4845ac267d6da27a
2021-07-20 22:02:44 +01:00
Paul Duffin
d6a072b39d Remove fallback to classes jars from bootclasspath_fragment
Previously, the hidden API processing performed by the
platform_bootclasspath would try and get flag files from the fragments
it references but would fall back to the classes jars. This change
removes that logic as it is no longer needed as all fragments, both
source and prebuilts, provide flag files and the prebuilts no longer
provide valid classes jars.

Bug: 194063708
Test: m out/soong/hiddenapi/hiddenapi-flags.csv
      - check that this does not change the contents.
Change-Id: Ib867a08508f5a0f8858f6baedebbe99b6a825f80
2021-07-20 22:02:44 +01:00
Damian Patel
8b22219066 AOSP Music to bazel: path added to bazel.go
In order to reconcile the mixed builds between
Soong and Bazel, the path for the AOSP Music
BUILD file must be added to the bp2buildKeepExistingBuildFile
map.

Change-Id: Ib895d0f4a09502da2d33fc673026d91269b4d086
2021-07-20 20:41:14 +00:00
Treehugger Robot
70d39ce053 Merge "Require prebuilt_bootclasspath_fragment to provide hidden API files" am: 41461f3660
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1772628

Change-Id: Ifa8954f2cccc25f13253e418985fd6bb0b1d4bcc
2021-07-20 20:25:55 +00:00
Treehugger Robot
93ece5b8e2 Merge changes I343712d7,Ic076ea85 am: 9c01fc686d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1772627

Change-Id: I0cabbe9085312e212674651fad6587d2ecdd5b77
2021-07-20 20:25:47 +00:00
Treehugger Robot
41461f3660 Merge "Require prebuilt_bootclasspath_fragment to provide hidden API files" 2021-07-20 20:03:40 +00:00
Treehugger Robot
9c01fc686d Merge changes I343712d7,Ic076ea85
* changes:
  Improve hidden API checking in TestBootDexJarsFromSourcesAndPrebuilts
  Add target for generate_hiddenapi_lists_test
2021-07-20 20:03:32 +00:00
Colin Cross
0c66bc615b Replace android.BuildOs with Config.BuildOS
Replace the android.BuildOs constant with Config.BuildOS so that it
can vary based on the product config.

Bug: 190084016
Test: all Soong tests
Change-Id: Ia67f872d8b2ab788747a22e3a9659dc21c9775cd
2021-07-20 12:46:48 -07:00
Paul Duffin
54e4197da1 Require prebuilt_bootclasspath_fragment to provide hidden API files
Previously, the prebuilt_bootclasspath_fragment was not required to
provide hidden API files as not all usages of that module provided
them. That should no longer be the case so this change makes the
prebuilt_bootclasspath_fragment stricter and so now always require
them.

Bug: 194063708
Test: m out/soong/hiddenapi/hiddenapi-flags.csv
      - check that this does not change the contents.
Change-Id: I3f19a1b4246f09a927c0f6b0f41b8678150d6cc2
2021-07-20 19:18:13 +01:00
Paul Duffin
40a3f65430 Improve hidden API checking in TestBootDexJarsFromSourcesAndPrebuilts
Previously, the test only checked how the intermediate index file was
created from class jars. This change also checks how the monolithic
index file was created from the intermediate index file and the index
files generated from each bootclasspath_fragment.

At the moment the checks reveal that the monolithic index file is
created solely from the intermediate index file. However, a follow up
change to Soong will alter the behavior of the test.

Bug: 194063708
Test: m nothing
Change-Id: I343712d7d17ab0a07f5b32226321fc6815847e1f
2021-07-20 19:17:56 +01:00
Paul Duffin
2cde5f4389 Add target for generate_hiddenapi_lists_test
atest generate_hiddenapi_lists_test would not work without setting
verbosity=2.

Bug: 194063708
Test: atest --host generate_hiddenapi_lists_test
Change-Id: Ic076ea85d58917921081ae33e72f06011c4ca49e
2021-07-20 19:17:49 +01:00
Ulya Trafimovich
1b513458b1 manifest_check.py: trim namespace part of the module, if needed.
Normally Soong does that automatically when it handles module names
specified in Android.bp properties. However not all <uses-library>
entries in the manifest correspond to real modules: some of the
optional libraries may be missing at build time. Therefor this script
accepts raw module names as spelled in Android.bp/Amdroid.mk and trims
the optional namespace part manually.

Bug: 193891722
Test: manifest_check_test.py
Test: $ lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd
      $ adb wait-for-device && \
        adb root && \
        adb logcat | \
        grep -E 'ClassLoaderContext [a-z ]+ mismatch' -C1
      # empty output, no errors

Change-Id: I184fb8a2dc26f49e90fb597ebcd6a58c00705206
2021-07-20 14:30:40 +01:00
Kiyoung Kim
ae11c233b5 Update prebuilt_etc available for snapshot
Make prebuilt_etc module available for the snapshot. This change
includes implementing snapshot interface for the prebuilt_etc module so
it can be added to the snapshot from the fake snapshot, or when the
module is specified in the list.

Bug: 192430376
Test: m nothing passed
Test: Checked if the module is included in the snapshot properly
Change-Id: I3574d2a1b8f8f4e5f083f3913e8768f5088d0c46
2021-07-20 11:24:03 +09:00
Colin Cross
eeec86e85e Merge "Remove clang indirection, affects command line ordering" am: ae86338676
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1767414

Change-Id: Ida124dffa1cc9f20345250b15c1945cbabc9d00c
2021-07-19 21:59:33 +00:00
Colin Cross
ae86338676 Merge "Remove clang indirection, affects command line ordering" 2021-07-19 21:46:52 +00:00
Treehugger Robot
c62f2deb45 Merge "Refactoring fuzz packaging code" am: 0b45f0b90f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1758711

Change-Id: I1a9771e4215eb8019f633e0cbfd0b7bf12c27f0f
2021-07-19 20:14:00 +00:00
Treehugger Robot
0b45f0b90f Merge "Refactoring fuzz packaging code" 2021-07-19 20:02:23 +00:00
Matthew Maurer
c65753b3db Merge "[rust] Add android_dylib cfg flag" am: 83a12d1f94
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1758942

Change-Id: I8d3000ea96ac8171fa7f8d75df53f332e96500c8
2021-07-19 19:56:05 +00:00
Matthew Maurer
83a12d1f94 Merge "[rust] Add android_dylib cfg flag" 2021-07-19 19:43:56 +00:00
Liz Kammer
16cca436e4 Merge "Handle target.bionic in bp2build." am: 2d8056929e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1770015

Change-Id: I222af43ce92454ed0ba4d283c8716d68d1af835c
2021-07-19 18:24:22 +00:00
Liz Kammer
2d8056929e Merge "Handle target.bionic in bp2build." 2021-07-19 18:10:24 +00:00
Liz Kammer
01a16e8275 Handle target.bionic in bp2build.
Soong supports some hand-crafted target.<type> that match multiple os or
arch types to simplify configuring for similar targets. target.bionic is
used to match on both android and linux_bionic OSes for cases where they
should be handled the same way.

Test: build/bazel/ci/bp2build.sh
Change-Id: I47b6aaf3279e4d242c4fd0e12f24117eb98e0665
2021-07-19 12:53:58 +00:00
Ulyana Trafimovich
a969203590 Merge "Remove OptionalImplicitSdkLibrary() function (it's not used anymore)." am: c2427ea290
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1769648

Change-Id: Ib3fec64464a79340aa0573b7501cce4ed37568e8
2021-07-19 10:51:30 +00:00
Ulyana Trafimovich
c2427ea290 Merge "Remove OptionalImplicitSdkLibrary() function (it's not used anymore)." 2021-07-19 10:38:45 +00:00