Commit Graph

1379 Commits

Author SHA1 Message Date
Nikita Ioffe
8d6ba89094 Update apex/allowed_deps.txt
Bug: 171330443
Bug: 171668006
Test: build/soong/scripts/update-apex-allowed-deps.sh
Change-Id: Id239ea9b31ce23f045f0db4027db33658ef3da14
2020-10-28 23:35:46 +00:00
Nikita Ioffe
ec62601d24 Update apex/allowed_deps.txt
Bug: 171330443
Test: build/soong/scripts/update-apex-allowed-deps.sh
Change-Id: Ic7ddd86cefc0c6a26de294b6e73b3e23d4791f5c
2020-10-27 22:22:39 +00:00
Paul Duffin
3b8b84973b Cleanup usages of CreateConfiguredJarList am: e10dfa4e3d am: d34168219d am: f80f9004ea am: 6eb013d805
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471781

Change-Id: I4dcf51fa2fc7b661240943233dbf6312e8163bf3
2020-10-27 18:19:40 +00:00
Paul Duffin
f80f9004ea Cleanup usages of CreateConfiguredJarList am: e10dfa4e3d am: d34168219d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471781

Change-Id: Iaf669a40406915c5798ade0a7d67996cc53ed3e7
2020-10-27 17:35:03 +00:00
Paul Duffin
7df37bee7f Switch BootJars/UpdatableBootJars to ConfiguredJarList am: 69d1fb1e39 am: 769b1eab84 am: 3e29458b28 am: 0b34b8cdfb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471779

Change-Id: I90e1bafedf0492e8299cad31e7b4a648c3cc3bfa
2020-10-27 17:29:01 +00:00
Paul Duffin
3e29458b28 Switch BootJars/UpdatableBootJars to ConfiguredJarList am: 69d1fb1e39 am: 769b1eab84
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471779

Change-Id: Ia770a0b227d8a5ab0c88d56c7e6110c8b697381a
2020-10-27 17:09:50 +00:00
Paul Duffin
e10dfa4e3d Cleanup usages of CreateConfiguredJarList
After previous refactorings the CreateConfiguredJarList function is now
only used in tests and are supplied with a PathContext that will cause
ReportPathErrorf() to panic. So, this change removes the ctx parameter,
calls panic directly on any error and renames the method to make it
clear that it is for testing only.

Bug: 171479578
Test: m nothing
Change-Id: Icfb4bdfe720afa855b64ecf0e74a0b030882d029
2020-10-27 10:36:29 +00:00
Paul Duffin
69d1fb1e39 Switch BootJars/UpdatableBootJars to ConfiguredJarList
This change:
* Switches BootJars/UpdatableBootJars fields of config.productVariables
  from []string to ConfiguredJarList.
* Updates BootJars() method to simply concatenate the jars list from
  the BootJars/UpdatableBootJars fields.
* Adds an UnmarshalJSON(..) method to ConfiguredJarList to support
  unmarshalling from a single string array to avoid having to change the
  format of the JSON file from which the configuration is loaded.
* Adds some additional calls to ConfiguredJarList(..) in tests to
  convert from []string to ConfiguredJarList. They pass nil as the
  ctx argument as there is no suitable PathContext which will cause any
  errors to be thrown using panic. That is reasonable for hard coded
  values in tests. A follow up change will clean up the calls to
  ConfiguredJarList(..).

Bug: 171479578
Test: m nothing
Change-Id: I59b94dafb479ccd8f0471ed802be175af57be271
2020-10-27 10:36:29 +00:00
Slava Shklyaev
e7c1a55d7b Merge "Add new neuralnetworks targets to apex/allowed_deps.txt" 2020-10-27 09:51:56 +00:00
Treehugger Robot
08ceacd2a9 Merge "Add libdmabufheap to the list of allowed dependencies" am: 93d8c6443e am: 1cca112b7e am: 4841f43044 am: e1df571026
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1469429

Change-Id: I271cc80f96386126ed98158ba0dc7993ba3d4451
2020-10-26 20:46:19 +00:00
Treehugger Robot
4841f43044 Merge "Add libdmabufheap to the list of allowed dependencies" am: 93d8c6443e am: 1cca112b7e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1469429

