Commit Graph

16004 Commits

Author SHA1 Message Date
Jooyung Han
d178df9c20 Merge changes from topic "fix-vndk-core-variant"
am: 61eb8aaea4

Change-Id: If9b5bc238965c0adf4df9b51932025076bb37396
2019-10-29 21:37:29 -07:00
Treehugger Robot
61eb8aaea4 Merge changes from topic "fix-vndk-core-variant"
* changes:
  Do not install VNDK lib in favor of VNDK APEX
  Fix apex_vndk with TARGET_VNDK_USE_CORE_VARIANT
  Do not follow deps for apex_vndk
2019-10-30 04:29:37 +00:00
Colin Cross
3b24d1221a Merge "smart_status: move channel write outside lock to avoid deadlock"
am: 4bce23b139

Change-Id: I6c47df3c30d88a31fd6d435d2c4e9e3f44073e7a
2019-10-29 21:12:37 -07:00
Treehugger Robot
4bce23b139 Merge "smart_status: move channel write outside lock to avoid deadlock" 2019-10-30 03:57:23 +00:00
Jooyung Han
b01c114d27 Do not install VNDK lib in favor of VNDK APEX
Since VNDK APEX replaces VNDK lib /system/lib/vndk{-sp}, VNDK libs are
not installed.

Bug: 141451661
Test: m && boot device
Change-Id: I14686927a56ded5176839c89f29a2fd7e0fca658
2019-10-30 00:07:25 +00:00
Jooyung Han
87a7f3064f Fix apex_vndk with TARGET_VNDK_USE_CORE_VARIANT
When TARGET_VNDK_USE_CORE_VARIANT is set, vndk apex should have only
- vndk sp libraries
- vndk core libraries which are marked as "must use vendor variant"

Previously, vndk sp libs are discarded when TARGET_VNDK_USE_CORE_VARIANT
is set.

Bug: 143374795
Bug: 139772411
Test: TARGET_VNDK_USE_CORE_VARIANT=true m com.android.vndk.current
      see if vndk sp lib(e.g. libunwindstakc) is included.

Change-Id: Iae218fff5c354eb874839a1f71be30633fb8a9ab
2019-10-30 09:04:13 +09:00
Jooyung Han
8aee204cb2 Do not follow deps for apex_vndk
Since apex_vndk deals with its own dependencies, it should not follow
dependencies while packaging.

Bug: 139772411
Test: TARGET_VNDK_USE_CORE_VARIANT=true m com.android.vndk.current
      see if there are unexpected libs in the apex
      for example, android.hardware.audio.common@2.0.so should not be
      included in the apex since it is not listed as "must use vendor
      variant".

Change-Id: Ibada600b3099fb19630d1e327a2e09cd26b2deb0
2019-10-30 00:03:22 +00:00
Dario Freni
c7c9f04141 Merge "Add support for including app prebuilts in APEX."
am: 520367cbd3

Change-Id: I679f629f9145e22e7f79acbd85bbe296c2ff5f58
2019-10-29 16:14:41 -07:00
Treehugger Robot
520367cbd3 Merge "Add support for including app prebuilts in APEX." 2019-10-29 23:02:38 +00:00
Colin Cross
8cc19911b1 smart_status: move channel write outside lock to avoid deadlock
The smartStatusOutput.done channel is read from a goroutine that
locks smartStatusOutput.lock.  If the goroutine that writes to
smartStatusOutput.done is holding smartStatusOutput.lock it can
lead to an AB-BA deadlock.  Call stopActionTableTick from outside
the lock.

Fixes: 143558785
Test: none
Change-Id: I93a10ef9ff16c3953a1c5ccb102b024158358fe4
2019-10-29 15:27:32 -07:00
Ivan Lozano
5e94b2dd4b Merge changes Ia7deed13,I7378a46f
am: 765fe7a501

Change-Id: I1fef1dca7928949e3f4004a68a2f99687da01187
2019-10-29 15:27:27 -07:00
Colin Cross
2513a6efd6 Merge changes Icfd32d0a,Icc9ff4d4,Ieee07502,I559eeb1f,Iaf2a6f6d, ...
am: ec90e44ce7

