Commit Graph

22360 Commits

Author SHA1 Message Date
Treehugger Robot
1c729e80c6 Merge "Add test_mainline_modules to the auto-gen test config(AndroidJUnitTest only)." am: 1d9e2364ed am: 30a6edb924
Change-Id: I2134c97ff74f278033887a0e9ea5f758f4080772
2020-05-18 02:28:33 +00:00
Treehugger Robot
30a6edb924 Merge "Add test_mainline_modules to the auto-gen test config(AndroidJUnitTest only)." am: 1d9e2364ed
Change-Id: I19c34ba0959d9287aa16a42c6e819718e1ffa00e
2020-05-18 02:07:20 +00:00
Treehugger Robot
1d9e2364ed Merge "Add test_mainline_modules to the auto-gen test config(AndroidJUnitTest only)." 2020-05-18 01:50:49 +00:00
Paul Duffin
5c7020556f Extract common behavior between Module and Import am: 0d3c2e136b am: 8bf22015c0
Change-Id: I1566ab0283c3efacb3c31d3c5f78903797d62a8c
2020-05-17 16:00:35 +00:00
Paul Duffin
8bf22015c0 Extract common behavior between Module and Import am: 0d3c2e136b
Change-Id: I3314d2ed871b627c943a74802ff269b0c5d02924
2020-05-17 15:43:41 +00:00
TreeHugger Robot
d7ac9d632e [automerger skipped] Merge "Remove apex_available whitelist for the extservices APEX" into rvc-dev am: 53754e3592 -s ours
am skip reason: Change-Id I827d604c7e5a469a8b8a6d5a4b7917f2eaca48ca with SHA-1 a8c03921f2 is in history

Change-Id: Id90753e483b94191b4ca7dcd29646a2bd059f51b
2020-05-17 15:33:36 +00:00
TreeHugger Robot
53754e3592 Merge "Remove apex_available whitelist for the extservices APEX" into rvc-dev 2020-05-17 15:17:58 +00:00
Paul Duffin
3ec4d7e378 [automerger skipped] Merge "Remove unnecessary copying of common properties" into rvc-dev am: dc424ffdf8 -s ours
am skip reason: Change-Id I8c985b50cb6b6c019b33a4652de482ded689fee4 with SHA-1 1dbe3ca254 is in history

Change-Id: I83e21062b6162e2176da5d2b3aa17a8fc383f014
2020-05-17 13:14:40 +00:00
Paul Duffin
dc424ffdf8 Merge "Remove unnecessary copying of common properties" into rvc-dev 2020-05-17 13:04:23 +00:00
Paul Duffin
0d3c2e136b Extract common behavior between Module and Import
Although the duplication being eliminated here is minimal follow up
changes will add more functionality that is common to Module and
Import.

Test: m nothing
Bug: 156723295
Change-Id: I1733405526764272beba63470a9bc8a958d41024
2020-05-17 13:32:13 +01:00
Jiyong Park
db4ce6e80a Remove apex_available whitelist for the extservices APEX
The marked library(ies) were available to the APEX via the
hand-written whitelist in build/soong/apex/apex.go. Trying to remove the
whitelist by adding apex_available property to the Android.bp of the
libraries.

Bug: 150999716
Test: m
Merged-In: I827d604c7e5a469a8b8a6d5a4b7917f2eaca48ca
Change-Id: I827d604c7e5a469a8b8a6d5a4b7917f2eaca48ca
2020-05-17 21:23:08 +09:00
Paul Duffin
09a7af7bc9 java_sdk_library: Remove unnecessary qualification of fields am: a18abc2a61 am: 1647e82aa0
Change-Id: Ifac21a85592f2d532433921f0d7e92ef99617e32
2020-05-17 11:03:14 +00:00
Paul Duffin
1647e82aa0 java_sdk_library: Remove unnecessary qualification of fields am: a18abc2a61
Change-Id: Ib6b62802ba8c36a523731eff451873cc1f650e61
2020-05-17 10:54:39 +00:00
Paul Duffin
3c17e71394 [automerger skipped] java_sdk_library: Propagate naming_scheme to snapshot am: f8e08b20d6 -s ours
am skip reason: Change-Id Iec7c52d2102b6294540090f3c1e32bd9d8cc7da8 with SHA-1 f7a6433bab is in history

