Commit Graph

50942 Commits

Author SHA1 Message Date
Treehugger Robot
c60ade12f7 Merge "Prevent systemserverclasspath_fragment from depending on prebuilts" am: a66a9f1a14 am: 1bf0694fbf am: 3f8c2360dc am: 987a1ffcd3 am: 7f7570dc91
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1818248

Change-Id: I8e4fe3d65f514e657ca604fb76c8cb26f0cd00bb
2021-09-16 12:34:34 +00:00
Paul Duffin
71dbfa173a Improve the documentation in the android/sdk.go file am: 9428970dac am: de86d8badd am: 3a31830eeb am: a76996b4b9 am: 4c321dfdbc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826228

Change-Id: I9292ca1fe40a0c1293a9f4584f7e96928552c277
2021-09-16 12:34:24 +00:00
Treehugger Robot
7f7570dc91 Merge "Prevent systemserverclasspath_fragment from depending on prebuilts" am: a66a9f1a14 am: 1bf0694fbf am: 3f8c2360dc am: 987a1ffcd3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1818248

Change-Id: I4c4aa426f5692ad3678460c46e91053205947790
2021-09-16 12:17:32 +00:00
Paul Duffin
4c321dfdbc Improve the documentation in the android/sdk.go file am: 9428970dac am: de86d8badd am: 3a31830eeb am: a76996b4b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826228

Change-Id: Ie4603e0edff863220788b768f3bb8bf5f26f465f
2021-09-16 12:17:21 +00:00
Treehugger Robot
987a1ffcd3 Merge "Prevent systemserverclasspath_fragment from depending on prebuilts" am: a66a9f1a14 am: 1bf0694fbf am: 3f8c2360dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1818248

Change-Id: I547263852f3b5aedfc26361f7cb5e79adf2d9b4b
2021-09-16 12:06:08 +00:00
Paul Duffin
a76996b4b9 Improve the documentation in the android/sdk.go file am: 9428970dac am: de86d8badd am: 3a31830eeb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826228

Change-Id: I25846f5688d5e1e57940a1b1e3c17bb7da1eae47
2021-09-16 12:06:02 +00:00
Treehugger Robot
3f8c2360dc Merge "Prevent systemserverclasspath_fragment from depending on prebuilts" am: a66a9f1a14 am: 1bf0694fbf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1818248

Change-Id: I8c8428064060bcdaa4d4921d7d50b91fdfc138d1
2021-09-16 11:48:50 +00:00
Paul Duffin
3a31830eeb Improve the documentation in the android/sdk.go file am: 9428970dac am: de86d8badd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826228

Change-Id: I60e01bd214b9c3c9692f132a4c4656437fb2134e
2021-09-16 11:48:44 +00:00
Treehugger Robot
1bf0694fbf Merge "Prevent systemserverclasspath_fragment from depending on prebuilts" am: a66a9f1a14
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1818248

Change-Id: I49ac420f4fc5b9220d1ff57b6c55a6a9d271c5d0
2021-09-16 11:35:43 +00:00
Paul Duffin
de86d8badd Improve the documentation in the android/sdk.go file am: 9428970dac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826228

Change-Id: I0ecae7204ac3657dda2c8126a1c0e1063dd7c5e2
2021-09-16 11:35:34 +00:00
Treehugger Robot
a66a9f1a14 Merge "Prevent systemserverclasspath_fragment from depending on prebuilts" 2021-09-16 11:34:03 +00:00
Paul Duffin
25322e4d98 Prevent systemserverclasspath_fragment from depending on prebuilts
When TARGET_BUILD_APPS is set then TARGET_BUILD_USE_PREBUILT_SDKS=true
which causes all java_sdk_library_import modules to be treated as
prefer:true.

That breaks the build when the systemserverclasspath_fragment's content
property references a source java_sdk_library module that has a
corresponding java_sdk_library_import prebuilt module.

This fixes the issue by marking the dependency from the
systemserverclasspath_fragment to the source module as one that must
not be replaced with a reference to the prebuilt module.

Test: - update art prebuilts to include service-art
      m TARGET_BUILD_APPS=Calendar apps_only
      - fails before, works afterwards