Change-Id: Id04d926cfc57afc73433420815f4705b7b53bf96
2019-10-29 15:21:04 -07:00
Ivan Lozano
765fe7a501 Merge changes Ia7deed13,I7378a46f
* changes:
  Add support for Rust C libraries.
  Add a common interface for cc linkable libraries.
2019-10-29 21:47:14 +00:00
Colin Cross
ec90e44ce7 Merge changes Icfd32d0a,Icc9ff4d4,Ieee07502,I559eeb1f,Iaf2a6f6d, ...
* changes:
  Use java language 1.9 for sdk_version: "current"
  Remove special case for sdk_version: "none"
  Use system modules for turbine
  Make javaVersion an enum
  Move TestConfig sdk versions forward
  Split java 8 and 9 classpaths in TestClasspath
2019-10-29 21:08:33 +00:00
Colin Cross
6cef481ee7 Use java language 1.9 for sdk_version: "current"
Java language was set for 1.8 for anything building against the
current SDK because the stubs were not built in Soong, so the
system modules could not be built.  The stubs have been built
in Soong since Iabd32b30954b3f4a6d9a779fde52a032b684807e, but
I5e870c34dd0ebc8ae3f888ec627da590c846a76f missed updating
this TODO.

Use 1.9 when building against the stubs, but continue using
1.8 for unbundled builds until we have prebuilt system modules.

Always use the core-current-stubs-system-modules to avoid
splitting android.* packages between the system modules and
the classpath, which would cause new classes in android.*
packages in classpath jars to be ignored.  Add a new
java9Classpath field to sdkDep that will contain the stubs jar
when targeting Java language level 1.9, and plumb it through
to javac and turbine.  Rename the modules field to bootclasspath.

Bug: 142896162
Test: m checkbuild
Change-Id: Icfd32d0a863b2303a997c7cf03cb3708aade4724
2019-10-29 13:35:39 -07:00
Colin Cross
6d8d8c6a91 Remove special case for sdk_version: "none"
The dependency handling for sdk_version: "none" (which propagated to
!sdkDep.hasStandardLibs()) was very similar to the normal useModule
case.  Combine the cases by making decodeSdkDep set useModule: true
and put the system modules in modules for the sdk_version: "none"
case.

Test: TestClasspath
Change-Id: Icc9ff4d43a38da25cc0e3628be95951d61773ad5
2019-10-29 13:35:39 -07:00
Colin Cross
bf3119ee35 Use system modules for turbine
turbine supports taking system modules on the command line,
now that we target Java language level 1.9 and use system modules
by default switch turbine to match javac.

Test: m javac-check
Change-Id: Ieee07502151da0d5693bb8929213d495c039106b
2019-10-29 13:35:39 -07:00
Alexander Smundak
344d57e1da Merge "Add dont_merge_manifests attribute to android_test"
am: 657615e0d6

Change-Id: I95da8cbaed5040356bfa20ee0903152dac3ac8b6
2019-10-29 09:21:55 -07:00
Alexander Smundak
657615e0d6 Merge "Add dont_merge_manifests attribute to android_test" 2019-10-29 15:59:19 +00:00
Ivan Lozano
52767be335 Add support for Rust C libraries.
Adds the ability for rust modules to be compiled as C libraries, and
allows cc modules to depend on these rust-generated modules. This also
means that soong-rust should not have any dependencies on soong-cc aside
from what's required for testing.

There's a couple small fixes included as well:

 - A bug in libNameFromFilePath that caused issues when library's had
 "lib" in their name.
 - VariantName is removed from rust library MutatedProperties since this
 was unused.

Bug: 140726209
Test: Soong tests pass.
Test: Example cc_binary can include a rust shared library as a dep.
Test: m crosvm.experimental
Change-Id: Ia7deed1345d2423001089014cc65ce7934123da4
2019-10-28 22:09:01 -07:00
Dario Freni
280b61b850 Merge "Sort the file with image content."
am: 4f45daf9ed