Change-Id: Ib17d4d5f5a04ddf402acb596bdd766c334e652fb
2020-10-26 20:05:42 +00:00
Treehugger Robot
93d8c6443e Merge "Add libdmabufheap to the list of allowed dependencies" 2020-10-26 19:31:57 +00:00
Colin Cross
ba0c30c206 Merge "Add llndk_stubs property" am: ed5dee0a8f am: b078a156c3 am: f952e3e274 am: 5b8e5e5815
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1466665

Change-Id: I8e3697e16e81c3891357884ddacefa0ddb7d304f
2020-10-23 20:14:55 +00:00
Colin Cross
f952e3e274 Merge "Add llndk_stubs property" am: ed5dee0a8f am: b078a156c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1466665

Change-Id: Idde55e7bc5f4f44f602f46fce6b495905d5d0e18
2020-10-23 19:24:44 +00:00
Colin Cross
ed5dee0a8f Merge "Add llndk_stubs property" 2020-10-23 18:09:42 +00:00
Martin Stjernholm
fe678bc4d6 Merge "Rename ART release APEX to com.android.art." am: 9649748516 am: c271bfb232
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1455025

Change-Id: Id52ae6fa361aac18c1162a9180cc3a2ff870eeeb
2020-10-23 11:05:22 +00:00
Martin Stjernholm
9649748516 Merge "Rename ART release APEX to com.android.art." 2020-10-23 10:03:24 +00:00
Steven Moreland
44e840d27b Merge "apex dependency error: note 'apex_available'" am: 8f01ff814b am: 2fc7a7fa51 am: 42c56c3fd8 am: 2d21cbef75
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470326

Change-Id: I365cda3b4d7f99b138e1b331a03b79cee52ae9ee
2020-10-23 04:41:40 +00:00
Steven Moreland
42c56c3fd8 Merge "apex dependency error: note 'apex_available'" am: 8f01ff814b am: 2fc7a7fa51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1470326

Change-Id: I4a1a7d49b6abeab3c3ea6608f21c5250ea0322b8
2020-10-23 03:55:44 +00:00
Steven Moreland
8f01ff814b Merge "apex dependency error: note 'apex_available'" 2020-10-22 23:08:18 +00:00
Hridya Valsaraju
87076a45be Add libdmabufheap to the list of allowed dependencies
It needs to be in the list since it is needed by codec2_vndk.
It will eventually replace libion(also in the list).

Test: m
Bug: 168333162
Change-Id: If11d7e845bd4704f34f84435b5cac32b614312a8
2020-10-21 22:09:44 -07:00
Steven Moreland
6e36cd6104 apex dependency error: note 'apex_available'
This error tracks `apex_available` closure, but the message doesn't
indicate this variable specifically. Calling it out to try to make
the problem more searchable/discoverable/intuitable.

Bug: N/A
Test: apex_test.go
Change-Id: Ib254ace1dbd4e77d073ed4f98ee181dd86adfcfc
2020-10-22 01:23:33 +00:00
Ytai Ben-tsvi
435b0e6d1a Merge "Add audioflinger-aidl-unstable-cpp to media apex" 2020-10-21 20:40:14 +00:00
Nikita Ioffe
47313f46cb Merge "Propagate min_sdk_version to apexer" am: 97cbce163f am: ac68125f8c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1467830

Change-Id: I0e0864ac47ee94a123aa8ca0e17d1a4803ae3097
2020-10-21 17:59:32 +00:00
Colin Cross
0477b42276 Add llndk_stubs property
Prepare for making the relationship between an llndk_library stubs
module and the cc_library implementation module explicit by
adding an llndk_stubs property.  Each cc_library will be updated
to point to its llndk_library, and the llndk_library name will
be changed to make the .llndk suffix explicit.  Then the implicit
connection and suffix can be removed.