Change-Id: Ibf05c8c31a7524df34b66b878d741ca16b07b0d5
2020-05-17 00:08:42 +00:00
Paul Duffin
a18abc2a61 java_sdk_library: Remove unnecessary qualification of fields
Fields in embedded structures can be accessed without qualifying them
by the type of the embedded structure.

This reduces the size of follow up changes that switch java_sdk_library
from embedding Library.

Bug: 156618935
Test: m nothing
Change-Id: I84f294c6f02d5089055130c63f5fb0538a1f21b9
2020-05-16 19:29:59 +01:00
Paul Duffin
f8e08b20d6 java_sdk_library: Propagate naming_scheme to snapshot
Bug: 155164730
Test: m nothing
Merged-In: Iec7c52d2102b6294540090f3c1e32bd9d8cc7da8
Change-Id: Iec7c52d2102b6294540090f3c1e32bd9d8cc7da8
(cherry picked from commit f7a6433bab)
2020-05-16 18:36:08 +01:00
Paul Duffin
d41712d365 Remove unnecessary copying of common properties
The (Soc/Device/Product/System_ext)_specific are all properties in
ModuleBase.commonProperties. Initially, they were explicitly copied
from the parent to the child. Since then the CreateModule() method
was modified to automatically copy all the commonProperties from the
parent to the child so this code is no longer necessary.

Bug: 156618935
Test: m nothing
      checked that it does not change the generated xml permissions
	  file for a java_sdk_library that sets soc_specific: true and
	  is in the vendor partition.
Merged-In: I8c985b50cb6b6c019b33a4652de482ded689fee4
Change-Id: I8c985b50cb6b6c019b33a4652de482ded689fee4
(cherry picked from commit 1dbe3ca254)
2020-05-16 17:55:23 +01:00
Treehugger Robot
d96b00c3d1 Merge "Remove unnecessary copying of common properties" am: 781baf01eb am: 4f15be74c8
Change-Id: Idd5fd3b5887239859f363bc4c90fc8eee66d2e0d
2020-05-16 14:52:33 +00:00
Treehugger Robot
4f15be74c8 Merge "Remove unnecessary copying of common properties" am: 781baf01eb
Change-Id: Iddeeab9ee1be3c706beb25e2f8c0113223409c9d
2020-05-16 14:36:50 +00:00
Treehugger Robot
781baf01eb Merge "Remove unnecessary copying of common properties" 2020-05-16 14:22:01 +00:00
Martin Stjernholm
db6d7fe34b [automerger skipped] Include runtime-module-sdk in the SDK build. am: 57029c07bf -s ours
am skip reason: Change-Id I39f9024205a198ef8ce19e2c70e3b9dced54add1 with SHA-1 6ee5f754fe is in history

Change-Id: I84b82ac74b92c4a72241fcb715d0594c430e53c3
2020-05-16 13:53:08 +00:00
Nicolas Geoffray
dda3856426 [automerger skipped] Add conscrypt-module-host-exports to the list. am: 36469f7121 -s ours
am skip reason: Change-Id I9ca14cc37a69b1172f52412297977dd03c6ca1a0 with SHA-1 0a2e297206 is in history

Change-Id: I8774d8cae32ad1e32116ce3910eba087c972cf98
2020-05-16 13:53:01 +00:00
Martin Stjernholm
269f753ae1 [automerger skipped] Reduce the number of Soong invocations, and various other minor script fixes. am: f39ef8aa10 -s ours
am skip reason: Change-Id Id21ef80c2334462836e217032fc5bf63b7cd04e1 with SHA-1 691503ea0b is in history

Change-Id: I22ce3e460a276d3abc11a6205fad2401ff9a512b
2020-05-16 13:52:55 +00:00
Nicolas Geoffray
3c8b5188f1 [automerger skipped] Use FORCE_BUILD_LLVM_COMPONENTS. am: 168ea3d4e1 -s ours
am skip reason: Change-Id I6ba8892ef66eeb42c7bd3abc989a80ad4b6a1cf9 with SHA-1 7cad0f860b is in history