Bug: 199116972
Change-Id: Ia2d8ce7bb7e644336a42c901f7fb8ea50fd67909
2021-09-16 11:12:51 +01:00
Paul Duffin
1d5d1c1627 Remove unnecessary archTypeSpecificInfo.optimizableProperties() am: 05732954c6 am: 2e02cb4df7 am: 18add07503 am: 9bae0319a1 am: 70defe6b26
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826230

Change-Id: Ifa5f7ba8958d95952bde1a2138c8427c7194f5fc
2021-09-16 09:23:43 +00:00
Paul Duffin
4f428f09a9 Move setting of link type properties to linkPropertyInfo am: f68f85a3ca am: c64e43dcd3 am: b03c953d56 am: dfaa29d2ac am: 38f933cfd3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826229

Change-Id: I299a21338309638ac58e8d4bbe2ff51c69c8bd6f
2021-09-16 09:23:32 +00:00
Paul Duffin
70defe6b26 Remove unnecessary archTypeSpecificInfo.optimizableProperties() am: 05732954c6 am: 2e02cb4df7 am: 18add07503 am: 9bae0319a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826230

Change-Id: I53eaf6533290f3ded831ae442794d9953990e032
2021-09-16 09:14:39 +00:00
Paul Duffin
38f933cfd3 Move setting of link type properties to linkPropertyInfo am: f68f85a3ca am: c64e43dcd3 am: b03c953d56 am: dfaa29d2ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826229

Change-Id: Ic07967896a4e477b61ba49fa499326885e667369
2021-09-16 09:14:33 +00:00
Paul Duffin
9bae0319a1 Remove unnecessary archTypeSpecificInfo.optimizableProperties() am: 05732954c6 am: 2e02cb4df7 am: 18add07503
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826230

Change-Id: Ibf94a18357dbe248a17a895282937c07c27f5daa
2021-09-16 09:01:58 +00:00
Paul Duffin
dfaa29d2ac Move setting of link type properties to linkPropertyInfo am: f68f85a3ca am: c64e43dcd3 am: b03c953d56
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826229

Change-Id: I4387bffdb4b222dfdfdd8b4f374ad6afd64f2593
2021-09-16 09:01:53 +00:00
Paul Duffin
18add07503 Remove unnecessary archTypeSpecificInfo.optimizableProperties() am: 05732954c6 am: 2e02cb4df7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826230

Change-Id: I4e02dcba2a9883fabd85cca0d33b495733c49af8
2021-09-16 08:47:46 +00:00
Paul Duffin
b03c953d56 Move setting of link type properties to linkPropertyInfo am: f68f85a3ca am: c64e43dcd3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826229

Change-Id: I7a19cd07f22d5e55553f0deb436c1cb219a0dd9f
2021-09-16 08:47:41 +00:00
Paul Duffin
2e02cb4df7 Remove unnecessary archTypeSpecificInfo.optimizableProperties() am: 05732954c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826230

Change-Id: I1a7dca43d8d20d5545747e2ad3ca095034911167
2021-09-16 08:32:53 +00:00
Paul Duffin
c64e43dcd3 Move setting of link type properties to linkPropertyInfo am: f68f85a3ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826229

Change-Id: I9a74e301694ac151fa30b8e50e4e002aa267b964
2021-09-16 08:32:47 +00:00
Paul Duffin
9428970dac Improve the documentation in the android/sdk.go file
Makes it adhere to the go standard practice of prefixing documentation
comments with the name of the type/func/method.

Bug: 195754365
Test: m nothing
Change-Id: Idf3fe827edc9b6d67d12a99a4b27539ac938ea95
2021-09-16 09:06:50 +01:00
Paul Duffin
05732954c6 Remove unnecessary archTypeSpecificInfo.optimizableProperties()
The method is provided by an embedded type.

Bug: 195754365
Test: m nothing
Change-Id: I08ede08a393dbabf40f064befaf73ef2947380bd
2021-09-16 09:05:41 +01:00
Paul Duffin
f68f85a3ca Move setting of link type properties to linkPropertyInfo
Bug: 195754365
Test: m nothing
Change-Id: Ica90a42cd8e4a79251271164f137dcdf60b3bd55
2021-09-16 09:05:41 +01:00
Treehugger Robot
e4690a5064 Merge "Share cFlags, tidyFlags, etc. in a module" am: b1a12462a9 am: 6e5aabb91b am: 535abf1d28 am: 6aeeba8976 am: 966a8bf5db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1824024