Change-Id: Ibe8cd8e6d42dc9e14f454e79b57718d72716e677
2019-10-28 16:45:43 -07:00
Kris Alder
0bb1b218a9 add additional fields to cc_fuzz build types
am: f979ee3873

Change-Id: I7099fcf09dd9d936a05c1f2141640e57899bbe68
2019-10-28 16:45:08 -07:00
Treehugger Robot
4f45daf9ed Merge "Sort the file with image content." 2019-10-28 23:29:58 +00:00
Kris Alder
f979ee3873 add additional fields to cc_fuzz build types
Specifically, this adds:
* Owner
* Disable (stop fuzzer from running in Haiku)
* Bug Component
* Bug Hotlist

The fields are all inside a new 'options' struct.

The values from these fields (if any) are written into a config file as
json.

Bug: 142551000
Test: ran locally with a modified build file and verified output in .zip
Change-Id: I86edf74c2cebe9912ac0ad203f99028be4062c8b
2019-10-28 16:15:50 -07:00
Sasha Smundak
541056c3fa Add dont_merge_manifests attribute to android_test
Bug: 122332514
Test: treehugger, convert cts/tests/tests/content
Change-Id: Ib66fcafd7c31913402cd390dfecce292b1817729
2019-10-28 15:55:58 -07:00
Colin Cross
1e7438524b Make javaVersion an enum
Remove the hardcoded checks against "1.9" by making javaVersion
an enum and implementing javaVersion.usesJavaModules().

Test: TestClasspath
Change-Id: I559eeb1f45880bb8177269c6d977ee4dfbadce57
2019-10-28 14:55:03 -07:00
Colin Cross
74362a4d5e Move TestConfig sdk versions forward
The SDK version in TestConfig is very old, move it forward to trigger
the newer javaVersion code paths.

Bug: 142896162
Test: all Soong tests
Change-Id: Iaf2a6f6dfef43b006b0a09f193fbc2d2e103d90d
2019-10-28 14:55:03 -07:00
Colin Cross
617b1451b4 Split java 8 and 9 classpaths in TestClasspath
In preparation for adding the system modules jars to the classpath
for java 9, split the expected java 8 and java 9 classpaths into
separate fields.  Also replace the system: "bootclasspath" special
case with a bool that specifies that the module will always be
built using a java 8 style command line.

Test: TestClasspath
Change-Id: I661ec50d77a039c435c03bc8e6443cc5a57c206e
2019-10-28 14:55:03 -07:00
Ivan Lozano
183a3218e2 Add a common interface for cc linkable libraries.
Adds an interface, CcLinkableInterface, for cc linkable dependencies
which come from other toolchains such as Rust.

Bug: 140726209
Test: Soong tests pass, rust modules still compile.
Change-Id: I7378a46fad94fd0b735746aaf4e265fd2c2c04d8
2019-10-28 13:45:12 -07:00
Ryan Prichard
d258b0fceb Merge "Stop linking libdl.a into static bins"
am: ce6b216c5e

Change-Id: I7af252175aa4ea9ff9baf971ff4c22b10d4627ad
2019-10-28 13:36:02 -07:00
Ryan Prichard
ce6b216c5e Merge "Stop linking libdl.a into static bins" 2019-10-28 20:14:37 +00:00
Greg Kaiser
908aa0cf74 Merge "Partial reverts of vndk-apex"
am: 5bce0931c1

Change-Id: Ic161ae00a349ff8f7fd9f0d8ba1e411ba1fa2e73
2019-10-28 10:20:05 -07:00
Greg Kaiser
5bce0931c1 Merge "Partial reverts of vndk-apex" 2019-10-28 17:12:33 +00:00
Colin Cross
d4209698f8 Merge "Default to compiling lite protos"
am: 05491b4861

Change-Id: I8ed20a1008d7e05fed7a4f7a238a2363958722b1
2019-10-28 09:06:55 -07:00
Dario Freni
cde2a037f6 Add support for including app prebuilts in APEX.
Bug: 138429615
Test: Created an APEX containing CtsShimPrebuilt and
CtsShimPrivPrebuilt.
Change-Id: I9d138ccfc03e4b96c9989d2681ad4e4ad5f20108
2019-10-28 16:05:32 +00:00
Dario Freni
e423582f07 Sort the file with image content.
While modifying the CTS shim apex packages, it was observed that the
output of the image content file is not necessarily sorted, which in
turn can cause failure when checking the file against a whitelist.