Change-Id: Ib93340a4af335281ae7145872cb613ae27dfc990
2020-05-16 13:52:47 +00:00
Nicolas Geoffray
f6af0ef27d [automerger skipped] Add linux_bionic cross compilation for mainline SDKs. am: 7356fffd6d -s ours
am skip reason: Change-Id If0f97e58d2afccbc3f5d0b2e7dabac51330cc5c7 with SHA-1 71233e4732 is in history

Change-Id: Ia05546d6d68a1bc7ee6d7a624386389231d26fb6
2020-05-16 13:52:40 +00:00
Nicolas Geoffray
5a8a6bf70f [automerger skipped] Support secondary arch for host module exports. am: 164451c1f0 -s ours
am skip reason: Change-Id Iec4d8aa59a3ad55583c788f8ec40dd0637e7af33 with SHA-1 abdc8c5501 is in history

Change-Id: Ic3a39d65837bfff8d64937fb6dd209335decc81e
2020-05-16 13:52:33 +00:00
Paul Duffin
1dbe3ca254 Remove unnecessary copying of common properties
The (Soc/Device/Product/System_ext)_specific are all properties in
ModuleBase.commonProperties. Initially, they were explicitly copied
from the parent to the child. Since then the CreateModule() method
was modified to automatically copy all the commonProperties from the
parent to the child so this code is no longer necessary.

Bug: 156618935
Test: m nothing
      checked that it does not change the generated xml permissions
	  file for a java_sdk_library that sets soc_specific: true and
	  is in the vendor partition.
Change-Id: I8c985b50cb6b6c019b33a4652de482ded689fee4
2020-05-16 13:06:55 +01:00
Nicolas Geoffray
2b1121dac1 [automerger skipped] Add a build script to compile modules and SDKs in AOSP. am: 270916d8ff -s ours
am skip reason: Change-Id I80a9bf8ce03d77705ba677f95b03aeb2ac2451d5 with SHA-1 90bc3cd304 is in history

Change-Id: I1b1af920de4c5bb8066a4367358ca85b911a2cad
2020-05-16 11:15:22 +00:00
Martin Stjernholm
3665672648 [automerger skipped] Fix special case when appending a visibility rule to //visibility:private. am: adb189529a -s ours
am skip reason: Change-Id Ibe7e953219e4660c653063e87cb08407a2cb513d with SHA-1 64aeaaddef is in history

Change-Id: I4219e0131dc81a2f81617aff9ede171c64b54a01
2020-05-16 11:15:20 +00:00
Martin Stjernholm
f4914d8d30 [automerger skipped] Add explicit visibility on the self package in EffectiveVisibilityRules. am: f8533bc636 -s ours
am skip reason: Change-Id I404f6e5ca7021974a8c7be5e4d6b4982c050b8a5 with SHA-1 0641d189d0 is in history

Change-Id: I04153b4be320d24ce5aada44908f81ece2a69525
2020-05-16 11:15:18 +00:00
Martin Stjernholm
08ab21a42f [automerger skipped] Don't print :__pkg__ for package rules, since that's the default. am: 68e9d96d61 -s ours
am skip reason: Change-Id I0d2d86f00c3d38e603d6f58c4b1dd9a4170bf819 with SHA-1 01407c525a is in history

Change-Id: I93edd56c3cf93a1e6977ba9f2fabc14fa31873ee
2020-05-16 11:15:07 +00:00
Anton Hansson
ec280ad7fe [automerger skipped] Fix API lint copy command am: 18a289560d -s ours
am skip reason: Change-Id I42b8b60d01dcaed34dbde0390eb1691d656a32cf with SHA-1 3361a294c0 is in history

