StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,938 Commits 1 Branch 0 Tags
4f187e3cc14795aeacff6068730cad23e36a5670
Commit Graph

3091 Commits

Author SHA1 Message Date
Treehugger Robot
4f187e3cc1 Merge "Merge libs/ directory of imported aars into classes.jar" am: 7189f5d1e2 am: 9a203fcd90 am: b04255fc23 am: 27bd8fd7a6 am: c67f25165a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1392878

Change-Id: I4bd3506c279d55d226200a3858010636ec857048
 2020-08-08 02:04:54 +00:00
Treehugger Robot
b04255fc23 Merge "Merge libs/ directory of imported aars into classes.jar" am: 7189f5d1e2 am: 9a203fcd90 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1392878

Change-Id: I235cf9ed8a4926179b5b743570b08189609c6440
 2020-08-08 01:20:59 +00:00
Treehugger Robot
7189f5d1e2 Merge "Merge libs/ directory of imported aars into classes.jar" 2020-08-08 00:51:38 +00:00
Colin Cross
205e91183e Merge libs/ directory of imported aars into classes.jar 
AARs can provide extra classes in the libs/ directory that should
be treated the same as classes.jar, merge them into a single jar
when extracting the AAR.

Bug: 162892721
Test: m androidx.appsearch_appsearch
Change-Id: I92bf46f47ce5f3dce16c42197c15ed256304fda2
 2020-08-07 14:07:23 -07:00
Ulyana Trafimovich
a17ed4d5a7 Merge "Add structured representation for colon-separated jar lists." am: 910eb70891 am: 434e708101 am: 67ee1adb6a am: b696ad8f31 am: cc2d5c2215 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1354005

Change-Id: I2c29f4095add1b56a1d0222e88b54650577ea0b1
 2020-08-06 17:11:02 +00:00
Ulyana Trafimovich
67ee1adb6a Merge "Add structured representation for colon-separated jar lists." am: 910eb70891 am: 434e708101 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1354005

Change-Id: I155b303e73442fb44f38621bf0fa9f2157a77370
 2020-08-06 16:05:43 +00:00
Ulyana Trafimovich
910eb70891 Merge "Add structured representation for colon-separated jar lists." 2020-08-06 15:07:27 +00:00
Colin Cross
895b0cd4ec Merge "Add libraryDependencyTag to track dependencies on static and shared libraries" am: 2eddd06879 am: f6c453a3fd am: 7f034dabf1 am: 6ba6e16f17 am: a4c3ca5e1a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1378332

Change-Id: Id5c3bd1af0f963a397e0af152b34a274401298ed
 2020-08-06 13:46:40 +00:00
Liz Kammer
c060b5c12a Merge "Add property api_levels_jar_filename to droidstubs" am: 9c55b0efa2 am: a4278eba24 am: c51a310131 am: 2d8ce76f05 am: 88b22e0812 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1388544

Change-Id: Iecbded6aff2a2d551c620b8405c216a0fb90a005
 2020-08-06 13:45:17 +00:00
Liz Kammer
17bd94ad5c Merge "Refactor java compileDex" am: 9eb51fc9d4 am: 46971c5469 am: 898ed67ecd am: 321578ef15 am: e834639201 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1360617

Change-Id: Ic9e187d9b197d5a34959cf6541fa4c3b5f11aeb7
 2020-08-06 13:44:55 +00:00
TreeHugger Robot
4b2e15f331 Merge "Rename hiddenapi manual lists" into rvc-dev-plus-aosp am: 6874de4c9c am: 1aac63e601 am: 3a1a0a1ba0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12316867

Change-Id: I34ed9d290ddb681a4bfa880d77d0c6d8e200ab2e
 2020-08-06 13:44:08 +00:00
Colin Cross
7f034dabf1 Merge "Add libraryDependencyTag to track dependencies on static and shared libraries" am: 2eddd06879 am: f6c453a3fd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1378332

Change-Id: I20996cc0ed388013f24966a2d8a9462177bfe45e
 2020-08-06 13:12:06 +00:00
