StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,175 Commits 1 Branch 0 Tags
f3d901b71d0f768e30233d74feca0332308d917d
Commit Graph

2576 Commits

Author SHA1 Message Date
Ytai Ben-Tsvi
47bb81b2d5 Add audiopolicy-aidl-unstable-cpp to media Apex 
This new module is a result of breaking up an existing library in two.

Test: Compiles.
Change-Id: Id9e3b2e51982872aa001a0e1112e6e5a37c92caf
 2020-12-15 16:42:06 -08:00
Colin Cross
78bdf33927 Merge changes from topic "header_libs_requirement" am: 01a44004fd am: ea1903d539 am: 74b6e49c91 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1525004

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24708c0b1458021c167034e57098388e2ab70862
 2020-12-15 19:11:40 +00:00
Colin Cross
74b6e49c91 Merge changes from topic "header_libs_requirement" am: 01a44004fd am: ea1903d539 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1525004

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3e1e2a338d36de3e451488b0bce6121a43989e6
 2020-12-15 19:03:12 +00:00
Jiyong Park
892a98f0a3 versioning macro is exported from prebuilt stubs as well 
This change fixes a bug that the versioning macro (__LIBNAME_API__) is
omitted for prebuilts providing a stub.

Bug: 175166063
Test: m nothing

Change-Id: I1cce5ab58ef245622861200ec0d8b0f84e3178ed
 2020-12-16 03:54:44 +09:00
Colin Cross
01a44004fd Merge changes from topic "header_libs_requirement" 
* changes:
  Add libstagefright_mp3dec_headers to allowed apex deps
  Require libraries in header_libs to be cc_library_header
 2020-12-15 18:40:55 +00:00
Treehugger Robot
e55788a64f Merge "Add quiche and its deps to apex/allowed_deps.txt" am: 16976bf676 am: 48f743c74c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1521397

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iafafd46ca4dd219dfb937859031833f267d74d35
 2020-12-15 16:17:38 +00:00
Bernie Innocenti
22d64d9d45 Add quiche and its deps to apex/allowed_deps.txt 
Test: m
Bug: 155855709
Change-Id: I1eda029d912d53b0f888c4162422b4bbab948fe1
Merged-In: I0f4b1d011d058a1d3a43687a5ea0b7b5335aebbc
 2020-12-15 09:34:08 +00:00
Treehugger Robot
823858592c Merge "Prebuilt stub not available to platform is handled correctly" am: e223512bb4 am: 1dc12fc99b am: 82424f5085 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1521398

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60a5d277ae8dd38963e71bd3ff6002443c11b7ec
 2020-12-15 08:11:42 +00:00
Orion Hodson
3575840b8d Merge "apex/allowed_deps: add libnetjniutils" am: c7dff7f142 am: 4bc549e36b am: f48c1ae6eb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1519660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee516d38e93baffad26570fa9a4e2062d858f683
 2020-12-15 08:11:22 +00:00
Treehugger Robot
82424f5085 Merge "Prebuilt stub not available to platform is handled correctly" am: e223512bb4 am: 1dc12fc99b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1521398

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida66490b3a0c8286ef050334efca3bbf47bff2b5
 2020-12-15 07:24:58 +00:00
Orion Hodson
f48c1ae6eb Merge "apex/allowed_deps: add libnetjniutils" am: c7dff7f142 am: 4bc549e36b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1519660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74f35ce8e8448f26ddd4d0b3b2202570026edd06
 2020-12-15 07:24:45 +00:00