Change-Id: Ic65c6f02aefe7bc718121490a9afa0a63dda0a94
2021-09-16 03:31:19 +00:00
Treehugger Robot
966a8bf5db Merge "Share cFlags, tidyFlags, etc. in a module" am: b1a12462a9 am: 6e5aabb91b am: 535abf1d28 am: 6aeeba8976
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1824024

Change-Id: I0358a73f68e4273c78495d5b9ab943422529be58
2021-09-16 03:17:20 +00:00
Treehugger Robot
6aeeba8976 Merge "Share cFlags, tidyFlags, etc. in a module" am: b1a12462a9 am: 6e5aabb91b am: 535abf1d28
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1824024

Change-Id: I0d46a0ca600f55208cb7d1cfeb67e03bc573ad2f
2021-09-16 03:06:04 +00:00
Treehugger Robot
535abf1d28 Merge "Share cFlags, tidyFlags, etc. in a module" am: b1a12462a9 am: 6e5aabb91b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1824024

Change-Id: If2553da817faee11fcc76c768f7ae1da44993c80
2021-09-16 02:53:11 +00:00
Treehugger Robot
6e5aabb91b Merge "Share cFlags, tidyFlags, etc. in a module" am: b1a12462a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1824024

Change-Id: Iaf6050178f9d172a5a17103504e8f081277df9cf
2021-09-16 02:35:38 +00:00
Treehugger Robot
b1a12462a9 Merge "Share cFlags, tidyFlags, etc. in a module" 2021-09-16 02:20:25 +00:00
Paul Duffin
06744426d2 Rename nativeLibInfoProperties.archType to archSubDir am: 96f1832762 am: 9f266a87a8 am: 5554ca9d07 am: 1fc4adead6 am: 17df741a42
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826227

Change-Id: I40f11de2fdb47e5893cfe27446b428a4e968b06b
2021-09-16 01:08:12 +00:00
Paul Duffin
17df741a42 Rename nativeLibInfoProperties.archType to archSubDir am: 96f1832762 am: 9f266a87a8 am: 5554ca9d07 am: 1fc4adead6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826227

Change-Id: I2b403122a344a82b65bbec7bc32ac13cdc684536
2021-09-16 00:53:31 +00:00
Paul Duffin
1fc4adead6 Rename nativeLibInfoProperties.archType to archSubDir am: 96f1832762 am: 9f266a87a8 am: 5554ca9d07
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826227

Change-Id: I8412bf89783c1e51117e802dc668238b71f2f4f7
2021-09-16 00:39:12 +00:00
Paul Duffin
5554ca9d07 Rename nativeLibInfoProperties.archType to archSubDir am: 96f1832762 am: 9f266a87a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826227

Change-Id: Ifc020e69c047ba6e30b16a33ad08f572effa82ee
2021-09-16 00:24:19 +00:00
Paul Duffin
9f266a87a8 Rename nativeLibInfoProperties.archType to archSubDir am: 96f1832762
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826227

Change-Id: If868e6df94bbb3d25d2a6a30dc0bb34ef9773c88
2021-09-16 00:09:24 +00:00
Chih-Hung Hsieh
b8082295b6 Share cFlags, tidyFlags, etc. in a module
* In builder.go, share common flags in a module.
  * This replaces the sharing of cflags/cppflags/asflags in cc.go.
  * A unit test in apex_test.go now fails and is commented out.
    It is a failing test hidden by old optimization in cc.go.
* In module.go, expand the reference variable $someflags<n>,
  or ${someflags<n>} to keep many existing unit tests work as is.
* The build.ninja size was reduced from 8.1GB to 6.2GB,
  for aosp_arm64-eng WITH_TIDY=1 USE_RBE=true,
  and from 7.5GB to 5.6GB when USE_RBE is 0.
  Content of build.ninja is also more readable and searchable.
  Read/write build.ninja times are also reduced,
  depending on disk I/O speed.