Change-Id: Ifa3be9183e83933637009b9e4e7824d93f517ebf
2020-05-16 11:15:01 +00:00
Martin Stjernholm
57029c07bf Include runtime-module-sdk in the SDK build.
Test: build/soong/scripts/build-mainline-modules.sh
Bug: 152255951
Merged-In: I39f9024205a198ef8ce19e2c70e3b9dced54add1
Change-Id: I39f9024205a198ef8ce19e2c70e3b9dced54add1
(cherry picked from commit 6ee5f754fe)
2020-05-16 12:14:08 +01:00
Nicolas Geoffray
36469f7121 Add conscrypt-module-host-exports to the list.
// Added for rvc-dev. Used this bug as it is the bug that needs all the build changes.
Bug: 155164730

Test: build-mainline-modules.sh
Merged-In: I9ca14cc37a69b1172f52412297977dd03c6ca1a0
Change-Id: I9ca14cc37a69b1172f52412297977dd03c6ca1a0
(cherry picked from commit 0a2e297206)
2020-05-16 12:14:08 +01:00
Martin Stjernholm
f39ef8aa10 Reduce the number of Soong invocations, and various other minor script fixes.
-  We can pass all targets at once to build-aml-prebuilts.sh.
-  Less noise from build-mainline-modules.sh.
-  Default to the same out directory in both build scripts.
-  Addressed post-submit comments on https://r.android.com/1170907.
-  Various minor cleanups.

// Added for rvc-dev. Used this bug as it is the bug that needs all the build changes.
Bug: 155164730

Test: build/soong/scripts/build-mainline-modules.sh
Merged-In: Id21ef80c2334462836e217032fc5bf63b7cd04e1
Change-Id: Id21ef80c2334462836e217032fc5bf63b7cd04e1
(cherry picked from commit 691503ea0b)
2020-05-16 12:14:08 +01:00
Nicolas Geoffray
168ea3d4e1 Use FORCE_BUILD_LLVM_COMPONENTS.
And remove the allow missing dependencies flag.

// Added for rvc-dev. Used this bug as it is the bug that needs all the build changes.
Bug: 155164730

Test: build-mainline-modules.sh
Merged-In: I6ba8892ef66eeb42c7bd3abc989a80ad4b6a1cf9
Change-Id: I6ba8892ef66eeb42c7bd3abc989a80ad4b6a1cf9
(cherry picked from commit 7cad0f860b)
2020-05-16 12:14:08 +01:00
Nicolas Geoffray
7356fffd6d Add linux_bionic cross compilation for mainline SDKs.
ART requires linux bionic prebuilts.

Bug: 142935992
Test: build-mainline-modules.sh
Merged-In: If0f97e58d2afccbc3f5d0b2e7dabac51330cc5c7
Change-Id: If0f97e58d2afccbc3f5d0b2e7dabac51330cc5c7
(cherry picked from commit 71233e4732)
2020-05-16 12:14:08 +01:00
Nicolas Geoffray
164451c1f0 Support secondary arch for host module exports.
Bug: 142935992
Test: build-aml-prebuilts.sh generate x86 prebuilts

Merged-In: Iec4d8aa59a3ad55583c788f8ec40dd0637e7af33
Change-Id: Iec4d8aa59a3ad55583c788f8ec40dd0637e7af33
(cherry picked from commit abdc8c5501)
2020-05-16 12:14:08 +01:00
Nicolas Geoffray
270916d8ff Add a build script to compile modules and SDKs in AOSP.
Test: build-mainline-modules.sh
Bug: 142935992
Merged-In: I80a9bf8ce03d77705ba677f95b03aeb2ac2451d5
Change-Id: I80a9bf8ce03d77705ba677f95b03aeb2ac2451d5
(cherry picked from commit 90bc3cd304)
2020-05-16 12:07:03 +01:00
Martin Stjernholm
adb189529a Fix special case when appending a visibility rule to //visibility:private.
Test: m nothing
Bug: 151303681
Merged-In: Ibe7e953219e4660c653063e87cb08407a2cb513d
Change-Id: Ibe7e953219e4660c653063e87cb08407a2cb513d
(cherry picked from commit 64aeaaddef)
2020-05-16 12:07:03 +01:00
Martin Stjernholm
f8533bc636 Add explicit visibility on the self package in EffectiveVisibilityRules.
Modules in a package is implicitly visible within the same package.
When making effective visibility rules which work from another location
that visibility needs to be mentioned explicitly. In practice this
allows prebuilts to remain visible to other modules in the source
package when the prebuilts are preferred.

