StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,968 Commits 1 Branch 0 Tags
eab1f7027a39fde7df48ced005d234cc3b10d0dd
Commit Graph

6035 Commits

Author SHA1 Message Date
Michael Rosenfeld
5ad155783f Extract assets from AAR imports and their dependencies. 
Bug: 188837446
Test: manual

Change-Id: I73bd5410fc7b069f727289c5d927ea48e87db6e2
 2022-01-05 01:44:20 +00:00
Jiakai Zhang
b9fcf355a1 Merge "Update dexpreopt_check to check all system server jars." am: 59571ddf67 am: 9758103119 am: 8f9664b188 am: f2d6aea0d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1930899

Change-Id: Ieb093f9c663d02f79ab92d110ff67fd2bd4d3087
 2021-12-22 22:01:41 +00:00
Pedro Loureiro
0493165fde Rename updatable-library to apex-library 
Mostly for consistency with the names used in related changes.

Test: m nothing

Bug: 191978330
Change-Id: I34637986ead1c671bcc649891aceb3fe0f44b52a
 2021-12-22 19:53:01 +00:00
Jiakai Zhang
d806dd4f1d Update dexpreopt_check to check all system server jars. 
After this change, standalone system server jars will also be checked.

Bug: 203198541
Test: m nothing
Change-Id: I80f5efe9c7f0386af175d7a37398ffa000d6ba59
 2021-12-21 12:51:36 +00:00
Treehugger Robot
71e90ca2b0 Merge "Pass --write-reference-baseline to lint" am: 430059b422 am: dd0667e31d am: beb984e0cd am: c409bf5b43 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1822276

Change-Id: Ia7422df3e1ddb300bfe439e5deb7f72a430d4766
 2021-12-21 09:45:27 +00:00
Treehugger Robot
430059b422 Merge "Pass --write-reference-baseline to lint" 2021-12-21 08:36:34 +00:00
Sorin Basca
0fc8b49bbc Merge "Adding option to include sources only for Java 11 builds" am: 55f84a74c5 am: d0ade7a7f8 am: c9b9540233 am: cae602eee3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1927441

Change-Id: Ie422105450f6a65d08aaca9c1347b914481b0669
 2021-12-21 08:36:01 +00:00
Sorin Basca
55f84a74c5 Merge "Adding option to include sources only for Java 11 builds" 2021-12-21 07:37:46 +00:00
Jiakai Zhang
31d2c1f14c Merge changes I8f4eaed1,I358a62d3 am: 880e11112d am: 02d1c10b3a am: 58fe40abc1 am: 3a3250f40e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1928068

Change-Id: Ie325fa547912fd6618a50b463f40b7a1028047e1
 2021-12-20 21:36:09 +00:00
Sorin Basca
9347ae3ba0 Adding option to include sources only for Java 11 builds 
Bug: 207852002
Test: m
Test: EXPERIMENTAL_TARGET_JAVA_VERSION_11=true m
Change-Id: I554a79798ea7f1dd4a96b09f761090f83a009cb4
 2021-12-20 21:33:14 +00:00
Jiakai Zhang
880e11112d Merge changes I8f4eaed1,I358a62d3 
* changes:
  Dexpreopt standalone system server jars from prebuilts.
  Dexpreopt standalone system server jars.
 2021-12-20 19:52:37 +00:00
Jiakai Zhang
28bc9a8a7e Dexpreopt standalone system server jars from prebuilts. 
This change adds support for dexpreopting standalone system server
jars from prebuilts.

Bug: 203198541
Test: -
  1. Add a standalone system server jar (e.g., by patching
     aosp/1906158)
  2. Build and drop a module SDK and an APEX.
  3. Build a system image from prebuilts.
  4. See the odex and vdex files generated in
     $ANDROID_PRODUCT_OUT/system/framework/oat/
Change-Id: I8f4eaed10a1053cd560b8583efa12dc495f58db1
 2021-12-20 15:48:20 +00:00
Jiakai Zhang
389a647320 Dexpreopt standalone system server jars. 
Standalone system server jars are dynamically loaded by system server
using a `PathClassLoader` whose parent is `SYSTEMSERVERCLASSPATH`. They
are listed in `PRODUCT_STANDALONE_SYSTEM_SERVER_JARS` and
`PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS` in Makefile. We need to
dexpreopt them to achieve better performance.