Bug: 170784825
Test: m checkbuild
Change-Id: I6b0482a3f286ec29b2e928551aa4317749f2b499
2020-10-21 10:55:33 -07:00
Martin Stjernholm
7f51107ee6 Rename ART release APEX to com.android.art.
Test: See https://r.android.com/1457217
Bug: 169639321
Change-Id: I6800c7a382486b4e50945cc8b789f4be16482fe6
Merged-In: I6800c7a382486b4e50945cc8b789f4be16482fe6
2020-10-21 15:41:02 +01:00
Nikita Ioffe
5335bc471a Propagate min_sdk_version to apexer
This way it will be correctly set in the auto-generated
AndroidManifest.xml.

Bug: 171096530
Bug: 157078772
Test: m
Change-Id: I268f08ca5dd17fa9d6763ad70cc9a3f83891a8d6
Merged-In: I268f08ca5dd17fa9d6763ad70cc9a3f83891a8d6
(cherry picked from commit 97fd49235a)
2020-10-21 14:26:44 +01:00
Nikita Ioffe
aab397e9a9 Merge "Update allowed deps for sdkext apex" am: 7020ca00e5 am: 2bc7cf38e5 am: a1bc378011 am: b4d6b5bc30
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1467266

Change-Id: Ifb69fbe87abdd891b021fdeff8150d7527cde88a
2020-10-21 12:54:15 +00:00
Nikita Ioffe
3cf984ea58 Merge "Propagate min_sdk_version to apexer" 2020-10-21 12:46:05 +00:00
Nikita Ioffe
a1bc378011 Merge "Update allowed deps for sdkext apex" am: 7020ca00e5 am: 2bc7cf38e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1467266

Change-Id: I4784508c53415d2808b077607cbcd910747a2b93
2020-10-21 12:29:27 +00:00
Nikita Ioffe
97fd49235a Propagate min_sdk_version to apexer
This way it will be correctly set in the auto-generated
AndroidManifest.xml.

Bug: 171096530
Bug: 157078772
Test: m
Change-Id: I268f08ca5dd17fa9d6763ad70cc9a3f83891a8d6
2020-10-20 23:29:10 +01:00
Martin Stjernholm
09e2aa9e84 Rename ART release APEX to com.android.art.
Test: See https://r.android.com/1457217
Bug: 169639321
Change-Id: I6800c7a382486b4e50945cc8b789f4be16482fe6
Merged-In: I6800c7a382486b4e50945cc8b789f4be16482fe6
2020-10-20 23:28:49 +01:00
Nikita Ioffe
dd203b6b34 Update allowed deps for sdkext apex
Test: m
Bug: 171096530
Bug: 171330443
Change-Id: Iacaa4e8c6ed2e3854ef973a84bb0e44c433c00d3
2020-10-20 21:08:41 +00:00
Steven Moreland
7656699200 Update VNDK version for common graphics HALs.
We are adding things to them, and in order for core libraries like libui
to use them, the newer versions need to be in the VNDK.

Exempt-From-Owner-Approval: cherry-pick
Bug: 170435409
Test: build
Change-Id: I97f26b78758f2eed128fc46db03b5f6ba3f2245f
Merged-In: I97f26b78758f2eed128fc46db03b5f6ba3f2245f
2020-10-20 00:23:23 +00:00
Steven Moreland
25281087a9 Update VNDK version for common graphics HALs.
We are adding things to them, and in order for core libraries like libui
to use them, the newer versions need to be in the VNDK.

Bug: 170435409
Test: build
Change-Id: I97f26b78758f2eed128fc46db03b5f6ba3f2245f
2020-10-19 19:35:01 +00:00
Slava Shklyaev
7f0c05539f Add new neuralnetworks targets to apex/allowed_deps.txt
Generated with build/soong/scripts/update-apex-allowed-deps.sh

Bug: 160669906
Test: m
Change-Id: Ifd056230dd352fe3fa1c462d1e090aef5bbeb09d
2020-10-19 12:15:11 +01:00
Ytai Ben-Tsvi
6da9af83ef Add audioflinger-aidl-unstable-cpp to media apex
It is not actually used, but the headers get indirectly included, for
private use.

Bug: 160253486
Test: See main topic CL.
Change-Id: I4f60b9312c4e8744e8e930012693aa266aa7a8bb
2020-10-14 10:27:32 -07:00
Colin Cross
2d30007006 Merge "Start using Providers instead of direct module access" am: d4620701ad am: 051ea998fb am: 5e0b4a78d7 am: eaa02f38a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1439475