Liz Kammer
c51a310131 Merge "Add property api_levels_jar_filename to droidstubs" am: 9c55b0efa2 am: a4278eba24 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1388544

Change-Id: Ic593590f8f3be3c66bcaa4d0a837dbe9fe865152
 2020-08-06 13:11:11 +00:00
Liz Kammer
898ed67ecd Merge "Refactor java compileDex" am: 9eb51fc9d4 am: 46971c5469 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1360617

Change-Id: I574bbe46916d6e268956732f37022ba5f464fcaa
 2020-08-06 13:10:52 +00:00
Colin Cross
2eddd06879 Merge "Add libraryDependencyTag to track dependencies on static and shared libraries" 2020-08-06 00:06:28 +00:00
Liz Kammer
9c55b0efa2 Merge "Add property api_levels_jar_filename to droidstubs" 2020-08-05 19:05:13 +00:00
Andrei Onea
9bdaf74c97 Rename hiddenapi manual lists 
Use new names for lists from go/hiddenapi-list-renaming
Bug: 162827370
Test: m

Change-Id: I9522f32faa46d1d49aefad0921ba6d9c427d8779
 2020-08-05 18:43:25 +01:00
Liz Kammer
9eb51fc9d4 Merge "Refactor java compileDex" 2020-08-05 15:41:03 +00:00
Ulya Trafimovich
249386ad69 Add structured representation for colon-separated jar lists. 
With the addition of apexes and /system_ext some of the bootclasspath
and system server jars have moved from /system to the new locations.
This has been implemented by using lists of colon-separated strings
called "apex-jar pairs" (although "apex" was misleading as it could
refer to "platform" or "system_ext", not necessarily a real apex).

Using the colon-separated string representation is inconvenient, as it
requires splitting and reassembling the list components many times,
which harms performance and makes error handling difficult. Therefore
this patch refactors the colon-separated lists into a struct that
hides the implementation details.

Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: Id248ce639a267076294f4d4d73971da2f2f77208
 2020-08-05 09:59:30 +01:00
Liz Kammer
a7a64f3c5b Refactor java compileDex 
We want to support a compile_dex property for java_import. This splits
dex-related properties into a dexer struct which can be embedded in
relevant modules.

Test: m
Test: soong tests
Bug: 160455085
Change-Id: If56a51dac43f630d49483a36db29cd50e9ccd529
 2020-08-04 10:15:04 -07:00
Liz Kammer
3d894b728a Add property api_levels_jar_filename to droidstubs 
The default is android.jar to maintain current behavior but allows users
to specify a different filepath to support generating api-versions for
docs other than the platform (e.g. auto).

Bug: 162552181
Test: m doc
Test: go test java_test
Change-Id: I9e51abaf7d5451d68ca782157d9b739f76c5da82
 2020-08-04 09:55:13 -07:00
Andrei Onea
ca79081bde Rename hiddenapi manual lists 
Use new names for lists from go/hiddenapi-list-renaming
Bug: 162827370
Test: m

Change-Id: I9522f32faa46d1d49aefad0921ba6d9c427d8779
 2020-08-04 15:34:35 +01:00
Treehugger Robot
24634c5cc5 Merge "Update language to comply with inclusive guidance" am: cf04073b43 am: abeb7c4538 am: c03dc74149 am: 66c2f9a88d am: e6d4bbfa97 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374706

Change-Id: Ib7d3592a1a9b7d2c1f03520d6673d06168b42fe8
 2020-08-01 00:56:04 +00:00
Treehugger Robot
c03dc74149 Merge "Update language to comply with inclusive guidance" am: cf04073b43 am: abeb7c4538 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374706

Change-Id: Ie032c705309843d27f26699818fa6a8065808a99
 2020-07-31 23:35:03 +00:00
Treehugger Robot
cf04073b43 Merge "Update language to comply with inclusive guidance" 2020-07-31 22:50:49 +00:00
Treehugger Robot
e83cabc7b2 Merge "Default to not creating stubs for droiddoc" am: 703ea006e0 am: efb9bb4034 am: 96ed484994 am: f56fbe8658 am: 72471ba7bc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1380730