Bug: 203198541
Test: m nothing
Test: -
  1. Add a standalone system server jar (e.g., by patching
     aosp/1906158)
  2. Build a system image.
  3. See the odex and vdex files generated in
     $ANDROID_PRODUCT_OUT/system/framework/oat/
  4. Flash the image to a device.
  5. Run `atest art_standalone_dexpreopt_tests`.
Change-Id: I358a62d34989c5c8eba12e18fe6167e0b72ff69d
 2021-12-20 15:07:26 +00:00
Treehugger Robot
dbd3553d83 Merge "Remove InstallBypassMake and ToMakePath" am: f1228f570a am: a9f335cf5a am: fd865c6688 am: 8ef2179a6e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889722

Change-Id: If49c894804c5ca0dfd197ca848ff1c9ac79556f4
 2021-12-17 07:36:53 +00:00
Treehugger Robot
f1228f570a Merge "Remove InstallBypassMake and ToMakePath" 2021-12-17 06:15:16 +00:00
Treehugger Robot
2e6356548d Merge "Provide some guidance for the confusing "does not provide a dex boot jar" message." am: bfaffe78de am: a41e1dab8a am: a978d88072 am: 6bb6a66871 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918382

Change-Id: Iabd1618609db18ee73c04b42c85dda809c75de16
 2021-12-16 23:30:22 +00:00
Treehugger Robot
bfaffe78de Merge "Provide some guidance for the confusing "does not provide a dex boot jar" message." 2021-12-16 17:26:30 +00:00
Colin Cross
c68db4b305 Remove InstallBypassMake and ToMakePath 
InstallBypassMake and ToMakePath are obsolete, remove them.

Bug: 204136549
Test: m checkbuild
Change-Id: Ie5a6f7254b3d317ed6039e114ed6aec35e1ce273
 2021-12-15 15:22:53 -08:00
Wei Li
718d2a16ca Merge "Add the initial implementation of bp2build converter for java_library, java_library_host, java_binary_host and cc_library_host_shared so signapk tool can be built with Bazel." am: 2115d35101 am: 9adc5f84bb am: 38387e7624 am: b980aa5f6e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918122

Change-Id: If5a5f060862e1d6bc8ff2419c06d1d8a2e31d4ef
 2021-12-15 04:47:38 +00:00
Wei Li
bafb6d6612 Add the initial implementation of bp2build converter for java_library, 
java_library_host, java_binary_host and cc_library_host_shared so
signapk tool can be built with Bazel.

Test: b build //build/bazel/examples/apex/minimal:build.bazel.examples.apex.minimal
Test: jarsigner -verify -verbose build.bazel.examples.apex.minimal.apex
Bug: 209876137
Bug: 196204358
Bug: 210158864
Bug: 210159074
Bug: 210158872
Change-Id: I855884159d25e69d8f9623792c376da820a1eb4c
 2021-12-14 17:23:19 -08:00
Liz Kammer
6299b235bb Merge "Use one mutator for all bp2build conversion." am: 92344259c5 am: 782f37eaee am: 5f4df317ee am: 037105c0f8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878397

Change-Id: I56073dc653947ebf69d7a74e97c1092f06aab139
 2021-12-14 20:25:04 +00:00
Liz Kammer
be46fccc40 Use one mutator for all bp2build conversion. 
Each conversion required defining a separate mutator, which will each
operate on _all_ modules and requires each to repeat checks whether the
mutator should operator. Instead, we introduce a single mutator and
modules can define a ConvertWithBp2build to implement bp2build
conversion for that module.

Test: bp2build.sh
Bug: 183079158
Change-Id: I99d4b51f441c2903879092c5b56313d606d4338d
 2021-12-14 09:37:45 -05:00
Treehugger Robot
bba83741d4 Merge changes from topic "revert-1918946-revert-1899703-AMWIVCREEV-CCTEXIRRRV" am: f4c2bf6559 am: 45b20269f6 am: 4eb4bc649d am: 1fcba64203 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918949

Change-Id: Ib6e320631a5b35974560bf33aaca205006bc051e
 2021-12-11 04:52:01 +00:00
Colin Cross
bce7bacea8 Revert^2 "Build license metadata files in Soong" am: 4acaea9cbf am: d8395b1b2f am: c6d7cae3ca am: f3a84bc1a6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918948

Change-Id: I39f8e358355aafc79e135adecb8b4c8e082b036c
 2021-12-11 04:51:58 +00:00
