StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,449 Commits 1 Branch 0 Tags
04dcce34b86be1083f5803d5aeebf8090c330de1
Commit Graph

5671 Commits

Author SHA1 Message Date
Dan Willemsen
b13daf2ba7 Merge "Add java_binary_host support for Windows" 2021-09-22 20:13:33 +00:00
Joseph Murphy
c964841e2d Changes tree built Robolectric name 
Bug: b/194219998
Test: locally ran all in-tree Robolectric tests
Change-Id: If13583f6a2882e2e78d3004afc476debf6692df9
Merged-In: If13583f6a2882e2e78d3004afc476debf6692df9
 2021-09-22 17:58:07 +00:00
TreeHugger Robot
8c7089fde6 Merge "Changes tree built Robolectric name" into sc-dev-plus-aosp 2021-09-22 17:48:56 +00:00
Anton Hansson
d78eb76f64 Add annotations.zip support to java_sdk_library 
The annotations zip file is produced by the "main" sdk build and is
primarily consumed by android studio.

In order to support building the main SDK without requiring the sources
of all modules, we are adding module SDK artifacts that allows
reconstructing these outputs. The annotations zip contains XML files
which should be fairly easy to merge from all the individual parts.

Bug: 187397779
Test: unit tests in this CL
Test: m sdkextensions-sdk and inspect output
Change-Id: I955cae720e6f1382936836ee1d8fb11003f51b7d
 2021-09-22 17:23:10 +01:00
Treehugger Robot
ab6205e22a Merge "Remove workaround for modules with missing BCP fragments, as they are present now." am: cd439a27e4 am: d5082754e0 am: 66c1202ce3 am: a9f44c8c32 am: 12f420ce0d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828596

Change-Id: I2fe8113ad0b003f2b656c12001b576e13e92c5f1
 2021-09-22 11:28:23 +00:00
Treehugger Robot
d5082754e0 Merge "Remove workaround for modules with missing BCP fragments, as they are present now." am: cd439a27e4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828596

Change-Id: I81f0280f4ef5082fb80d4d906fa766b7fb78a296
 2021-09-22 10:36:55 +00:00
Treehugger Robot
cd439a27e4 Merge "Remove workaround for modules with missing BCP fragments, as they are present now." 2021-09-22 10:18:36 +00:00
Anton Hansson
825a2659e6 Merge "Add back the api_srcs argument" am: 8b1add6dd4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830032

Change-Id: I1dd0b451e8d195e7f382b649aedadebb804a429f
 2021-09-21 14:57:36 +00:00
Anton Hansson
8b1add6dd4 Merge "Add back the api_srcs argument" 2021-09-21 14:45:02 +00:00
Dan Willemsen
8e6b37119a Add java_binary_host support for Windows 
So that the Windows build-tools package doesn't need to manually copy
the wrapper. Also fixes enabling java modules for Windows by hiding them
from Make, as the Make code does not handle Windows java modules
properly.

Bug: 187222815
Change-Id: I13534b38b9a9f4b5ff0630e028c3b4f88a6b34f8
 2021-09-20 23:29:48 -07:00
Aurimas Liutikas
147f9f2f1a Merge "Enable compose kotlinc plugin when depending on the compose runtime" am: e992a52d0e am: 2fa15f76a3 am: 3181440486 am: 0b3bbaff0c am: 4329d9226d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830673

Change-Id: I66fac23fd7cbf1d25acc5b778014c1183d4de51a
 2021-09-21 00:50:38 +00:00
Aurimas Liutikas
2fa15f76a3 Merge "Enable compose kotlinc plugin when depending on the compose runtime" am: e992a52d0e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830673

Change-Id: I8becfa1da6f0b03d0fd839b5e60b6a5f9c662821
 2021-09-20 23:53:09 +00:00
Aurimas Liutikas
e992a52d0e Merge "Enable compose kotlinc plugin when depending on the compose runtime" 2021-09-20 23:28:33 +00:00
Martin Stjernholm
531d8fdc2a Remove workaround for modules with missing BCP fragments, as they are 
present now.

#codehealth

Test: presubmits
Bug: 192868581
Change-Id: I8370525849ea589af0bf4f8d3fd081f3004516a1
 2021-09-20 23:47:24 +01:00
Colin Cross
8039d30bca Merge "Add support for d8 --main-dex-rules" am: 80bb3164b9 am: 0abff32886 am: 9f7afbe3c3 am: 2c45744ff1 am: 8359d26217 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829133

Change-Id: Ieb7376f4d1facc2352c4c274175712a343978227
 2021-09-20 21:23:35 +00:00