Change-Id: I3e647895f46e655be449946667497388d49aa90f
 2020-07-31 20:46:37 +00:00
Treehugger Robot
96ed484994 Merge "Default to not creating stubs for droiddoc" am: 703ea006e0 am: efb9bb4034 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1380730

Change-Id: Ibaca8954db797d938b6dff10c18014b9f2a97980
 2020-07-31 19:46:04 +00:00
Treehugger Robot
703ea006e0 Merge "Default to not creating stubs for droiddoc" 2020-07-31 19:32:11 +00:00
Paul Duffin
df4daaebff Fix prebuilt mutator ordering in tests am: 021f4e525f am: 8537c9cb30 am: 0f460aa9db am: fb52ad8c1d am: 6ad7fdee3d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1380179

Change-Id: I468c9a52ff6672fb1bf8d88711c93d36d9cf6c58
 2020-07-31 18:39:47 +00:00
Paul Duffin
0f460aa9db Fix prebuilt mutator ordering in tests am: 021f4e525f am: 8537c9cb30 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1380179

Change-Id: I77be0b785a95bdb943c8ead613f8e2d7b1d32776
 2020-07-31 17:45:54 +00:00
Liz Kammer
1e2ee12ff4 Default to not creating stubs for droiddoc 
This will allow us to remove `create_stubs: false` throughout the
codebase easily, then remove the functionslity to create stubs from
droiddoc.

Test: m docs
Test: m checkapi
Test: m updateapi
Bug: 144248501
Bug: 143136634

Change-Id: Ib95f68bc064fbe1475e4b25433bee6292bc005dc
 2020-07-31 10:11:25 -07:00
Paul Duffin
021f4e525f Fix prebuilt mutator ordering in tests 
Previously, the prebuilt mutators were added by the
cc.RegisterRequiredBuildComponentsForTest() function as a convenience
but unfortunately it lead to some of the mutators being in a different
order in the tests than in the normal build.

This change:
* Extracts the RegisterPrebuiltMutators() call from
  cc.RegisterRequiredBuildComponentsForTest()
* Makes sure that the prebuilt mutators are registered before the
  visibility gatherer and enforcer mutators.

Bug: 162505935
Test: m nothing
Change-Id: I7d959b558200b502f0a5e4653c41ea01414e142a
 2020-07-31 16:12:01 +01:00
Andrei-Valentin Onea
ee9c627eef Merge "Update language to comply with Android's inclusive language guidance" am: 01124262f0 am: 06bd410548 am: 48ca1e86e9 am: c7fec7749b am: eee3025059 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374496

Change-Id: I44430e3e0383377878e949fcdcb85274b588cdf6
 2020-07-31 01:11:57 +00:00
Andrei-Valentin Onea
48ca1e86e9 Merge "Update language to comply with Android's inclusive language guidance" am: 01124262f0 am: 06bd410548 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374496

Change-Id: Ia00d11ee4c75298b67e254e8a51924e5e154e4d5
 2020-07-30 12:42:53 +00:00
Andrei-Valentin Onea
01124262f0 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-30 12:09:00 +00:00
Colin Cross
6e511a9a9f Add libraryDependencyTag to track dependencies on static and shared libraries 
dependencyTag uses a set of predefined tags to identify different types
of dependencies.  There are already multiple bits of metadata stored
in the dependency tag (Library, Shared, ReexportFlags), and supporting
them all requires a combinatorial explosion of predefined tags and
causes issues when using equality comparisons if a new bit of metadata
is added.

Add a new libraryDependencyTag type that will contain the metadata
bits, and replace the quality comparisons with checks on the metadata
bits.

There are 5 TODOs where modifying the checks identified problems with
the existing checks.  These were left in place to produce identical
build output and will be fixed separately.

Bug: 162437057
Test: no change to build.ninja or {Android,make_vars,late}-${TARGET_PRODUCT}.mk
Change-Id: I72d4207dcf381c07c92e00e5a03968ebb5ed8d30
 2020-07-29 13:22:30 -07:00