Treehugger Robot
e223512bb4 Merge "Prebuilt stub not available to platform is handled correctly" 2020-12-15 06:26:33 +00:00
Orion Hodson
c7dff7f142 Merge "apex/allowed_deps: add libnetjniutils" 2020-12-15 06:25:38 +00:00
TreeHugger Robot
5f8291061f Merge "Add quiche and its deps to apex/allowed_deps.txt" 2020-12-15 05:05:34 +00:00
Greg Kaiser
3144c2ad7b Merge "Revert "Update minSdkVersion for libstagefright_bufferqueue_help..."" 2020-12-15 00:22:39 +00:00
Jiyong Park
f7c3bbe433 Prebuilt stub not available to platform is handled correctly 
When a shared library providing stubs is included in an APEX, only the
stub variant (i.e. version:"1", etc.) gets emitted to Android.mk. This
enforces that everything in the Make world to link to the stub providing
only the public APIs of the library. The non-stub variant (i.e.
version:"") isn't exposed, otherwise, others will be able to access
private part of the lib which isn't guaranteed to be stable.

This has been done by unhiding the stub variant when it is known that
the library is actually included in an APEX. Note that stub variants are
by default hidden.

The above mechanism however doesn't work when the shared library is
replaced by a prebuilt and when the APEX is also replaced by a prebuilt.
Then, the fact that the prebuilt library is actually in the APEX gets
lost.  In that case, AnyVariantDirectlyInAnyApex() returns false for the
prebuilt library. As a result, the stub variant remains hidden and not
emitted to Android.mk.