Colin Cross
0abff32886 Merge "Add support for d8 --main-dex-rules" am: 80bb3164b9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1829133

Change-Id: Ib105939a0e11dae97b40cf003c75808ee1d879ec
 2021-09-20 20:37:51 +00:00
Colin Cross
80bb3164b9 Merge "Add support for d8 --main-dex-rules" 2021-09-20 20:22:44 +00:00
Colin Cross
a1ff7c6926 Enable compose kotlinc plugin when depending on the compose runtime 
When a module depends on the compose runtime add a -Xplugin argument
to the kotlinc flags that enables the compose compiler plugin.

Bug: 196351110
Test: TestKotlinCompose
Change-Id: I423a3c4d12df42804a24b672a40a165bc8dd165f
 2021-09-20 09:12:42 -07:00
Treehugger Robot
3d3bb3f15c Merge "Add test to TestJavaStableSdkVersion for legacy core platform" am: 3769a27c5e am: 45dd37c6e3 am: 90a5e41516 am: da8ef1d18a am: 246e0d388c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655611

Change-Id: Ibf571a6f6c29de12d810989d83931f3b660971d2
 2021-09-20 15:15:10 +00:00
Treehugger Robot
45dd37c6e3 Merge "Add test to TestJavaStableSdkVersion for legacy core platform" am: 3769a27c5e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655611

Change-Id: I752f24a2e6b9763019866402a8af6adb3e96ee2a
 2021-09-20 14:20:18 +00:00
Treehugger Robot
3769a27c5e Merge "Add test to TestJavaStableSdkVersion for legacy core platform" 2021-09-20 14:04:35 +00:00
Anton Hansson
f8ea3729ca Add back the api_srcs argument 
This arg provides the ability to pass sources to the metalava
invocations that are part of a java_sdk_library without affecting
the runtime library.

This is useful in various scenarios, e.g.: when javadoc in some source
files affects the metalava behavior. For example, the javadoc-generation
javadoc tags @paramDoc, @returnDoc etc. Passing these as a library does
not work because class files do not contain javadoc.

Bug: 186197911
Test: manually inspect module stub src for doc enhancements
Merged-In: I2ce98f891283514e1896c52d9335550c1f5435fb
Change-Id: I2ce98f891283514e1896c52d9335550c1f5435fb
 2021-09-17 13:42:44 +00:00
Anton Hansson
84f61eeb1e [automerge] Add back the api_srcs argument 2p: b727c1e0ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15852934

Bug: 186197911
Change-Id: I3fdfdacf2c083cd7f4c1f88c657e8ab245927f6f
 2021-09-17 13:21:39 +00:00
Anton Hansson
b727c1e0ba Add back the api_srcs argument 
This arg provides the ability to pass sources to the metalava
invocations that are part of a java_sdk_library without affecting
the runtime library.

This is useful in various scenarios, e.g.: when javadoc in some source
files affects the metalava behavior. For example, the javadoc-generation
javadoc tags @paramDoc, @returnDoc etc. Passing these as a library does
not work because class files do not contain javadoc.

Bug: 186197911
Test: manually inspect module stub src for doc enhancements
Change-Id: I2ce98f891283514e1896c52d9335550c1f5435fb
 2021-09-17 14:21:24 +01:00
Jiakai Zhang
7ef8c14573 Merge changes I9c94a54a,Idc0c73a7 am: 2c6ede11cc am: 23a5cba0af am: 57c29dd3e3 am: 36c6e5583f am: 9c4f4a179f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1824513

Change-Id: Ic1c8e0971d4807c92bdc8138a62c435862e70b69
 2021-09-17 12:23:41 +00:00
Jiakai Zhang
d029384d38 Merge "Revert^2 "Preopt APEX system server jars."" am: c9f9d56ed4 am: dc2c1c2625 am: f3d12b3172 am: ac66e68946 am: 611a4eacc6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828115

Change-Id: Ia5585ff7f08ef6c5c5ea7b2ecd544a25d63a89a8
 2021-09-17 12:23:06 +00:00
Jiakai Zhang
23a5cba0af Merge changes I9c94a54a,Idc0c73a7 am: 2c6ede11cc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1824513

Change-Id: I1f3ce39cd3b3988e676791a59f0c70e2bc80015d
 2021-09-17 11:33:22 +00:00
Jiakai Zhang
dc2c1c2625 Merge "Revert^2 "Preopt APEX system server jars."" am: c9f9d56ed4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828115

Change-Id: I2a991341934af96455f136cbe44ef824f5e3e7f5
 2021-09-17 11:33:13 +00:00