Change-Id: Ia48391cb058b6b42565bc6636caa304bb30f5ce5
2020-10-13 22:56:12 +00:00
Colin Cross
d4620701ad Merge "Start using Providers instead of direct module access" 2020-10-13 21:48:26 +00:00
Evgenii Stepanov
bd587f5285 Merge "Support asan/hwasan versions of prebuilts." am: 00e07c9779 am: 2cd36f0b0a am: 77436ca9fe am: 4fd6798169
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1371811

Change-Id: Ie8f1dd5998ef02b19f27249101caa1ff1a223074
2020-10-13 19:17:00 +00:00
Evgenii Stepanov
2080bfe79a Support asan/hwasan versions of prebuilts.
In apex_set and cc_prebuilt_library_*, provide a way to specify an
alternative source to use when build with sanitizers.

Test: prebuilt_test, apex_test
Change-Id: I1ab8091bf696d94da3547cf5248853df489bdee6
2020-10-13 03:37:32 +00:00
Colin Cross
0de8a1e17b Start using Providers instead of direct module access
Export information about static libraries, shared libraries and
exported flags through Providers instead of accessing the module
directly.  Much more is left to be converted, but this significantly
simplifies the dependencies on libraries with stubs by making it easy
for a module to masquerade as another by simply exporting the
providers from the other module.  Instead of depending on all the
versions of a library and then picking which one to use later, it
can depend only on the implementation variant and then select the
right SharedLibraryInfo from the variant.

Test: m checkbuild
Test: only expected changes to build.ninja
Change-Id: I1fd9eb4d251cf96ed8398d586efc3e0817663c76
2020-10-12 16:55:47 -07:00
Steven Moreland
b3a44ccae8 Merge "build/soong/scripts/update-apex-allowed-deps.sh" am: 73a9e603d5 am: f45dbe2947 am: 2979010ff5 am: ae793b55f5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1449397

Change-Id: I177cdfeacbf9024995cd2547685898dff719497b
2020-10-12 18:42:12 +00:00
Steven Moreland
73a9e603d5 Merge "build/soong/scripts/update-apex-allowed-deps.sh" 2020-10-12 16:59:24 +00:00
Colin Cross
f376e13ce5 Revert "Make lots of tests run in parallel" am: 405af07859 am: 2ad22c3644 am: af502ff241 am: 04640cbdd8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1456655

Change-Id: Iee706968d37c90bcb020c508f6650eeb7cba9da0
2020-10-10 08:12:20 +00:00
Colin Cross
af502ff241 Revert "Make lots of tests run in parallel" am: 405af07859 am: 2ad22c3644
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1456655

Change-Id: I7051c6c7e4b7af7451dd72ef3ac23b05a20adb8e
2020-10-10 07:28:07 +00:00
Colin Cross
405af07859 Revert "Make lots of tests run in parallel"
This reverts commit 323dc60712.

Reason for revert: Possible cause of test instability
Bug: 170513220
Test: soong tests

Change-Id: Iee168e9fbb4210569e6cffcc23e60d111403abb8
2020-10-09 18:34:24 -07:00
Colin Cross
c7e8d7d11b Merge "Make lots of tests run in parallel" am: 45fd6ace7e am: e81d9e0142 am: c1577e018e am: c2e904d7e1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1439471

Change-Id: Ib0d3b461de8d5d3825c491ad393a3bd3969c2d07
2020-10-07 22:10:24 +00:00
Colin Cross
c1577e018e Merge "Make lots of tests run in parallel" am: 45fd6ace7e am: e81d9e0142
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1439471

Change-Id: I6cafd72aba18f5fb50d4e9bacab70b7db4578760
2020-10-07 21:31:29 +00:00
Colin Cross
04d9c96afe Merge "Remove global state from apex modules" am: 43159bd1b7 am: 21bb1d491c am: 2c76247f51 am: 393b394b85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1428815

Change-Id: I264afeceec4bdbc344ba812b1c5fd88fed043214
2020-10-07 20:02:47 +00:00