Test: make WITH_TIDY=1
Change-Id: I17f96adf4844136d52e5d40f57a19d9e290162b7
2021-09-15 16:05:41 -07:00
Pedro Loureiro
97a3d20be6 Merge "Add support for new permissions library tag attributes" 2021-09-15 17:19:29 +00:00
Paul Duffin
96f1832762 Rename nativeLibInfoProperties.archType to archSubDir
Previously, the archType field was a string not an android.ArchType and
was used as the subdirectory into which arch specific files were
copied. This renames the field to archSubDir and clarifies the usage.

Bug: 195754365
Test: m nothing
Change-Id: Id4d6de12b40ee21e41bcd8b96a0ff04eaf615a80
2021-09-15 17:59:14 +01:00
Adrian Roos
a86c5892dd Merge "Revert "Preopt APEX system server jars."" am: 79839d94c1 am: 755a09490f am: abda2b7474 am: f3f17d366e am: e50f1735b6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827535

Change-Id: I4f2a4a579b1f78eaf575742e8a489512bcc9984a
2021-09-15 15:53:18 +00:00
Adrian Roos
e50f1735b6 Merge "Revert "Preopt APEX system server jars."" am: 79839d94c1 am: 755a09490f am: abda2b7474 am: f3f17d366e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827535

Change-Id: I9e1713184dbd37c678c1dce4ab45cec2f6cf93bd
2021-09-15 15:38:47 +00:00
Adrian Roos
f3f17d366e Merge "Revert "Preopt APEX system server jars."" am: 79839d94c1 am: 755a09490f am: abda2b7474
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827535

Change-Id: I7e9a50cc4bd84a8951bf85fe3685ce253cd7f4a0
2021-09-15 15:21:19 +00:00
Adrian Roos
abda2b7474 Merge "Revert "Preopt APEX system server jars."" am: 79839d94c1 am: 755a09490f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827535

Change-Id: Iedd4451747168a23a0d39f07eb75a20def89bc6d
2021-09-15 15:08:57 +00:00
Liz Kammer
e9bd161483 Merge "Expand handling of unconverted deps in bp2build" am: 83d07a4c41 am: a191dc0520 am: e477d67f50 am: e773261327 am: 399d09ee6c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1811096

Change-Id: Ibdc36c966d69a9a6a374bcbe0ec576a0202b3f2d
2021-09-15 15:08:54 +00:00
Liz Kammer
399d09ee6c Merge "Expand handling of unconverted deps in bp2build" am: 83d07a4c41 am: a191dc0520 am: e477d67f50 am: e773261327
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1811096

Change-Id: I1955b09258bf075ca8d83f30fdb45ea6a8fccfb6
2021-09-15 14:54:50 +00:00
Adrian Roos
755a09490f Merge "Revert "Preopt APEX system server jars."" am: 79839d94c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1827535

Change-Id: I2281010a93a89b69b859272627c7eac0d7e6d3ed
2021-09-15 14:53:58 +00:00
Paul Duffin
f6e1773fbf Merge "Avoid direct access to Native_bridge_supported property" am: 5ef58a302f am: 9771209aee am: 517e3e9673 am: 98a2dd76d5 am: 8193fe77fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826226

Change-Id: I8c4d188921a474f516cb053962c8d123411759bb
2021-09-15 14:38:37 +00:00
Paul Duffin
a8d87fa548 Merge "Rename SdkMemberTypeDependencyTag to SdkMemberDependencyTag" am: c2c7f3e49b am: 063ad070c0 am: b4e6408f03 am: 529c5dc486 am: ef2376b685
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826225

Change-Id: Ic25b213481c07f9b4487b6b7c4bd4d6ebefdff4e
2021-09-15 14:38:24 +00:00
Liz Kammer
e773261327 Merge "Expand handling of unconverted deps in bp2build" am: 83d07a4c41 am: a191dc0520 am: e477d67f50
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1811096

Change-Id: I497aaadac75817de981742e6fa36c1901d8af75e
2021-09-15 14:33:01 +00:00
Adrian Roos
79839d94c1 Merge "Revert "Preopt APEX system server jars."" 2021-09-15 14:31:42 +00:00