Colin Cross
d8395b1b2f Revert^2 "Build license metadata files in Soong" am: 4acaea9cbf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918948

Change-Id: I8682f46f7843e0d367b96a09135dad03e3df934c
 2021-12-11 03:48:25 +00:00
Treehugger Robot
f4c2bf6559 Merge changes from topic "revert-1918946-revert-1899703-AMWIVCREEV-CCTEXIRRRV" 
* changes:
  Revert^2 "Add dependency license annotations"
  Revert^2 "Build license metadata files in Soong"
 2021-12-11 03:32:18 +00:00
Colin Cross
b756f61589 Merge changes from topic "revert-1899703-AMWIVCREEV" am: 67938c2925 am: 34ca826598 am: 5400ba36b5 am: 9d9dc0a0a4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918944

Change-Id: I8eee11e7acbb0da80b2ddeffd14e50c1b4540ac3
 2021-12-11 00:28:43 +00:00
Colin Cross
9ac1faf0af Revert "Add dependency license annotations" am: abe2a4b7bf am: a7fcadce74 am: 265eec85a8 am: 8110688fe1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918943

Change-Id: I8b1908cccf980e93769c5e72490a95846f45a851
 2021-12-11 00:28:39 +00:00
Colin Cross
a7fcadce74 Revert "Add dependency license annotations" am: abe2a4b7bf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1918943

Change-Id: I9438dc5f70a9e30071a051c11dd25f36789822d0
 2021-12-10 23:20:49 +00:00
Colin Cross
4acaea9cbf Revert^2 "Build license metadata files in Soong" 
b3264f2090

Change-Id: I5ea5f7e29eb1dbc72b8b30f010006a25f5f72fac
 2021-12-10 23:05:02 +00:00
Colin Cross
65cb314c92 Revert^2 "Add dependency license annotations" 
abe2a4b7bf

Change-Id: Ibcd16b5b779a4e6d4372dab9d21de76abae9ca9c
 2021-12-10 23:05:02 +00:00
Colin Cross
67938c2925 Merge changes from topic "revert-1899703-AMWIVCREEV" 
* changes:
  Revert "Build license metadata files in Soong"
  Revert "Add dependency license annotations"
 2021-12-10 23:04:45 +00:00
Colin Cross
b3264f2090 Revert "Build license metadata files in Soong" 
Revert submission 1899703

Reason for revert: b/210158272
Reverted Changes:
I142c19284:Reuse license metadata files from Soong
Ife89b8f23:Add dependency license annotations
I8e7410837:Build license metadata files in Soong

Change-Id: I48f2bf2e2797ac9d38f7ece35ba616b823035607
 2021-12-10 23:02:57 +00:00
Colin Cross
abe2a4b7bf Revert "Add dependency license annotations" 
Revert submission 1899703

Reason for revert: b/210158272
Reverted Changes:
I142c19284:Reuse license metadata files from Soong
Ife89b8f23:Add dependency license annotations
I8e7410837:Build license metadata files in Soong

Change-Id: I51f33ae67311a3cff00d3e581d24c9a3411b7131
 2021-12-10 23:02:41 +00:00
Colin Cross
d1ea62d5c9 Merge changes from topic "soong-license-metadata" am: b435744fdc am: 9a6e17e5c1 am: 1aa0005a1f am: 7d162acb13 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899703

Change-Id: Ie97f43055aa820cb5b1bd4faffe67f2c292a2ecb
 2021-12-10 23:02:01 +00:00
Colin Cross
d9b928c776 Build license metadata files in Soong am: 3dd2ff28ed am: 05ff6289c2 am: a25d6989dc am: 2904cf5cfc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899702

Change-Id: I35fabcb7e7210fc0e0f55c2db4f73a716561db66
 2021-12-10 23:02:00 +00:00
Colin Cross
05ff6289c2 Build license metadata files in Soong am: 3dd2ff28ed 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899702

Change-Id: I96620d254f43dd9e8cfe02d1ed1dbc201c9cd381
 2021-12-10 22:04:43 +00:00
Colin Cross
b435744fdc Merge changes from topic "soong-license-metadata" 
* changes:
  Add dependency license annotations
  Build license metadata files in Soong
  Escape Host*Variable contents
 2021-12-10 21:43:49 +00:00
Martin Stjernholm
ed3df44363 Provide some guidance for the confusing "does not provide a dex boot 
jar" message.