Test: m nothing
Test: m conscrypt-module-sdk, check that the snapshot Soong modules give
  visibility to //external/conscrypt
Bug: 151303681
Merged-In: I404f6e5ca7021974a8c7be5e4d6b4982c050b8a5
Change-Id: I404f6e5ca7021974a8c7be5e4d6b4982c050b8a5
(cherry picked from commit 0641d189d0)
2020-05-16 12:07:03 +01:00
Martin Stjernholm
68e9d96d61 Don't print :__pkg__ for package rules, since that's the default.
To reduce clutter a little.

// Added for rvc-dev. Used this bug as it is the bug that needs all the build changes.
Bug: 155164730

Test: m nothing
Merged-In: I0d2d86f00c3d38e603d6f58c4b1dd9a4170bf819
Change-Id: I0d2d86f00c3d38e603d6f58c4b1dd9a4170bf819
(cherry picked from commit 01407c525a)
2020-05-16 12:06:54 +01:00
Anton Hansson
18a289560d Fix API lint copy command
The space after the backtick prevents it working when copy-pasting it
into the shell.

Test: create lint error => m => cp/pasted command runs successfully
Merged-In: I42b8b60d01dcaed34dbde0390eb1691d656a32cf
Change-Id: I42b8b60d01dcaed34dbde0390eb1691d656a32cf
(cherry picked from commit 3361a294c0)

// Added for rvc-dev. Used this bug as it is the bug that needs all the build changes.
Bug: 155164730
Change-Id: I42b8b60d01dcaed34dbde0390eb1691d656a32cf
2020-05-16 11:03:46 +00:00
Jiyong Park
e719d43acc Merge "Reland "Prevent statically linking to a lib providing stable C APIs"" into rvc-dev-plus-aosp 2020-05-16 08:40:08 +00:00
Paul Duffin
255dfdb892 [automerger skipped] Merge "Replace javaLibrary with java.Dependency,android.Module" into rvc-dev am: c91aafb699 -s ours
am skip reason: Change-Id Ie533c16c753dc9c43171d0223953adea7b2b5ee6 with SHA-1 581bbbe8cb is in history

Change-Id: I4dafda33ef4f0be2bd3ec18ae12acdb7908e5f6f
2020-05-16 07:39:45 +00:00
Paul Duffin
c91aafb699 Merge "Replace javaLibrary with java.Dependency,android.Module" into rvc-dev 2020-05-16 07:24:18 +00:00
TreeHugger Robot
b35951d70b [automerger skipped] Merge "Add apex_set module." into rvc-dev am: ff91b3c29a -s ours
am skip reason: Change-Id I1da8bbcf1611b7c580a0cb225856cbd7029cc0a7 with SHA-1 fa00c06187 is in history

Change-Id: I2db554b3761633660b29ddf958fde89ff847fffd
2020-05-16 02:53:20 +00:00
TreeHugger Robot
ff91b3c29a Merge "Add apex_set module." into rvc-dev 2020-05-16 02:37:39 +00:00
Jiyong Park
af7ed39b06 Reland "Prevent statically linking to a lib providing stable C APIs"
This reverts commit 5b75774004.

Bug: 151051671
Test: m
Change-Id: I05f0465976098941d47ecc06c978cfa116364d78
2020-05-16 09:41:19 +09:00
Jaewoong Jung
8cf307e754 Add apex_set module.
apex_set takes an .apks file that contains a set of prebuilt apexes with
different configurations. It uses extract_apks to select and install the
best matching one for the current target.

Bug: 153456259
Test: apex_test.go
Test: com.android.media.apks
Change-Id: I1da8bbcf1611b7c580a0cb225856cbd7029cc0a7
Merged-In: I1da8bbcf1611b7c580a0cb225856cbd7029cc0a7
2020-05-16 00:37:36 +00:00