Bug: 138429615
Test: Succesfully built a modified version of CTS Shim v3 that was
previously failing because of the issue this CL fixes.

Change-Id: I901859ae08feb6012f34b851e125977e1c0100d9
2019-10-28 15:51:03 +00:00
Treehugger Robot
05491b4861 Merge "Default to compiling lite protos" 2019-10-28 15:21:02 +00:00
Pete Gillin
aee0e30e8b Merge "Remove support for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9."
am: ef99a4b06e

Change-Id: I64138a69c62f811a1f22e9a63cf6994b24e0c35c
2019-10-28 05:06:40 -07:00
Pete Gillin
ef99a4b06e Merge "Remove support for EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9." 2019-10-28 10:28:19 +00:00
Jiyong Park
6abc13c5ef Merge "add stem property to java modules"
am: d3f11c13b1

Change-Id: Iebb50efe73a9c180bceff1c66cca68dfae4d9036
2019-10-27 23:43:46 -07:00
Treehugger Robot
d3f11c13b1 Merge "add stem property to java modules" 2019-10-28 06:23:32 +00:00
Jooyung Han
6db2f177db Partial reverts of vndk-apex
This installs vndk libs under system/lib/vndk
instead of vndk-apex.
(Partial reverts of 31c470b5d5)

Also fixes the bug 097087be53 brought.
This produced incomplete list of vndkcorevariant.libraries.txt.

Bug: 143374795
Test: m && boot
Change-Id: I17864de4770a84431756e0c3765b601d3dc2abb1
2019-10-28 14:12:48 +09:00
Jiyong Park
229ebeea9b Merge "Change exportedDirs and exportedSystemDirs from []string to android.Paths"
am: b480debbd8

Change-Id: I95e38ac84157199e1446de1087ad75de0cd05ffe
2019-10-27 19:35:58 -07:00
Treehugger Robot
b480debbd8 Merge "Change exportedDirs and exportedSystemDirs from []string to android.Paths" 2019-10-28 02:24:41 +00:00
Xin Li
1e663359d4 [automerger skipped] Merge "Merge Coral/Flame into AOSP master"
am: ce2be0d4fb -s ours
am skip reason: change_id I2dbd6791675ed91303dc21d04992e600bb89f0ff with SHA1 11e0d21b5b is in history

Change-Id: I20959df3ad12b6fb487c2dc9d9b0b814fb0a0aec
2019-10-26 22:47:14 -07:00
Xin Li
8359b160c3 [automerger skipped] Merge Coral/Flame into AOSP master
am: 7ad7d5aac5 -s ours
am skip reason: change_id I2dbd6791675ed91303dc21d04992e600bb89f0ff with SHA1 11e0d21b5b is in history

Change-Id: Id1316888ad7158505770a68614739d8dabb05465
2019-10-26 22:32:24 -07:00
Xin Li
ce2be0d4fb Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:30 +00:00
Colin Cross
0f97adae5f Default to compiling lite protos
Soong was incorrectly defaulting to compiling for full protos but
using the lite runtime.  Switch to compiling lite protos by default.

Fixes: 119714316
Test: m checkbuild
Change-Id: I0832b854f01f2acb10682e68ce7cc68753ca9dda
2019-10-26 20:35:13 +00:00
Jooyung Han
678af96675 Merge "Soong generates libraries.txt files for vndk"
am: 7d6b21c265

Change-Id: I08c0304983cf162aad8a717a16149c71d527f3f5
2019-10-25 19:15:45 -07:00
Chih-hung Hsieh
dcb44a4ca0 Merge "Rust owners, fix syntax error and more specific"
am: ea89f313bb

Change-Id: Ie3b69ca3d89d740b293a6de1471a9401b1a4b3a1
2019-10-25 19:08:37 -07:00