Test: n/a
Bug: 207778789
Change-Id: I720471568e0b57636fb979c93a689895e9beaa02
 2021-12-10 16:38:23 +00:00
Sorin Basca
c93cead197 Merge "Adding experimental option to target Java 11" am: eb59a6d3ea am: 2aabb8de52 am: c6a840e45d am: 73b1de9cd2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1904231

Change-Id: I0f2cea8fc9ba09dd747b29e9ebd8da6578657415
 2021-12-10 15:13:30 +00:00
Sorin Basca
eb59a6d3ea Merge "Adding experimental option to target Java 11" 2021-12-10 13:57:51 +00:00
Spandan Das
6affb8f1ea Merge "Set targetSdkVersion to 10000 iff a module is targeting an unreleased sdk" am: 2ee7ac02e7 am: a9938be03e am: c21325dd15 am: b04b40c2e0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914977

Change-Id: I44fde0c605bb23da64128b89eccd34f5eda42243
 2021-12-10 01:32:01 +00:00
Spandan Das
c8cb0c3eb5 Set targetSdkVersion to 10000 iff a module is targeting an unreleased 
sdk

Previously in aosp/1907152, targetSdkVersion for all modules would be
10000 in release builds. This would cause sdk compatibility errors like
b/209301265#3 for modules that were targeting a released SDK

This CL adds an additional check to set targetSdkVersion to 10000 only
if a module's apilevel is in preview (i.e. unreleased SDK)

Bug: 209301265

Test: Built various apk combinations locally, and used aapt2 to check
targetSdkVersion
Test: TARGET_BUILD_APPS=xyz m CaptivePortalLoginTests #
targetSdkVersion: 30
Test: m CaptivePortalLoginTests #targetSdkVersion: 30
Test: (internal) TARGET_BUILD_APPS=xyz m MediaProviderGoogle #
targetSdkVersion: 10000
Test: (internal) m MediaProviderGoogle #targetSdkVersion: Tiramisu

Change-Id: Id2901f23d4e1b436f8906940e47edd606a93657d
 2021-12-09 18:08:28 +00:00
Treehugger Robot
a548a1c1c5 Merge changes I08ec0b44,I79b5a1fc,I469d6558 am: 6abfb33784 am: 3bcefabfeb am: dc2accaba0 am: a0b46c1d06 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907862

Change-Id: I0ffda740f28a4f1309fae0be43f40904ef4f2168
 2021-12-09 00:03:32 +00:00
Allen Hair
5d066968ff Merge "Revert "Set targetsdkversion to future level if TARGET_BUILD_APPS is not empty"" am: 9df0fa5e63 am: 952ebe85f0 am: aa5dbef9d6 am: 35a5252566 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914027

Change-Id: I956a71b2ee7f381ea97b27b3f5d982eee9601ccd
 2021-12-09 00:03:18 +00:00
Colin Cross
b674b43656 Add dependency license annotations 
Add annotations to dependency tags that are dynamic or classpath
linkage.

Bug: 207445310
Test: m checkbuild
Change-Id: Ife89b8f234aa40c380c721eda7dd18cab697fbb3
 2021-12-08 15:08:59 -08:00
Colin Cross
3dd2ff28ed Build license metadata files in Soong 
Soong has enough information to build the license metadata files
without resorting to the fixups required in Make.

Bug: 207445310
Test: m checkbuild
Change-Id: I8e74108376162b8fdb87ba098ebe94350aa1f7c4
 2021-12-08 15:08:59 -08:00
Treehugger Robot
6abfb33784 Merge changes I08ec0b44,I79b5a1fc,I469d6558 
* changes:
  Allow java_sdk_library in an APEX to have higher min_sdk_version.
  Perform CheckMinSdkVersion for java_sdk_library.
  Add MinSdkVersion(ctx) method to ModuleWithMinSdkVersionCheck interface.
 2021-12-08 17:58:24 +00:00
Allen Hair
9df0fa5e63 Merge "Revert "Set targetsdkversion to future level if TARGET_BUILD_APPS is not empty"" 2021-12-08 17:54:57 +00:00
Vladimir Marko
f297422758 Merge "Stop installing a profile into an APEX if profiles are disabled." am: edd6fde587 am: 7e556310b9 am: 1643216aff am: aa08d0e888 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913479

Change-Id: I3fbbd5032990f1646d242d8ee364daca65394571
 2021-12-08 16:43:07 +00:00