This change fixes the problem by checking if the lib isn't available for
the platform at all. If not available for the platform (e.g.
apex_available doesn't have "//apex_available:platform"), the lib is
assumed to be included in an APEX even when it actually didn't go
through the apex mutator (... because it's a prebuilt).

Bug: 175166063
Test: m nothing

Change-Id: I41fabd5b368baecf4dc3c5a080b466f8bcd79d77
 2020-12-15 09:17:36 +09:00
Greg Kaiser
5542a6dc13 Revert "Update minSdkVersion for libstagefright_bufferqueue_help..." 
Revert submission 12527722-use_vendor_false

Reason for revert: Issues on devices with flattened apex, b/175592420
Reverted Changes:
I00724de3a:Remove libbinder from apex build
If016c8f22:Set use_vendor to false for media apex
I6108fc55a:Update minSdkVersion for libstagefright_bufferqueu...

Bug: 175592420
Change-Id: Idda752838ad98fba50fcfaa0e02ed0d5c26f5dda
Test: Local build with this revert no longer has issued playing videos (like YouTube) on a device with flattened apex
 2020-12-14 22:17:04 +00:00
Yan Yan
cf87f5b7a1 Merge "Allow IPsec module to depend on modules-utils-build" am: 1df80f2951 am: 22d8148922 am: 76f91ea300 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1521880

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f7eb7ff0db63c5e712b54a60588bd5046d1cffd
 2020-12-14 20:09:10 +00:00
Yan Yan
76f91ea300 Merge "Allow IPsec module to depend on modules-utils-build" am: 1df80f2951 am: 22d8148922 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1521880

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c17de731d4e855bf9fcf46c55f76490895a5f73
 2020-12-14 19:52:21 +00:00
Colin Cross
3f2fa9b846 Add libstagefright_mp3dec_headers to allowed apex deps 
libstagefright_mp3dec_headers is being split out of
libstagefright_mp3dec.

Bug: 173252016
Test: m checkbuild
Change-Id: I7ab485832628203a907ebe8c3f79325d8b5788f4
 2020-12-14 19:28:47 +00:00
Yan Yan
1df80f2951 Merge "Allow IPsec module to depend on modules-utils-build" 2020-12-14 18:33:50 +00:00
Bernie Innocenti
0d5c324205 Add quiche and its deps to apex/allowed_deps.txt 
Test: m
Bug: 155855709
Change-Id: I0f4b1d011d058a1d3a43687a5ea0b7b5335aebbc
 2020-12-15 01:14:18 +09:00
Paul Duffin
4707f03be8 Merge changes Iaca95efc,I7ccd5581 am: 57fab96e01 am: 3645404e1c am: 777bf29f3b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1526698

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4dc62c5042f18edc7741c949868c9654e5e70202
 2020-12-14 14:07:01 +00:00
Paul Duffin
777bf29f3b Merge changes Iaca95efc,I7ccd5581 am: 57fab96e01 am: 3645404e1c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1526698

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6dfde31f226d1ef726d155a40b255b4ac626272
 2020-12-14 11:36:31 +00:00
Paul Duffin
57fab96e01 Merge changes Iaca95efc,I7ccd5581 
* changes:
  Add RemoveOptionalPrebuiltPrefix() helper function
  Delegate work of apexInfoMutator to ApexInfoMutator interface
 2020-12-14 10:54:21 +00:00
Jiyong Park
59140307ec arch specific dependencies are supported for apex 
The apex module type now supports arch specific native dependencies.

apex {
    name: "myapex",
    arch: {
        arm64: {
	    native_shared_libraries: ["arm64_only_lib"],
	},
    },
}

Bug: 174639241
Test: m nothing
Change-Id: I3f00aa87c480d4127b27d33e9620c4336824e937
 2020-12-14 18:44:04 +09:00
sophiez
676c3991c6 Automate NDK API coverage used by Mainline modules build integration 
Dist txt files containing NDK APIs used by Mainline modules. Cherry-pick
from aosp.

Test: TARGET_BUILD_APPS=com.google.android.adbd m dist apps_only

Change-Id: I035f1e0cc7eb43fc09e796dbc6ce77e65b8aa3b4
Merged-In: I035f1e0cc7eb43fc09e796dbc6ce77e65b8aa3b4
 2020-12-11 23:36:54 +00:00
Sophie Zheng
a21f8c57a9 Merge "Automate NDK API coverage used by Mainline modules build integration" am: e3a2bdf2c8 am: f0fa9dfdd7 am: 2246c7bbc0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1516605

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18d2c14ca2272e47591ea3ecb814bc89f8b705d1
 2020-12-11 23:08:16 +00:00
Sophie Zheng
2246c7bbc0 Merge "Automate NDK API coverage used by Mainline modules build integration" am: e3a2bdf2c8 am: f0fa9dfdd7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1516605

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic15891d61ac95747f2f2aca0f97cbe302f6e6b70
 2020-12-11 22:53:15 +00:00
Chong Zhang
6d6b7094ee Remove libstagefright_bufferqueue_help from apex.go 
Change-Id: I8e6fc6de6288ab1054658dea3b3c7caae0274fbd
bug: 166468760
test: build
 2020-12-11 22:20:07 +00:00
Sophie Zheng
e3a2bdf2c8 Merge "Automate NDK API coverage used by Mainline modules build integration" 2020-12-11 22:19:00 +00:00
Chong Zhang
803e23586e Merge "Update minSdkVersion for libstagefright_bufferqueue_helper_novndk deps" 2020-12-11 22:03:11 +00:00
Paul Duffin
d23c726b36 Add RemoveOptionalPrebuiltPrefix() helper function 
Test: m nothing
Bug: 171061220
Change-Id: Iaca95efcaf3f02e066751c6e988d609ac40e048a
 2020-12-11 18:13:08 +00:00
Paul Duffin
a7d6a89774 Delegate work of apexInfoMutator to ApexInfoMutator interface 
Refactor the apexInfoMutator to delegate the work to an implementation
of ApexInfoMutator and then move the existing functionality into the
apexBundle.ApexInfoMutator(). This will allow a follow up change to
customize the behavior of this mutator for prebuilt_apex modules.

Test: m nothing
Bug: 171061220
Change-Id: I7ccd55818e02a606c5494e215f4370b635ddd0a5
 2020-12-11 16:07:17 +00:00
Paul Duffin
95d9aa74e0 Merge "Rename apexDepsMutator to apexInfoMutator" am: 08703826bd am: 452cdd33da am: b6f7bd5d24 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1523982

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a80c1bc9ff9ff4028a90d9cea8fdb5d3225caea
 2020-12-11 11:27:34 +00:00
Paul Duffin
1e2fa1aefc Merge "Extract testDexpreoptWithApexes() for reuse" am: 4d934af2ee am: 30642ff255 am: 92f5559fb5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1523981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I158c93817b6a11d8bee77555c9f5819a58221571
 2020-12-11 11:27:26 +00:00
Paul Duffin
b6f7bd5d24 Merge "Rename apexDepsMutator to apexInfoMutator" am: 08703826bd am: 452cdd33da 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1523982

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I388a2927d49048b5de97fb82cdc494308cef4c0a
 2020-12-11 11:15:36 +00:00
Paul Duffin
92f5559fb5 Merge "Extract testDexpreoptWithApexes() for reuse" am: 4d934af2ee am: 30642ff255 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1523981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib745536acb0a80bfd4f5ba9492eeae942908132c
 2020-12-11 11:15:25 +00:00
Jiyong Park
75a7ca7955 Merge "stub variants also re-exports headers" am: 6f05a73e3e am: 0c6aecfa06 am: 4d4fce3df8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1518569

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1ca06edc0f0f3f58951f037696f446c8c350549
 2020-12-11 10:09:00 +00:00
Paul Duffin
08703826bd Merge "Rename apexDepsMutator to apexInfoMutator" 2020-12-11 10:06:19 +00:00
Paul Duffin
4d934af2ee Merge "Extract testDexpreoptWithApexes() for reuse" 2020-12-11 10:06:07 +00:00
Jiyong Park
4d4fce3df8 Merge "stub variants also re-exports headers" am: 6f05a73e3e am: 0c6aecfa06 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1518569

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib42ca356ba35563e8de8ae93d2a3db6b2305ec60
 2020-12-11 09:55:21 +00:00
Jiyong Park
6f05a73e3e Merge "stub variants also re-exports headers" 2020-12-11 08:50:12 +00:00
Jiyong Park
1ad8e16fbe stub variants also re-exports headers 
This change fixes a bug that headers are not re-exported from stub
variants of a library, if the headers are not from header libs, but from
shared or static libs. This is because only header lib dependencies
are respected for stubs variants.

The fix is as follows. 1) dependencies to the shared/static libs are
added even for stubs variants. 2) instead, in depsToPaths, they are
treated like header libs (i.e. don't contribute to linkFile) for the
stubs variants.

Bug: 174558745
Test: m

Change-Id: Iab6c77e7817055d0f2d09cb114186b30164fc231
 2020-12-11 13:48:28 +09:00
Chong Zhang
092e023a57 Update minSdkVersion for libstagefright_bufferqueue_helper_novndk deps 
bug: 166468760
Change-Id: I6108fc55ae90c129c15d53e7cb1b34431d8e3133
 2020-12-11 03:34:07 +00:00
Jiyong Park
40e49c1c7a Merge "rust ffi libraries can be included in APEX" am: b555609098 am: 83732bad33 am: 1d58cd8e63 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1519482

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3c7cb6980cd4d6616716eccdc416c4e6b2473af
 2020-12-11 01:16:46 +00:00
Jiyong Park
6535de6429 Merge "Add min_sdk_version to Rust modules." am: 0d399b5915 am: 6b31120281 am: a3df735a37 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1518205

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03d817a3067f6ca0165b3e1b0593d56397003744
 2020-12-11 01:16:42 +00:00
sophiez
55e8815fb8 Automate NDK API coverage used by Mainline modules build integration 
Dist txt files containing NDK APIs used by Mainline modules

Test: TARGET_BUILD_APPS=com.google.android.adbd m dist apps_only

Change-Id: I035f1e0cc7eb43fc09e796dbc6ce77e65b8aa3b4
 2020-12-11 00:45:20 +00:00
Jiyong Park
1d58cd8e63 Merge "rust ffi libraries can be included in APEX" am: b555609098 am: 83732bad33 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1519482

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52f08cde8ddfedbbb9ed55544ba70d4cbd971833
 2020-12-11 00:43:40 +00:00
Jiyong Park
a3df735a37 Merge "Add min_sdk_version to Rust modules." am: 0d399b5915 am: 6b31120281 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1518205

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b7735516482cfb8ea743c087d147ef3cb85663e
 2020-12-11 00:43:37 +00:00