Aleksei Kalinov
f0f5cdc1cc Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for
reference.

Bug: 161896447
Test: ran `m`.
Change-Id: If5ec29482911c281bc1c4bf2cfc84b2f05c2240d
 2020-07-29 15:49:05 +00:00
Treehugger Robot
a418b7635c Merge "Update language to comply with inclusive guidance" am: 0ebab772f5 am: 4b60484e5e am: ad9cc7a602 am: 3741ddd22a am: a30909999e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374704

Change-Id: Icaa00275733d6353006b7dfc8fc25d1b9ef03a69
 2020-07-29 05:09:47 +00:00
Treehugger Robot
ad9cc7a602 Merge "Update language to comply with inclusive guidance" am: 0ebab772f5 am: 4b60484e5e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374704

Change-Id: Iaad293fce923748a6fba122f2ad234986ff73d9a
 2020-07-29 04:14:13 +00:00
Treehugger Robot
0ebab772f5 Merge "Update language to comply with inclusive guidance" 2020-07-29 03:41:51 +00:00
Treehugger Robot
848b7e772a Merge "Inclusive fix: Replace sanity to validation in java/sdk.go" am: 3d8e506c3a am: ffdfccd54c am: 375337b0c8 am: 0a185df8f4 am: a5d765fba8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374701

Change-Id: I44b677148a755b55229813687a58c816f7a03d58
 2020-07-29 01:04:36 +00:00
Treehugger Robot
375337b0c8 Merge "Inclusive fix: Replace sanity to validation in java/sdk.go" am: 3d8e506c3a am: ffdfccd54c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374701

Change-Id: Iabe7ddfd5308a39ac1988a595faf02dde0e9370c
 2020-07-29 00:11:05 +00:00
Treehugger Robot
3d8e506c3a Merge "Inclusive fix: Replace sanity to validation in java/sdk.go" 2020-07-28 23:39:20 +00:00
Liz Kammer
cada807a92 Update language to comply with inclusive guidance 
Update android_app_set to use word install rather than master for
android_app_sets, this better matches the phrasing used for apex_set.

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Test: m nothing
Change-Id: I429e7f8b16c42c10ad4d9543110f5ce814a893b1
 2020-07-28 15:47:38 -07:00
Treehugger Robot
1ad9fa1abb Merge "Update language to comply with inclusive guidance" am: 9326ba770c am: ebdbfbf539 am: c27bb4650c am: b7caa77823 am: 0fe58b470e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374702

Change-Id: I2185e091f633dfd3a1bbcde1f61c3dd4f11edf8b
 2020-07-28 22:40:45 +00:00
Treehugger Robot
c27bb4650c Merge "Update language to comply with inclusive guidance" am: 9326ba770c am: ebdbfbf539 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374702

Change-Id: Ib9d0835e842474dbf244eebd08cc0c774170db98
 2020-07-28 21:50:28 +00:00
Liz Kammer
7941b30c67 Update language to comply with inclusive guidance 
See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Test: m nothing
Change-Id: I13f42b680c6b819a2708c973e7718267c121f862
 2020-07-28 13:27:34 -07:00
Liz Kammer
20ebfb46fc Update language to comply with inclusive guidance 
See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Test: m nothing
Change-Id: Ie1d0d63d27f1b1b48680922b7202aa6df04f4696
 2020-07-28 11:37:31 -07:00
Patrice Arruda
b481b87104 Inclusive fix: Replace sanity to validation in java/sdk.go 
Bug: b/161896447
Test: "lunch 1" and "m nothing"
Change-Id: I8cbdec02dccd961a8cac92c6e957aeebd1e263c1
 2020-07-28 18:30:44 +00:00
Liz Kammer
76627bdd1f Merge "Add data_native_bins property to java_test_host" am: 8ffde8c9d5 am: 30de260bee am: 82fdacaf3c am: 1ee118d341 am: 1ee7b28f9c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1358802

Change-Id: I0350f9b4aa2af5345b53f913efe47a78d0cbcad1
 2020-07-28 17:19:10 +00:00