Jiakai Zhang
2c6ede11cc Merge changes I9c94a54a,Idc0c73a7 
* changes:
  Preopt system server jars with updatable bootclasspath.
  Preopt APEX system server jars from prebuilts.
 2021-09-17 11:20:10 +00:00
Jiakai Zhang
c9f9d56ed4 Merge "Revert^2 "Preopt APEX system server jars."" 2021-09-17 11:19:51 +00:00
Colin Cross
5ea963e60a Add support for d8 --main-dex-rules 
d8 supports --main-dex-rules to replace the old mainDexClasses
script.

Test: m checkbuild
Change-Id: Ieddcf4de50cc13509c06bbffe9f1314ee3dd23b6
 2021-09-16 19:14:30 -07:00
Martin Stjernholm
460d7bb14c Merge "Remove fallback code path for missing BCP fragments that is no longer necessary." am: 33ce5d6c0e am: 44cbc71c78 am: 6057a13940 am: 6f2cf056ca am: 71ea8b36dd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1821658

Change-Id: I88b0d7bd49e547f91a76203683a30035f459c602
 2021-09-16 15:48:45 +00:00
Martin Stjernholm
44cbc71c78 Merge "Remove fallback code path for missing BCP fragments that is no longer necessary." am: 33ce5d6c0e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1821658

Change-Id: I145f398e8b22cca8e9e91a62d83cbb2014032261
 2021-09-16 14:48:57 +00:00
Martin Stjernholm
33ce5d6c0e Merge "Remove fallback code path for missing BCP fragments that is no longer necessary." 2021-09-16 14:38:01 +00:00
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
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
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
1ea7c9fa52 Add test to TestJavaStableSdkVersion for legacy core platform 
Adds a test case to TestJavaStableSdkVersion for the case where a
module uses sdk_version: "core_platform" but is in the list of modules
that can use the legacy version.

This required storing the lookup map in the Config to allow it to be
customized for the test.

Bug: 180399951
Test: m nothing
Change-Id: I404705c3fd8a559649c6ab2624856cf78f49f85c
 2021-09-16 11:12:43 +01:00
Jiakai Zhang
519c5c82e5 Revert^2 "Preopt APEX system server jars." 
This reverts commit 92346c4832.

Reason for revert: Fixed build error.

The build error is fixed by ag/15841934. This CL remains unchanged. This
CL will be submitted AFTER ag/15841934 is submitted.

Bug: 200024131
Test: 1. Patch this CL and ag/15841934 into internal master.
  2. sudo vendor/google/build/build_test.bash

Change-Id: I5f2b8357846fc7dda56e25ebe6ffb095e8047ec8
 2021-09-16 06:25:26 +00:00
Martin Stjernholm
b1e61cb8bc Remove fallback code path for missing BCP fragments that is no longer 
necessary.

#codehealth

Test: m nothing
Bug: 179354495
Change-Id: Iaddf163e69b52cef82d522311e81bef9bdb4aa8d
 2021-09-16 00:55:53 +01:00
Pedro Loureiro
97a3d20be6 Merge "Add support for new permissions library tag attributes" 2021-09-15 17:19:29 +00: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
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
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
Adrian Roos
79839d94c1 Merge "Revert "Preopt APEX system server jars."" 2021-09-15 14:31:42 +00:00
Adrian Roos
92346c4832 Revert "Preopt APEX system server jars." 
This reverts commit ca9bc98e0c.

Reason for revert: breaks build
Bug: 200024131

Change-Id: Ide07b4c4d267370ae31107b1598b2f878c701282
 2021-09-15 14:11:07 +00:00
Paul Duffin
063ad070c0 Merge "Rename SdkMemberTypeDependencyTag to SdkMemberDependencyTag" am: c2c7f3e49b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826225

Change-Id: I304997b8488094a28ef8b75baaf0d9c4341b1512
 2021-09-15 13:44:01 +00:00
Paul Duffin
c2c7f3e49b Merge "Rename SdkMemberTypeDependencyTag to SdkMemberDependencyTag" 2021-09-15 13:29:23 +00:00
Jiakai Zhang
de0a033fd8 Preopt APEX system server jars. am: ca9bc98e0c am: 83d0d8ac1c am: 6ff963aacb am: 3b3063da67 am: 9ce81715f7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1821984

Change-Id: If931f0aeca50b2c69f9072640255077f02c853f2
 2021-09-15 11:45:57 +00:00
Jiakai Zhang
83d0d8ac1c Preopt APEX system server jars. am: ca9bc98e0c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1821984

Change-Id: If42b905c0636b10881b372efafd3e2f9bc84923c
 2021-09-15 10:48:53 +00:00